This commit was manufactured by cvs2git to create branch

'unlabeled-1.120.2'.

Sprout from master 2006-05-22 17:16:23 UTC freetz <freetz@pld-linux.org> '- rel.3 for rebuild'
Delete:
    abiword-desktop.patch
    abiword-gda.patch
    abiword-home_etc.patch
    abiword-mailmerge.patch
    abiword-poppler05x.patch

diff --git a/abiword-desktop.patch b/abiword-desktop.patch
deleted file mode 100644 (file)
index 539bbc5..0000000
--- a/abiword-desktop.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -aurN abiword-2.4.4.orig/abi/abiword.desktop abiword-2.4.4/abi/abiword.desktop
---- abiword-2.4.4.orig/abi/abiword.desktop     2006-04-03 14:14:01.000000000 +0200
-+++ abiword-2.4.4/abi/abiword.desktop  2006-04-13 18:25:02.328406136 +0200
-@@ -1,13 +1,12 @@
- [Desktop Entry]
- Exec=abiword
--Icon=abiword_48.png
-+Icon=abiword.png
- Terminal=false
- Type=Application
--Categories=Application;Office;WordProcessor;GNOME;GTK;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/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
-+MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;application/msword;application/rtf;
- Name=AbiWord
- GenericName=Word Processor
- Comment=AbiWord Word Processor
-@@ -19,7 +18,7 @@
- Comment[nl]=AbiWord tekstverwerker
- Name[nn]=Tekstbehandling
- Comment[nn]=AbiWord Tekstbehandling
--Name[no]=Tekstbehandler
--Comment[no]=AbiWord Tekstbehandler
-+Name[pl]=Procesor tekstu AbiWord
-+Comment[pl]=Procesor tekstu
- Name[pt]=Processador de Texto
- Comment[pt]=AbiWord Processador de Texto

diff --git a/abiword-gda.patch b/abiword-gda.patch
deleted file mode 100644 (file)
index 451b2f7..0000000
--- a/abiword-gda.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -urbB abiword-2.4.1.org/abiword-plugins/tools/gda/plugin.m4 abiword-2.4.1/abiword-plugins/tools/gda/plugin.m4
---- abiword-2.4.1.org/abiword-plugins/tools/gda/plugin.m4      2005-09-25 13:28:14.000000000 +0200
-+++ abiword-2.4.1/abiword-plugins/tools/gda/plugin.m4  2005-10-24 22:22:34.922621500 +0200
-@@ -29,7 +29,7 @@
- # Checks for header files.
- 
- dnl only unix builds should need this stuff, so why...?
--PKG_CHECK_MODULES(_abi_gda,[libgda >= 1.2.0 libgnomedb >= 1.2.0],[
-+PKG_CHECK_MODULES(_abi_gda,[libgda-2.0 >= 1.2.0 libgnomedb-2.0 >= 1.2.0],[
-       ABI_PLUGIN_REPORT([gda: okay])
- ],[   ABI_PLUGIN_REPORT([gda: error - libgda and libgnomedb >= 1.2.0 required])
-       abi_plugin_disable=yes
-diff -urbB abiword-2.4.1.org/abiword-plugins/tools/gda/unix/AbiGDA.cpp abiword-2.4.1/abiword-plugins/tools/gda/unix/AbiGDA.cpp
---- abiword-2.4.1.org/abiword-plugins/tools/gda/unix/AbiGDA.cpp        2005-01-12 18:54:57.000000000 +0100
-+++ abiword-2.4.1/abiword-plugins/tools/gda/unix/AbiGDA.cpp    2005-10-24 22:20:32.000000000 +0200
-@@ -283,13 +283,13 @@
-       sql = editable_txt;
-       g_free (editable_txt);
-       
--      cnc = gda_client_open_connection (connection_pool, dsn_name.utf8_str(), user_name.utf8_str(), password.utf8_str(), GDA_CONNECTION_OPTIONS_READ_ONLY);
-+      cnc = gda_client_open_connection (connection_pool, dsn_name.utf8_str(), user_name.utf8_str(), password.utf8_str(), GDA_CONNECTION_OPTIONS_READ_ONLY, 0);
-       if (!GDA_IS_CONNECTION (cnc))
-               return false;
-       
-       /* execute command */
-       cmd = gda_command_new (sql.utf8_str(), GDA_COMMAND_TYPE_SQL, (GdaCommandOptions)0);
--      recset = gda_connection_execute_single_command (cnc, cmd, NULL);
-+      recset = gda_connection_execute_single_command (cnc, cmd, NULL, 0);
-       gda_command_free (cmd);
-       
-       if (recset == NULL || !GDA_IS_DATA_MODEL (recset))

diff --git a/abiword-home_etc.patch b/abiword-home_etc.patch
deleted file mode 100644 (file)
index ed0f1b6..0000000
--- a/abiword-home_etc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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
deleted file mode 100644 (file)
index c413966..0000000
--- a/abiword-mailmerge.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-poppler05x.patch b/abiword-poppler05x.patch
deleted file mode 100644 (file)
index 6b74e35..0000000
--- a/abiword-poppler05x.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aurN abiword-2.4.2.orig/abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp abiword-2.4.2/abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp
---- abiword-2.4.2.orig/abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp 2005-06-29 04:22:13.000000000 +0200
-+++ abiword-2.4.2/abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp      2006-03-23 21:21:23.777224992 +0100
-@@ -75,7 +75,7 @@
-       UT_tmpnam(temporary_file);
- 
-       TextOutputDev *textOut = new TextOutputDev(temporary_file, gFalse, gFalse, gFalse);
--      doc->displayPages(textOut, 1, doc->getNumPages(), 72, 72, 0, gTrue, gFalse);
-+      doc->displayPages(textOut, 1, doc->getNumPages(), 72, 72, 0, gTrue, gFalse, gFalse);
-       delete textOut;
- 
-       IE_Imp_Text txt_imp(getDoc(), "UTF-8");