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

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Jan 27 19:38:38 2009
New Revision: 15172
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15172&view=rev

Log:
2009-01-27  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/build-ant-1.6-m39.diff:
	* patches/dev300/build-ant-1.6.diff:
	* patches/dev300/gnome-vfs-locking-config_office-m39.diff:
	* patches/dev300/gnome-vfs-locking-config_office.diff:
	* patches/dev300/wpgimporter-m39.diff:
	* patches/dev300/wpgimporter.diff:	
	* patches/dev300/apply: adjusted for dev300-m40.





Added:
   trunk/patches/dev300/build-ant-1.6-m39.diff   (props changed)
      - copied unchanged from r15169, /trunk/patches/dev300/build-ant-1.6.diff
   trunk/patches/dev300/gnome-vfs-locking-config_office-m39.diff   (props changed)
      - copied unchanged from r15169, /trunk/patches/dev300/gnome-vfs-locking-config_office.diff
   trunk/patches/dev300/wpgimporter-m39.diff
      - copied unchanged from r15169, /trunk/patches/dev300/wpgimporter.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/build-ant-1.6.diff
   trunk/patches/dev300/gnome-vfs-locking-config_office.diff
   trunk/patches/dev300/wpgimporter.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jan 27 19:38:38 2009
@@ -367,6 +367,11 @@
 [ WPG ]
 # libwpg-based import filter for WordPerfect Graphics
 libwpg.diff
+
+[ WPG <= dev300-m39 ]
+wpgimporter-m39.diff
+
+[ WPG > dev300-m39 ]
 wpgimporter.diff
 
 [ GCJ ]
@@ -447,7 +452,12 @@
 solven-extensions-noarch-identifier.diff, pmladek
 sdext-noarch-identifier.diff, pmladek
 
-[ NovellOnly ]
+[ NovellOnly <= dev300-m39 ]
+# allow build with ant-1.6
+# IMPORTANT: the second part of the patch is build-ant-1.6-swext.diff
+build-ant-1.6-m39.diff, i#90830, pmladek
+
+[ NovellOnly > dev300-m39 ]
 # allow build with ant-1.6
 # IMPORTANT: the second part of the patch is build-ant-1.6-swext.diff
 build-ant-1.6.diff, i#90830, pmladek
@@ -671,7 +681,14 @@
 # gnome-vfs locking implementation
 # it was not committed up-stream yet because up-stream uses so old gnome-vfs
 # that it did not even compile :-(
+
+[ GnomeVFS <= dev300-m39 ]
+gnome-vfs-locking-config_office-m39.diff, i#91151, jholesov
+
+[ GnomeVFS > dev300-m39 ]
 gnome-vfs-locking-config_office.diff, i#91151, jholesov
+
+[ GnomeVFS ]
 gnome-vfs-locking-ucb.diff, i#91151, jholesov
 
 # Move gnome-vfs out of the startup sequence, load it only when needed

Modified: trunk/patches/dev300/build-ant-1.6.diff
==============================================================================
--- trunk/patches/dev300/build-ant-1.6.diff	(original)
+++ trunk/patches/dev300/build-ant-1.6.diff	Tue Jan 27 19:38:38 2009
@@ -1,5 +1,5 @@
---- config_office/configure.in.old	2008-07-15 11:55:31.000000000 +0200
-+++ config_office/configure.in	2008-07-15 16:41:53.000000000 +0200
+--- configure.in.old	2008-07-15 11:55:31.000000000 +0200
++++ configure.in	2008-07-15 16:41:53.000000000 +0200
 @@ -6090,10 +6090,6 @@ else
    fi
  

Modified: trunk/patches/dev300/gnome-vfs-locking-config_office.diff
==============================================================================
--- trunk/patches/dev300/gnome-vfs-locking-config_office.diff	(original)
+++ trunk/patches/dev300/gnome-vfs-locking-config_office.diff	Tue Jan 27 19:38:38 2009
@@ -4,8 +4,8 @@
 retrieving revision 1.269
 retrieving revision 1.254.6.2
 diff -u -p -u -p -B -r1.269 -r1.254.6.2
---- config_office/configure.in	28 May 2008 10:42:27 -0000	1.269
-+++ config_office/configure.in	2 Jun 2008 13:52:09 -0000	1.254.6.2
+--- configure.in.old	28 May 2008 10:42:27 -0000	1.269
++++ configure.in	2 Jun 2008 13:52:09 -0000	1.254.6.2
 @@ -5155,18 +5155,30 @@ dnl Gnome VFS check
  dnl ===================================================================
  
@@ -43,8 +43,8 @@
 retrieving revision 1.187
 retrieving revision 1.179.6.2
 diff -u -p -u -p -B -r1.187 -r1.179.6.2
---- config_office/set_soenv.in	14 May 2008 14:56:22 -0000	1.187
-+++ config_office/set_soenv.in	2 Jun 2008 13:52:14 -0000	1.179.6.2
+--- set_soenv.in.old	14 May 2008 14:56:22 -0000	1.187
++++ set_soenv.in	2 Jun 2008 13:52:14 -0000	1.179.6.2
 @@ -1697,6 +1697,7 @@ ToFile( "SYSTEM_SERVLETAPI", "@SYSTEM_SE
  ToFile( "SERVLETAPI_JAR",    "@SERVLETAPI_JAR@",   "e" );
  ToFile( "ENABLE_DBUS",       "@ENABLE_DBUS@",      "e" );

Modified: trunk/patches/dev300/wpgimporter.diff
==============================================================================
--- trunk/patches/dev300/wpgimporter.diff	(original)
+++ trunk/patches/dev300/wpgimporter.diff	Tue Jan 27 19:38:38 2009
@@ -1,5 +1,5 @@
---- config_office/configure.in	7 May 2007 09:28:02 -0000	1.189.2.5
-+++ config_office/configure.in	7 May 2007 13:46:58 -0000
+--- configure.in.old	7 May 2007 09:28:02 -0000	1.189.2.5
++++ configure.in	7 May 2007 13:46:58 -0000
 @@ -299,6 +299,9 @@
  AC_ARG_WITH(system-libwps,
  [  --with-system-libwps    Use libwps already on system
@@ -35,8 +35,8 @@
  dnl Check whether freetype2 supports emboldening
  dnl ===================================================================
  if test "$SYSTEM_FREETYPE" = "YES" ; then
---- config_office/set_soenv.in	7 May 2007 09:28:12 -0000	1.127.2.5
-+++ config_office/set_soenv.in	7 May 2007 13:47:01 -0000
+--- set_soenv.in.old	7 May 2007 09:28:12 -0000	1.127.2.5
++++ set_soenv.in	7 May 2007 13:47:01 -0000
 @@ -1820,6 +1820,9 @@
  ToFile( "SYSTEM_LIBWPS",     "@SYSTEM_LIBWPS@",    "e" );
  ToFile( "LIBWPS_CFLAGS",     "@LIBWPS_CFLAGS@",    "e" );