diff options
Diffstat (limited to 'editors/abiword-devel/files')
9 files changed, 47 insertions, 253 deletions
diff --git a/editors/abiword-devel/files/patch-GNUmakefile.in b/editors/abiword-devel/files/patch-GNUmakefile.in index fe5958dbc4a8..ad9a02ccfca8 100644 --- a/editors/abiword-devel/files/patch-GNUmakefile.in +++ b/editors/abiword-devel/files/patch-GNUmakefile.in @@ -1,6 +1,6 @@ ---- GNUmakefile.in.orig Mon Jun 7 14:59:52 2004 -+++ GNUmakefile.in Mon Jun 7 15:01:41 2004 -@@ -156,17 +156,17 @@ +--- GNUmakefile.in.orig Thu Jun 17 14:48:13 2004 ++++ GNUmakefile.in Thu Jun 17 14:49:43 2004 +@@ -149,17 +149,17 @@ SUBDIRS = src @@ -27,7 +27,7 @@ @BIGENDIAN_TRUE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/BigEndian32.american.hash @BIGENDIAN_FALSE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/LittleEndian32.american.hash -@@ -586,7 +586,6 @@ +@@ -550,7 +550,6 @@ # Install the datafiles. This is quick-and-dirty. install-data-local: @@ -35,7 +35,7 @@ if test -d $(top_srcdir)/../abidistfiles ; then \ for dir in `cd $(top_srcdir)/../abidistfiles; find . -type d ! -name CVS` ; do \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ;\ -@@ -599,11 +598,7 @@ +@@ -563,11 +562,7 @@ for file in $(top_srcdir)/../abidistfiles/$$dir/* ; do \ if test -f $$file ; then \ sfile=`echo "$$file" | sed 's/\.[^.]*$$//'`; \ diff --git a/editors/abiword-devel/files/patch-abiword.desktop b/editors/abiword-devel/files/patch-abiword.desktop new file mode 100644 index 000000000000..b314f946e3cd --- /dev/null +++ b/editors/abiword-devel/files/patch-abiword.desktop @@ -0,0 +1,14 @@ +--- abiword.desktop.orig Sat Dec 4 02:09:21 2004 ++++ abiword.desktop Sat Dec 4 02:10:07 2004 +@@ -3,10 +3,9 @@ + Icon=abiword_48.png + Terminal=false + Type=Application +-Categories=Application;Office;WordProcessor;X-Red-Hat-Base; ++Categories=Application;Office;WordProcessor; + StartupNotify=true + Encoding=UTF-8 +-X-Desktop-File-Install-Version=0.4 + MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain; + Name=AbiWord Word Processor + Name[de]=AbiWord Textverarbeitung diff --git a/editors/abiword-devel/files/patch-an b/editors/abiword-devel/files/patch-an index 1048c7ae0a2b..54d3de78eb22 100644 --- a/editors/abiword-devel/files/patch-an +++ b/editors/abiword-devel/files/patch-an @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- src/Makefile.orig Mon Jun 7 00:15:08 2004 -+++ src/Makefile Mon Jun 7 00:51:56 2004 +--- src/Makefile.orig Mon Dec 22 13:06:12 2003 ++++ src/Makefile Sun Mar 28 15:29:40 2004 @@ -52,6 +52,7 @@ ## Set the following to a list of pathnames to be copied to $(CANONDIR) @@ -21,31 +18,21 @@ $FreeBSD$ @for k in $(CANON_SubDirs); do \ $(MAKE) ABI_ROOT=$(ABI_ROOT) -C $$k canonical; \ done -@@ -73,9 +77,10 @@ - @$(ABICOPY) $(ABI_ROOT)/../abidistfiles/dictionary/$(OS_ENDIAN).*.hash $(CANONDIR)/dictionary - @(cd $(CANONDIR)/dictionary; \ - for k in *.hash; do \ -- cp $$k american.hash; \ -- rm $$k ; \ -+ $(ABICOPY) $$k american.hash; \ -+ $(ABIRM) $$k ; \ - done) +@@ -83,6 +87,7 @@ + ifeq ($(ABI_OPT_PSPELL),1) + echo "Using Pspell build, not installing ispell hash files" + else + @(cd $(CANONDIR)/dictionary; $(ABICHMOD) ugo=r *) - # We currently only ship american.hash, so the above and below aren't logical. - @$(ABICOPY) $(ABI_ROOT)/../abidistfiles/dictionary/*.xml $(CANONDIR)/dictionary - endif -@@ -115,10 +120,12 @@ - fi + # We currently only ship american.hash + @$(subst xxxx,$(CANONDIR)/dictionary,$(VERIFY_DIRECTORY)) + @$(ABICOPY) $(ABI_ROOT)/../abidistfiles/dictionary/$(OS_ENDIAN).american.hash $(CANONDIR)/dictionary/american.hash +@@ -92,7 +97,8 @@ + ifeq ($(ABI_NATIVE),unix) # icons for X window manager use @$(subst xxxx,$(CANONDIR)/icons,$(VERIFY_DIRECTORY)) - (cd $(ABI_ROOT)/../abidistfiles/icons; cp abi* $(CANONDIR)/icons) + (cd $(ABI_ROOT)/../abidistfiles/icons; $(ABICOPY) abi* $(CANONDIR)/icons) + @(cd $(CANONDIR)/icons; $(ABICHMOD) ugo=r abi*) - # font stuff for installation - @$(subst xxxx,$(CANONDIR)/fonts,$(VERIFY_DIRECTORY)) -- (cd $(ABI_ROOT)/../unixfonts/fonts ; cp *.* $(CANONDIR)/fonts) -+ (cd $(ABI_ROOT)/../unixfonts/fonts ; $(ABICOPY) *.* $(CANONDIR)/fonts) -+ @(cd $(CANONDIR)/fonts; $(ABICHMOD) ugo=r *.*) endif - ################################################################## + @$(subst xxxx,$(CANONDIR)/clipart,$(VERIFY_DIRECTORY)) diff --git a/editors/abiword-devel/files/patch-aq b/editors/abiword-devel/files/patch-aq index 4ceb3a27cd99..e00bf0585c14 100644 --- a/editors/abiword-devel/files/patch-aq +++ b/editors/abiword-devel/files/patch-aq @@ -1,25 +1,24 @@ ---- src/config/abi_defs.mk.orig Mon Jun 7 00:43:15 2004 -+++ src/config/abi_defs.mk Mon Jun 7 00:47:55 2004 -@@ -213,11 +213,11 @@ +--- src/config/abi_defs.mk.orig Thu Jun 17 14:54:58 2004 ++++ src/config/abi_defs.mk Thu Jun 17 14:55:04 2004 +@@ -217,11 +217,11 @@ ## INSTALL program... define MAKE_OBJDIR -if test ! -d $(@D); then rm -rf $(@D); mkdir -p $(@D); fi -+if test ! -d $(@D); then $(ABIRM) -rf $(@D); $(ABIMKDIR) -p $(@D); fi ++if test ! -d $(@D); then rm -rf $(@D); $(ABIMKDIR) -p $(@D); fi endef define VERIFY_DIRECTORY -if test ! -d xxxx; then rm -rf xxxx; mkdir -p xxxx; fi -+if test ! -d xxxx; then $(ABIRM) -rf xxxx; $(ABIMKDIR) -p xxxx; fi ++if test ! -d xxxx; then rm -rf xxxx; $(ABIMKDIR) -p xxxx; fi endef ifeq ($(OS_NAME), WIN32) -@@ -262,7 +262,10 @@ +@@ -266,7 +266,9 @@ ################################################################## ################################################################## -ABICOPY=cp -+ABIRM = rm +ABICOPY = cp +ABICHMOD = chmod +ABIMKDIR = mkdir -m u=rwx,go=rx diff --git a/editors/abiword-devel/files/patch-src::af::ev::unix::ev_UnixMenu.cpp b/editors/abiword-devel/files/patch-src::af::ev::unix::ev_UnixMenu.cpp deleted file mode 100644 index 25bce4773cf3..000000000000 --- a/editors/abiword-devel/files/patch-src::af::ev::unix::ev_UnixMenu.cpp +++ /dev/null @@ -1,47 +0,0 @@ ---- src/af/ev/unix/ev_UnixMenu.cpp.orig Sat Feb 28 01:01:29 2004 -+++ src/af/ev/unix/ev_UnixMenu.cpp Sat Feb 28 03:05:52 2004 -@@ -433,22 +433,20 @@ - return true; - } - --static char _ev_get_underlined_char(const char * szString) -+static guint _ev_get_underlined_char(const char * szString) - { - - UT_ASSERT(szString); - -- // return the char right after the underline -- const char * p = szString; -- while (*p && *(p+1)) -+ // return the keycode right after the underline -+ const UT_UCS4String str(szString); -+ for (int i = 0; i < str.length() - 1; ) - { -- if (*p == '_') -- return *++p; -- else -- p++; -+ if (str[i++] == '_') -+ return gdk_unicode_to_keyval(str[i]); - } - -- return 0; -+ return GDK_VoidSymbol; - } - - static void _ev_strip_underline(char * bufResult, -@@ -751,12 +749,12 @@ - // version of the underlined char, since all the menus ignore upper - // case (SHIFT-MOD1-[char]) invokations of accelerators. - -- if (bAltOnMod1) -+ if (keyCode != GDK_VoidSymbol && bAltOnMod1) - { - EV_EditEventMapper * pEEM = m_pFrame->getEditEventMapper(); - UT_ASSERT(pEEM); - EV_EditMethod * pEM = NULL; -- pEEM->Keystroke(EV_EKP_PRESS|EV_EMS_ALT|tolower(keyCode),&pEM); -+ pEEM->Keystroke(EV_EKP_PRESS|EV_EMS_ALT|keyCode,&pEM); - - // if the pointer is valid, there is a conflict - bConflict = (pEM != NULL); diff --git a/editors/abiword-devel/files/patch-src::wp::ap::xp::ap_Menu_Functions.cpp b/editors/abiword-devel/files/patch-src::wp::ap::xp::ap_Menu_Functions.cpp deleted file mode 100644 index 644756ef4078..000000000000 --- a/editors/abiword-devel/files/patch-src::wp::ap::xp::ap_Menu_Functions.cpp +++ /dev/null @@ -1,135 +0,0 @@ ---- src/wp/ap/xp/ap_Menu_Functions.cpp.orig Wed Jun 2 12:47:46 2004 -+++ src/wp/ap/xp/ap_Menu_Functions.cpp Wed Jun 2 12:47:49 2004 -@@ -62,92 +62,94 @@ - const char * c = NULL; - - const XAP_StringSet * pss = pApp->getStringSet(); -- c = pss->getValueUTF8(AP_STRING_ID_DLG_Spell_NoSuggestions).utf8_str(); -+ static UT_UTF8String s; - - switch (id) - { - case AP_MENU_ID_AUTOTEXT_ATTN_1: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_ATTN_1).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_ATTN_1); break; - case AP_MENU_ID_AUTOTEXT_ATTN_2: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_ATTN_2).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_ATTN_2); break; - - case AP_MENU_ID_AUTOTEXT_CLOSING_1: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_1).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_1); break; - case AP_MENU_ID_AUTOTEXT_CLOSING_2: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_2).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_2); break; - case AP_MENU_ID_AUTOTEXT_CLOSING_3: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_3).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_3); break; - case AP_MENU_ID_AUTOTEXT_CLOSING_4: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_4).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_4); break; - case AP_MENU_ID_AUTOTEXT_CLOSING_5: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_5).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_5); break; - case AP_MENU_ID_AUTOTEXT_CLOSING_6: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_6).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_6); break; - case AP_MENU_ID_AUTOTEXT_CLOSING_7: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_7).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_7); break; - case AP_MENU_ID_AUTOTEXT_CLOSING_8: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_8).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_8); break; - case AP_MENU_ID_AUTOTEXT_CLOSING_9: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_9).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_9); break; - case AP_MENU_ID_AUTOTEXT_CLOSING_10: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_10).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_10); break; - case AP_MENU_ID_AUTOTEXT_CLOSING_11: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_11).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_11); break; - case AP_MENU_ID_AUTOTEXT_CLOSING_12: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_12).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_CLOSING_12); break; - - case AP_MENU_ID_AUTOTEXT_MAIL_1: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_MAIL_1).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_MAIL_1); break; - case AP_MENU_ID_AUTOTEXT_MAIL_2: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_MAIL_2).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_MAIL_2); break; - case AP_MENU_ID_AUTOTEXT_MAIL_3: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_MAIL_3).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_MAIL_3); break; - case AP_MENU_ID_AUTOTEXT_MAIL_4: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_MAIL_4).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_MAIL_4); break; - case AP_MENU_ID_AUTOTEXT_MAIL_5: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_MAIL_5).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_MAIL_5); break; - case AP_MENU_ID_AUTOTEXT_MAIL_6: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_MAIL_6).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_MAIL_6); break; - case AP_MENU_ID_AUTOTEXT_MAIL_7: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_MAIL_7).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_MAIL_7); break; - case AP_MENU_ID_AUTOTEXT_MAIL_8: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_MAIL_8).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_MAIL_8); break; - - case AP_MENU_ID_AUTOTEXT_REFERENCE_1: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_REFERENCE_1).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_REFERENCE_1); break; - case AP_MENU_ID_AUTOTEXT_REFERENCE_2: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_REFERENCE_2).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_REFERENCE_2); break; - case AP_MENU_ID_AUTOTEXT_REFERENCE_3: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_REFERENCE_3).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_REFERENCE_3); break; - - case AP_MENU_ID_AUTOTEXT_SALUTATION_1: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_SALUTATION_1).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_SALUTATION_1); break; - case AP_MENU_ID_AUTOTEXT_SALUTATION_2: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_SALUTATION_2).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_SALUTATION_2); break; - case AP_MENU_ID_AUTOTEXT_SALUTATION_3: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_SALUTATION_3).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_SALUTATION_3); break; - case AP_MENU_ID_AUTOTEXT_SALUTATION_4: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_SALUTATION_4).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_SALUTATION_4); break; - - case AP_MENU_ID_AUTOTEXT_SUBJECT_1: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_SUBJECT_1).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_SUBJECT_1); break; - - case AP_MENU_ID_AUTOTEXT_EMAIL_1: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_EMAIL_1).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_EMAIL_1); break; - case AP_MENU_ID_AUTOTEXT_EMAIL_2: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_EMAIL_2).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_EMAIL_2); break; - case AP_MENU_ID_AUTOTEXT_EMAIL_3: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_EMAIL_3).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_EMAIL_3); break; - case AP_MENU_ID_AUTOTEXT_EMAIL_4: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_EMAIL_4).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_EMAIL_4); break; - case AP_MENU_ID_AUTOTEXT_EMAIL_5: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_EMAIL_5).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_EMAIL_5); break; - case AP_MENU_ID_AUTOTEXT_EMAIL_6: -- c = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_EMAIL_6).utf8_str(); break; -+ s = pss->getValueUTF8(AP_STRING_ID_AUTOTEXT_EMAIL_6); break; - - default: -- c = "No clue"; break; -+ s = pss->getValueUTF8(AP_STRING_ID_DLG_Spell_NoSuggestions); break; - } -+ -+ c = s.utf8_str(); - - return c; - } diff --git a/editors/abiword-devel/files/patch-src_af_util_xp_ut_iconv.cpp b/editors/abiword-devel/files/patch-src_af_util_xp_ut_iconv.cpp index 72ff257a611b..dd1f65d7282b 100644 --- a/editors/abiword-devel/files/patch-src_af_util_xp_ut_iconv.cpp +++ b/editors/abiword-devel/files/patch-src_af_util_xp_ut_iconv.cpp @@ -1,13 +1,11 @@ ---- src/af/util/xp/ut_iconv.cpp.orig Thu Jul 17 15:12:55 2003 -+++ src/af/util/xp/ut_iconv.cpp Thu Jul 17 15:16:40 2003 -@@ -295,8 +295,8 @@ - return (size_t)-1; +--- src/af/util/xp/ut_iconv.cpp.orig Fri Jan 2 16:00:33 2004 ++++ src/af/util/xp/ut_iconv.cpp Fri Jan 2 16:08:03 2004 +@@ -67,7 +67,7 @@ + #if defined (WIN32) || defined(__QNXNTO__) || defined(__CYGWIN__) || \ + (defined (__MACH__) && defined (__APPLE__)) || \ + (defined(TARGET_OS_MAC) && TARGET_OS_MAC) || \ +-defined(__BEOS__) || defined (__AIX__) || \ ++defined(__BEOS__) || defined (__AIX__) || defined (__FreeBSD__) || \ + (defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1)) - -- ICONV_CONST char ** buf = const_cast<ICONV_CONST char**>(inbuf); -- return iconv( cd, buf, inbytesleft, outbuf, outbytesleft ); -+ //ICONV_CONST char ** buf = const_cast<ICONV_CONST char**>(inbuf); -+ return iconv( cd, inbuf, inbytesleft, outbuf, outbytesleft ); - } - - int UT_iconv_close( UT_iconv_t cd ) + #define ICONV_CONST const diff --git a/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixDlg_Insert_Symbol.h b/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixDlg_Insert_Symbol.h deleted file mode 100644 index 55a8f0c4daae..000000000000 --- a/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixDlg_Insert_Symbol.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/af/xap/unix/xap_UnixDlg_Insert_Symbol.h.orig Mon Dec 15 01:39:26 2003 -+++ src/af/xap/unix/xap_UnixDlg_Insert_Symbol.h Mon Dec 15 01:39:41 2003 -@@ -24,7 +24,7 @@ - #include "xap_UnixFontManager.h" - #include <gdk/gdkkeysyms.h> - --#define DEFAULT_UNIX_SYMBOL_FONT "Symbol" -+#define DEFAULT_UNIX_SYMBOL_FONT "" - - class XAP_Frame; - diff --git a/editors/abiword-devel/files/patch-src_pkg_linux_rpm_data_abiword.desktop b/editors/abiword-devel/files/patch-src_pkg_linux_rpm_data_abiword.desktop deleted file mode 100644 index 656c586a6e48..000000000000 --- a/editors/abiword-devel/files/patch-src_pkg_linux_rpm_data_abiword.desktop +++ /dev/null @@ -1,11 +0,0 @@ ---- src/pkg/linux/rpm/data/abiword.desktop.orig Sun Apr 6 14:45:19 2003 -+++ src/pkg/linux/rpm/data/abiword.desktop Sun Apr 20 00:33:09 2003 -@@ -12,7 +12,7 @@ - Icon=abiword_48.png - Terminal=0 - Type=Application --Categories=Application;Office;WordProcessor;X-Red-Hat-Base; -+Categories=Application;Office;WordProcessor; - StartupNotify=true - Encoding=UTF-8 - X-Desktop-File-Install-Version=0.3 |