This commit was manufactured by cvs2git to create branch 'DEVEL'.

Cherrypick from master 2005-06-06 15:38:47 UTC witekfl <witekfl@pld-linux.org> 'Compilation fix (probably for gcc 4). Anyway abiword miscompiled without it.':
    abiword-desktop.patch -> 1.5
    abiword-home_etc.patch -> 1.2
    abiword-mailmerge.patch -> 1.1
Cherrypick from master 2004-12-23 13:15:22 UTC saq <saq@pld-linux.org> '- fix the right files':
    abiword-python24.patch -> 1.2

diff --git a/abiword-desktop.patch b/abiword-desktop.patch
new file mode 100644 (file)
index 0000000..fbff8ab
--- /dev/null
+++ b/abiword-desktop.patch
@@ -0,0 +1,29 @@
+diff -aurN abiword-2.2.6.orig/abi/abiword.desktop abiword-2.2.6/abi/abiword.desktop
+--- abiword-2.2.6.orig/abi/abiword.desktop     2005-04-04 08:08:43.000000000 +0200
++++ abiword-2.2.6/abi/abiword.desktop  2005-04-04 10:42:04.361374488 +0200
+@@ -1,13 +1,12 @@
+ [Desktop Entry]
+ Exec=abiword
+-Icon=abiword_48.png
++Icon=abiword.png
+ Terminal=false
+ Type=Application
+-Categories=Application;Office;WordProcessor;X-Red-Hat-Base;
++Categories=GTK;GNOME;Office;WordProcessor;
+ StartupNotify=true
+ Encoding=UTF-8
+-X-Desktop-File-Install-Version=0.9
+-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/vnd.ms-word;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
++MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;
+ Name=Word Processor
+ Comment=AbiWord Word Processor
+ Name[de]=Textverarbeitung
+@@ -18,7 +17,6 @@
+ Comment[nl]=AbiWord tekstverwerker
+ Name[nn]=Tekstbehandling
+ Comment[nn]=AbiWord Tekstbehandling
+-Name[no]=Tekstbehandler
+-Comment[no]=AbiWord Tekstbehandler
++Name[pl]=Procesor tekstu AbiWord
+ Name[pt]=Processador de Texto
+ Comment[pt]=AbiWord Processador de Texto

