diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-08-25 08:41:49 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-08-25 08:41:49 +0000 |
commit | 9eb4729b0a718a88f1aa945dbc271c0f8a2adf9e (patch) | |
tree | 7b8a8d5b8f7637277c1b1d6d91e55317722d6ffa /editors/abiword-devel/files | |
parent | Update to 0.39, the latest release. (diff) |
Update to 1.99.5 (aka 2.0 RC 1).
Notes
Notes:
svn path=/head/; revision=87654
Diffstat (limited to 'editors/abiword-devel/files')
4 files changed, 65 insertions, 14 deletions
diff --git a/editors/abiword-devel/files/patch-GNUmakefile.am b/editors/abiword-devel/files/patch-GNUmakefile.am new file mode 100644 index 000000000000..3e4cc389dd55 --- /dev/null +++ b/editors/abiword-devel/files/patch-GNUmakefile.am @@ -0,0 +1,22 @@ +--- GNUmakefile.am.orig Mon Aug 18 09:45:27 2003 ++++ GNUmakefile.am Mon Aug 25 04:25:53 2003 +@@ -76,7 +76,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 ;\ +@@ -89,11 +88,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-autogen.sh b/editors/abiword-devel/files/patch-autogen.sh index 84fe028e64ac..4534322f4ca7 100644 --- a/editors/abiword-devel/files/patch-autogen.sh +++ b/editors/abiword-devel/files/patch-autogen.sh @@ -1,11 +1,11 @@ ---- autogen.sh.orig Thu Oct 17 08:19:31 2002 -+++ autogen.sh Fri Feb 21 23:47:48 2003 -@@ -10,20 +10,20 @@ +--- autogen.sh.orig Fri Aug 1 04:40:52 2003 ++++ autogen.sh Mon Aug 25 03:31:45 2003 +@@ -10,31 +10,31 @@ rm -f autogen.err -automake --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print; if ($1 < 1.4) {exit 1;}}' -+%%AUTOMAKE%% --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print; if ($1 < 1.4) {exit 1;}}' ++%%AUTOMAKE%% --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print; if ($1 < 1.4) {exit 1;}}' if [ $? -ne 0 ]; then echo "Error: you need automake 1.4 or later. Please upgrade." @@ -19,14 +19,6 @@ exit 1 fi - for script in `cd ac-helpers/fallback; echo *.m4`; do -- if test -r `aclocal --print-ac-dir 2>> autogen.err`/$script; then -+ if test -r `%%ACLOCAL%% --print-ac-dir 2>> autogen.err`/$script; then - # Perhaps it was installed recently - rm -f ac-helpers/$script - else -@@ -34,17 +34,17 @@ - # Produce aclocal.m4, so autoconf gets the automake macros it needs # -echo "Creating aclocal.m4: aclocal -I ac-helpers $ACLOCAL_FLAGS" @@ -48,7 +40,7 @@ exit 1 } pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN` -@@ -66,9 +66,9 @@ +@@ -56,9 +56,9 @@ # Produce all the `GNUmakefile.in's and create neat missing things # like `install-sh', etc. # @@ -60,7 +52,7 @@ echo "" echo "* * * warning: possible errors while running automake - check autogen.err" echo "" -@@ -84,7 +84,7 @@ +@@ -74,7 +74,7 @@ # echo "Creating configure..." diff --git a/editors/abiword-devel/files/patch-src_af_util_xp_ut_string_class.cpp b/editors/abiword-devel/files/patch-src_af_util_xp_ut_string_class.cpp new file mode 100644 index 000000000000..a82b611a78c9 --- /dev/null +++ b/editors/abiword-devel/files/patch-src_af_util_xp_ut_string_class.cpp @@ -0,0 +1,26 @@ +--- 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 +@@ -28,6 +28,7 @@ + #include <locale.h> + #include <ctype.h> + #include <stdarg.h> ++#include <glib.h> + + #include "ut_string.h" + #include "ut_string_class.h" +@@ -340,13 +341,13 @@ + return len; + } + ++#define VA_COPY G_VA_COPY ++ + #if !defined (VA_COPY) + # if defined (__GNUC__) && defined (__PPC__) && (defined (_CALL_SYSV) || defined (_WIN32) || defined(WIN32)) || defined(__s390__) || defined(__x86_64__) + # 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__) +-# define VA_COPY(ap1,ap2) __va_copy((ap1),(ap2)) + # else /* va_list is a pointer */ + # define VA_COPY(ap1, ap2) ((ap1) = (ap2)) + # endif /* va_list is a pointer */ diff --git a/editors/abiword-devel/files/patch-src_wp_impexp_xp_ie_imp_MsWord_97.cpp b/editors/abiword-devel/files/patch-src_wp_impexp_xp_ie_imp_MsWord_97.cpp new file mode 100644 index 000000000000..80c0b5b77580 --- /dev/null +++ b/editors/abiword-devel/files/patch-src_wp_impexp_xp_ie_imp_MsWord_97.cpp @@ -0,0 +1,11 @@ +--- src/wp/impexp/xp/ie_imp_MsWord_97.cpp.orig Mon Aug 25 04:03:16 2003 ++++ src/wp/impexp/xp/ie_imp_MsWord_97.cpp Mon Aug 25 04:03:27 2003 +@@ -3402,7 +3402,7 @@ + comprLen = size; + uncomprLen = b->blip.metafile.m_cb; + unsigned char *uncompr = new unsigned char[uncomprLen]; +- int err = uncompress (uncompr, &uncomprLen, data, comprLen); ++ int err = uncompress (uncompr, &uncomprLen, (unsigned char *)data, comprLen); + if (err != Z_OK) + { + UT_DEBUGMSG(("Could not uncompress image\n")); |