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

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Jan 28 02:43:06 2009
New Revision: 15188
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15188&view=rev

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

	* patches/dev300/build-prebuilt-stax-m39.diff:
	* patches/dev300/build-prebuilt-stax.diff:
	* patches/dev300/apply: adjusted for dev300-m40.



Added:
   trunk/patches/dev300/build-prebuilt-stax-m39.diff   (props changed)
      - copied unchanged from r15185, /trunk/patches/dev300/build-prebuilt-stax.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/build-prebuilt-stax.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jan 28 02:43:06 2009
@@ -1366,7 +1366,11 @@
 # enable build with IBM Java 1.6.0
 build-ibm-java-enable.diff, i#93114, pmladek
 
-[ BuildBits ]
+[ BuildBits <= dev300-m39 ]
+# allow to use the prebuilt jsr173_1.0_api.jar
+build-prebuilt-stax-m39.diff, i#93116, pmladek
+
+[ BuildBits > dev300-m39 ]
 # allow to use the prebuilt jsr173_1.0_api.jar
 build-prebuilt-stax.diff, i#93116, pmladek
 

Modified: trunk/patches/dev300/build-prebuilt-stax.diff
==============================================================================
--- trunk/patches/dev300/build-prebuilt-stax.diff	(original)
+++ trunk/patches/dev300/build-prebuilt-stax.diff	Wed Jan 28 02:43:06 2009
@@ -1,5 +1,5 @@
---- config_office/configure.in.old	2008-08-22 12:07:03.000000000 +0200
-+++ config_office/configure.in	2008-08-22 17:34:05.000000000 +0200
+--- configure.in.old	2008-08-22 12:07:03.000000000 +0200
++++ configure.in	2008-08-22 17:34:05.000000000 +0200
 @@ -3387,6 +3387,19 @@ else
  fi
  
@@ -20,8 +20,8 @@
  dnl Check for building ODK
  dnl ===================================================================
  AC_MSG_CHECKING([whether to build the ODK])
---- config_office/set_soenv.in.old	2008-08-22 12:07:03.000000000 +0200
-+++ config_office/set_soenv.in	2008-08-22 17:35:07.000000000 +0200
+--- set_soenv.in.old	2008-08-22 12:07:03.000000000 +0200
++++ set_soenv.in	2008-08-22 17:35:07.000000000 +0200
 @@ -2070,6 +2070,7 @@ ToFile( "ENABLE_AGG",        "@ENABLE_AG
  ToFile( "SYSTEM_AGG",	     "@SYSTEM_AGG@",       "e" );
  ToFile( "AGG_VERSION",	     "@AGG_VERSION@",      "e" );