diff --git a/abiword-home_etc.patch b/abiword-home_etc.patch
new file mode 100644 (file)
index 0000000..ed0f1b6
--- /dev/null
+++ b/abiword-home_etc.patch
@@ -0,0 +1,37 @@
+diff -Nru abiword-2.0.1.orig/abi/src/af/xap/unix/xap_UnixApp.cpp abiword-2.0.1/abi/src/af/xap/unix/xap_UnixApp.cpp
+--- abiword-2.0.1.orig/abi/src/af/xap/unix/xap_UnixApp.cpp     2003-06-07 18:28:14.000000000 +0200
++++ abiword-2.0.1/abi/src/af/xap/unix/xap_UnixApp.cpp  2003-11-14 09:12:37.000000000 +0100
+@@ -176,7 +176,7 @@
+       static char buf[PATH_MAX];
+       memset(buf,0,sizeof(buf));
+       
+-      char * szHome = getenv("HOME");
++      char * szHome = getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv("HOME");
+       if (!szHome || !*szHome)
+               szHome = "./";
+       
+diff -Nru abiword-2.0.1.orig/abi/src/wp/ap/unix/ap_UnixApp.cpp abiword-2.0.1/abi/src/wp/ap/unix/ap_UnixApp.cpp
+--- abiword-2.0.1.orig/abi/src/wp/ap/unix/ap_UnixApp.cpp       2003-10-10 15:35:35.000000000 +0200
++++ abiword-2.0.1/abi/src/wp/ap/unix/ap_UnixApp.cpp    2003-11-14 09:14:05.000000000 +0100
+@@ -1099,7 +1099,7 @@
+       static char buf[PATH_MAX];
+       memset(buf,0,sizeof(buf));
+       
+-      char * szHome = getenv("HOME");
++      char * szHome = getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv("HOME");
+       if (!szHome || !*szHome)
+               szHome = "./";
+       
+--- abiword-2.0.1.orig/popt/poptconfig.c       2002-11-11 03:00:51.000000000 +0100
++++ abiword-2.0.1/popt/poptconfig.c    2003-11-14 09:55:31.000000000 +0100
+@@ -144,7 +144,9 @@
+     }
+ #endif
+ 
+-    if ((home = getenv("HOME"))) {
++      home = getenv("HOME_ETC");
++      if (!home) home = getenv("HOME");
++    if (home) {
+       fn = alloca(strlen(home) + 20);
+       strcpy(fn, home);
+       strcat(fn, "/.popt");

diff --git a/abiword-mailmerge.patch b/abiword-mailmerge.patch
new file mode 100644 (file)
index 0000000..c413966
--- /dev/null
+++ b/abiword-mailmerge.patch
@@ -0,0 +1,11 @@
+--- abiword-2.2.8.orig/abi/src/wp/impexp/xp/ie_mailmerge.h     2005-01-23 15:37:50.000000000 +0100
++++ abiword-2.2.8/abi/src/wp/impexp/xp/ie_mailmerge.h  2005-06-06 17:19:34.932480728 +0200
+@@ -28,6 +28,8 @@
+ typedef UT_sint32 IEMergeType;
+ #define IEMT_Unknown ((IEMergeType)-1)
+ 
++class ABI_EXPORT IE_MailMerge;
++
+ class ABI_EXPORT IE_MergeSniffer : public UT_AbiObject
+ {
+   friend class IE_MailMerge;

diff --git a/abiword-python24.patch b/abiword-python24.patch
new file mode 100644 (file)
index 0000000..cf5d760
--- /dev/null
+++ b/abiword-python24.patch
@@ -0,0 +1,50 @@
+--- abiword-2.0.14/abiword-plugins/tools/gypsython/plugin.m4.orig      2004-12-23 14:01:57.074696040 +0100
++++ abiword-2.0.14/abiword-plugins/tools/gypsython/plugin.m4   2004-12-23 14:02:20.946626000 +0100
+@@ -28,27 +28,27 @@
+ # Checks for libraries.
+ # Checks for header files.
+ 
+-AC_ARG_WITH(python,[  --with-python=DIR        Python 2.3 library in DIR],[
++AC_ARG_WITH(python,[  --with-python=DIR        Python 2.4 library in DIR],[
+       if test "x$withval" = "xno"; then
+               ABI_PLUGIN_REPORT([gypsython: Python support disabled])
+               abi_plugin_disable=yes
+       elif test "x$withval" != "xyes"; then
+-              ABI_GYPSY_CPPFLAGS="-I$withval/include/python2.3"
++              ABI_GYPSY_CPPFLAGS="-I$withval/include/python2.4"
+               ABI_GYPSY_LDFLAGS="-L$withval/lib"
+-              CPPFLAGS="$CPPFLAGS -I$withval/include/python2.3"
++              CPPFLAGS="$CPPFLAGS -I$withval/include/python2.4"
+               LDFLAGS="$LDFLAGS -L$withval/lib"
+       else
+-              ABI_GYPSY_CPPFLAGS="-I/usr/include/python2.3"
+-              CPPFLAGS="$CPPFLAGS -I/usr/include/python2.3"
++              ABI_GYPSY_CPPFLAGS="-I/usr/include/python2.4"
++              CPPFLAGS="$CPPFLAGS -I/usr/include/python2.4"
+       fi
+-],[   ABI_GYPSY_CPPFLAGS="-I/usr/include/python2.3"
+-      CPPFLAGS="$CPPFLAGS -I/usr/include/python2.3"
++],[   ABI_GYPSY_CPPFLAGS="-I/usr/include/python2.4"
++      CPPFLAGS="$CPPFLAGS -I/usr/include/python2.4"
+ ])
+ 
+ if test $abi_plugin_disable != yes; then
+       AC_CHECK_HEADER(Python.h,[
+-              AC_CHECK_LIB(python2.3,Py_Initialize,[
+-                      ABI_GYPSY_LDFLAGS="$ABI_GYPSY_LDFLAGS -lpython2.3"
++              AC_CHECK_LIB(python2.4,Py_Initialize,[
++                      ABI_GYPSY_LDFLAGS="$ABI_GYPSY_LDFLAGS -lpython2.4"
+                       ABI_PLUGIN_REPORT([gypsython: okay])
+               ],[     ABI_PLUGIN_REPORT([gypsython: error - Python library not found])
+                       abi_plugin_disable=yes
+--- abiword-2.0.14/abiword-plugins/tools/gypsython/xp/Gypsython.h.orig 2004-12-23 14:10:50.111645632 +0100
++++ abiword-2.0.14/abiword-plugins/tools/gypsython/xp/Gypsython.h      2004-12-23 14:11:02.641740768 +0100
+@@ -37,7 +37,7 @@
+ #include "xap_Dlg_Language.h"
+ #include "xap_Frame.h"
+ 
+-#include <python2.3/Python.h>
++#include <python2.4/Python.h>
+  
+  
+