diff options
Diffstat (limited to 'editors/abiword-devel/files')
-rw-r--r-- | editors/abiword-devel/files/patch-GNUmakefile.in | 49 | ||||
-rw-r--r-- | editors/abiword-devel/files/patch-abiword.desktop | 14 | ||||
-rw-r--r-- | editors/abiword-devel/files/patch-af | 11 | ||||
-rw-r--r-- | editors/abiword-devel/files/patch-an | 38 | ||||
-rw-r--r-- | editors/abiword-devel/files/patch-aq | 27 | ||||
-rw-r--r-- | editors/abiword-devel/files/patch-ar | 14 | ||||
-rw-r--r-- | editors/abiword-devel/files/patch-src::af::ev::unix::ev_UnixMenu.cpp | 47 | ||||
-rw-r--r-- | editors/abiword-devel/files/patch-src_af_util_xp_ut_iconv.cpp | 11 |
8 files changed, 0 insertions, 211 deletions
diff --git a/editors/abiword-devel/files/patch-GNUmakefile.in b/editors/abiword-devel/files/patch-GNUmakefile.in deleted file mode 100644 index ad9a02ccfca8..000000000000 --- a/editors/abiword-devel/files/patch-GNUmakefile.in +++ /dev/null @@ -1,49 +0,0 @@ ---- 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 - --expat_peerdir = $(top_builddir)/../expat --wv_peerdir = $(top_builddir)/../wv --libiconv_peerdir = $(top_builddir)/../libiconv --libpng_peerdir = @LIBPNG_PEERDIR@ --libpopt_peerdir = $(top_builddir)/../popt -+#expat_peerdir = $(top_builddir)/../expat -+#wv_peerdir = $(top_builddir)/../wv -+#libiconv_peerdir = $(top_builddir)/../libiconv -+#libpng_peerdir = @LIBPNG_PEERDIR@ -+#libpopt_peerdir = $(top_builddir)/../popt - --desktop_DATA = abiword.desktop --desktopdir = $(datadir)/applications -+#desktop_DATA = abiword.desktop -+#desktopdir = $(datadir)/applications - --icon_DATA = abiword_48.png --icondir = $(datadir)/icons -+#icon_DATA = abiword_48.png -+#icondir = $(datadir)/icons - - @BIGENDIAN_TRUE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/BigEndian32.american.hash - @BIGENDIAN_FALSE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/LittleEndian32.american.hash -@@ -550,7 +550,6 @@ - - # Install the datafiles. This is quick-and-dirty. - install-data-local: -- @$(mkinstalldirs) $(DESTDIR)$(bonobodir) - if test -d $(top_srcdir)/../abidistfiles ; then \ - for dir in `cd $(top_srcdir)/../abidistfiles; find . -type d ! -name CVS` ; do \ - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ;\ -@@ -563,11 +562,7 @@ - for file in $(top_srcdir)/../abidistfiles/$$dir/* ; do \ - if test -f $$file ; then \ - sfile=`echo "$$file" | sed 's/\.[^.]*$$//'`; \ -- if test "$$sfile.server" = $$file; then \ -- $(INSTALL_DATA) $$file $(DESTDIR)$(bonobodir); \ -- else \ - $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/$$dir; \ -- fi; \ - fi; \ - done; \ - fi; \ diff --git a/editors/abiword-devel/files/patch-abiword.desktop b/editors/abiword-devel/files/patch-abiword.desktop deleted file mode 100644 index b314f946e3cd..000000000000 --- a/editors/abiword-devel/files/patch-abiword.desktop +++ /dev/null @@ -1,14 +0,0 @@ ---- 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-af b/editors/abiword-devel/files/patch-af deleted file mode 100644 index 502e8de76cd9..000000000000 --- a/editors/abiword-devel/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ ---- src/af/util/xp/ut_png.cpp.orig Wed Apr 17 12:49:55 2002 -+++ src/af/util/xp/ut_png.cpp Fri Apr 19 20:40:25 2002 -@@ -24,7 +24,7 @@ - #ifdef _AIX - #define jmpbuf __jmpbuf - #endif --#include "png.h" -+#include <png.h> - - #include "ut_assert.h" - #include "ut_bytebuf.h" diff --git a/editors/abiword-devel/files/patch-an b/editors/abiword-devel/files/patch-an deleted file mode 100644 index 54d3de78eb22..000000000000 --- a/editors/abiword-devel/files/patch-an +++ /dev/null @@ -1,38 +0,0 @@ ---- 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) - CANON_TOPLEVELFILES= $(ABI_ROOT)/COPYING $(ABI_ROOT)/user/wp/readme.txt -+CANON_TLF_NOTDIR= $(notdir $(CANON_TOPLEVELFILES)) - - ## Set the following to a list of directories (probably a subset of DIRS) - ## that have work to do. -@@ -62,6 +63,9 @@ - @for k in $(CANON_TOPLEVELFILES); do \ - $(ABICOPY) $$k $(CANONDIR); \ - done -+ @for k in $(CANON_TLF_NOTDIR); do \ -+ $(ABICHMOD) ugo=r $(CANONDIR)/$$k; \ -+ done - @for k in $(CANON_SubDirs); do \ - $(MAKE) ABI_ROOT=$(ABI_ROOT) -C $$k canonical; \ - 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 - @$(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*) - endif - - @$(subst xxxx,$(CANONDIR)/clipart,$(VERIFY_DIRECTORY)) diff --git a/editors/abiword-devel/files/patch-aq b/editors/abiword-devel/files/patch-aq deleted file mode 100644 index e00bf0585c14..000000000000 --- a/editors/abiword-devel/files/patch-aq +++ /dev/null @@ -1,27 +0,0 @@ ---- 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 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 rm -rf xxxx; $(ABIMKDIR) -p xxxx; fi - endef - - ifeq ($(OS_NAME), WIN32) -@@ -266,7 +266,9 @@ - ################################################################## - ################################################################## - --ABICOPY=cp -+ABICOPY = cp -+ABICHMOD = chmod -+ABIMKDIR = mkdir -m u=rwx,go=rx - - ifdef ABISOURCE_LICENSED_TRADEMARKS - ABI_TMDEFS= -DABISOURCE_LICENSED_TRADEMARKS diff --git a/editors/abiword-devel/files/patch-ar b/editors/abiword-devel/files/patch-ar deleted file mode 100644 index 5832a8deed5c..000000000000 --- a/editors/abiword-devel/files/patch-ar +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- src/pkg/common/unix/scripts/install.sh.orig Sat Apr 7 10:59:52 2001 -+++ src/pkg/common/unix/scripts/install.sh Wed Aug 8 13:31:57 2001 -@@ -80,7 +80,7 @@ - - echo "Installing program binaries to [$LIBEXECDIR]..." - # Setup bins --(cd $SRCDIR/bin; tar cf - *) | (cd $LIBEXECDIR; tar xf -) -+(cd $SRCDIR/bin; cp Abi* $LIBEXECDIR) - - ######################################################################## - # If we're on Solaris, run makepsres on the font path 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 7151aa6a23a2..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 Dec 11 16:05:23 2004 -+++ src/af/ev/unix/ev_UnixMenu.cpp Sat Dec 11 16:09:41 2004 -@@ -431,22 +431,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, -@@ -749,12 +747,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 = XAP_App::getApp()->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_af_util_xp_ut_iconv.cpp b/editors/abiword-devel/files/patch-src_af_util_xp_ut_iconv.cpp deleted file mode 100644 index dd1f65d7282b..000000000000 --- a/editors/abiword-devel/files/patch-src_af_util_xp_ut_iconv.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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)) - - #define ICONV_CONST const |