diff options
Diffstat (limited to 'editors/AbiWord2/files')
4 files changed, 17 insertions, 16 deletions
diff --git a/editors/AbiWord2/files/patch-GNUmakefile.in b/editors/AbiWord2/files/patch-GNUmakefile.in index 191db41c0..ad9a02ccf 100644 --- a/editors/AbiWord2/files/patch-GNUmakefile.in +++ b/editors/AbiWord2/files/patch-GNUmakefile.in @@ -1,6 +1,6 @@ ---- GNUmakefile.in.orig Thu Jun 10 17:36:52 2004 -+++ GNUmakefile.in Thu Jun 10 17:39:30 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 -@@ -585,7 +585,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 ;\ -@@ -598,11 +597,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/AbiWord2/files/patch-aq b/editors/AbiWord2/files/patch-aq index ed0324f28..e00bf0585 100644 --- a/editors/AbiWord2/files/patch-aq +++ b/editors/AbiWord2/files/patch-aq @@ -1,6 +1,6 @@ ---- src/config/abi_defs.mk Fri Jun 9 15:48:49 2000 -+++ src/config/abi_defs.mk.new Thu Jun 22 16:32:03 2000 -@@ -124,11 +124,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 @@ -14,7 +14,7 @@ endef ifeq ($(OS_NAME), WIN32) -@@ -160,7 +160,9 @@ +@@ -266,7 +266,9 @@ ################################################################## ################################################################## diff --git a/editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp b/editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp index 9af484ab2..68ffd22d8 100644 --- a/editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp +++ b/editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp @@ -1,9 +1,9 @@ $FreeBSD$ ---- src/wp/ap/unix/ap_UnixApp.cpp.orig Thu Dec 6 09:00:14 2001 -+++ src/wp/ap/unix/ap_UnixApp.cpp Mon Dec 17 13:49:48 2001 -@@ -612,7 +612,7 @@ +--- src/wp/ap/unix/ap_UnixApp.cpp.orig Thu Jun 17 14:57:19 2004 ++++ src/wp/ap/unix/ap_UnixApp.cpp Thu Jun 17 14:58:01 2004 +@@ -788,7 +788,7 @@ { pluginDir = pluginList[i]; @@ -12,3 +12,4 @@ $FreeBSD$ UT_DEBUGMSG(("DOM: found %d plugins in %s\n", n, pluginDir.c_str())); if (n > 0) + diff --git a/editors/AbiWord2/files/patch-src_af_util_xp_ut_string_class.cpp b/editors/AbiWord2/files/patch-src_af_util_xp_ut_string_class.cpp index a82b611a7..668f9ea55 100644 --- a/editors/AbiWord2/files/patch-src_af_util_xp_ut_string_class.cpp +++ b/editors/AbiWord2/files/patch-src_af_util_xp_ut_string_class.cpp @@ -1,5 +1,5 @@ ---- src/af/util/xp/ut_string_class.cpp.orig Mon Aug 25 03:34:03 2003 -+++ src/af/util/xp/ut_string_class.cpp Mon Aug 25 03:42:00 2003 +--- src/af/util/xp/ut_string_class.cpp.orig Thu Jun 17 15:00:46 2004 ++++ src/af/util/xp/ut_string_class.cpp Thu Jun 17 15:02:15 2004 @@ -28,6 +28,7 @@ #include <locale.h> #include <ctype.h> @@ -8,7 +8,7 @@ #include "ut_string.h" #include "ut_string_class.h" -@@ -340,13 +341,13 @@ +@@ -342,13 +343,13 @@ return len; } @@ -19,7 +19,7 @@ # define VA_COPY(ap1, ap2) (*(ap1) = *(ap2)) # elif defined (VA_COPY_AS_ARRAY) # define VA_COPY(ap1, ap2) memmove ((ap1), (ap2), sizeof (va_list)) --# elif defined (__GNUC__) +-# elif defined (__GNUC__) && defined (__va_copy) -# define VA_COPY(ap1,ap2) __va_copy((ap1),(ap2)) # else /* va_list is a pointer */ # define VA_COPY(ap1, ap2) ((ap1) = (ap2)) |