ooo-build r14449 - in trunk: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Fri Oct 31 17:57:27 2008
New Revision: 14449
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14449&view=rev

Log:
2008-10-31  Petr Mladek  <pmladek suse cz>

	* patches/dev300/config_office-gio-vs-gnome-vfs.diff:
	* patches/dev300/apply: do not allow to enable GIO and GNOME VFS at
	  once (i#95713)

	* patches/dev300/sw-mailmerge-faster.diff: fixed to be -p0 patch



Added:
   trunk/patches/dev300/config_office-gio-vs-gnome-vfs.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/sw-mailmerge-faster.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Oct 31 17:57:27 2008
@@ -1085,6 +1085,9 @@
 # fixes parallel build
 svtools-build-dep.diff, i#94339, pmladek
 
+# do not allow to enable GIO and GNOME VFS at once
+config_office-gio-vs-gnome-vfs.diff, i#95713, pmladek
+
 [ Gcc43 ]
 # gcc 4.3 requires #include <string.h> for strdup, memcmp etc.
 buildfix-bridges-strdup-header.diff, i#89762, kohei

Added: trunk/patches/dev300/config_office-gio-vs-gnome-vfs.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/config_office-gio-vs-gnome-vfs.diff	Fri Oct 31 17:57:27 2008
@@ -0,0 +1,12 @@
+--- config_office/configure.in.old	2008-10-27 18:58:15.000000000 +0100
++++ config_office/configure.in	2008-10-31 17:22:28.000000000 +0100
+@@ -5472,6 +5472,9 @@ if test  "$test_gtk" = "yes"; then
+ 
+       AC_MSG_CHECKING([whether to enable GIO support])
+       if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then
++          if test "$ENABLE_GNOMEVFS" = "TRUE" ; then
++             AC_MSG_ERROR([please use --enable-gio only together with --disable-gnome-vfs.])
++          fi
+           ENABLE_GIO="TRUE"
+           AC_MSG_RESULT([yes])
+           PKG_CHECK_MODULES( GIO, gio-2.0 )

Modified: trunk/patches/dev300/sw-mailmerge-faster.diff
==============================================================================
--- trunk/patches/dev300/sw-mailmerge-faster.diff	(original)
+++ trunk/patches/dev300/sw-mailmerge-faster.diff	Fri Oct 31 17:57:27 2008
@@ -1,7 +1,7 @@
 diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
 index 34ad7f2..ae5ed73 100644
---- a/sw/source/ui/dbui/dbmgr.cxx
-+++ b/sw/source/ui/dbui/dbmgr.cxx
+--- sw/source/ui/dbui/dbmgr.cxx
++++ sw/source/ui/dbui/dbmgr.cxx
 @@ -3127,27 +3127,28 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
      pImpl->pMergeData = new SwDSParam(
                  rMMConfig.GetCurrentDBData(), xResultSet, rMMConfig.GetSelection());