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

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Jan 28 00:39:58 2009
New Revision: 15186
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15186&view=rev

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

	* patches/dev300/build-java-target-m39.diff:
	* patches/dev300/build-java-target.diff:	
	* patches/dev300/layout-default-enable-config_office-m39.diff:
	* patches/dev300/layout-default-enable-config_office.diff:	
	* patches/dev300/novell-win32-agfa-monotype-fonts-m39.diff:
	* patches/dev300/novell-win32-agfa-monotype-fonts.diff:	
	* patches/dev300/apply: adjusted for dev300-m40.  Also, 
	build-ibm-java-enable.diff appears to have been upstreamed in m40.





Added:
   trunk/patches/dev300/build-java-target-m39.diff
      - copied unchanged from r15184, /trunk/patches/dev300/build-java-target.diff
   trunk/patches/dev300/layout-default-enable-config_office-m39.diff   (props changed)
      - copied unchanged from r15184, /trunk/patches/dev300/layout-default-enable-config_office.diff
   trunk/patches/dev300/novell-win32-agfa-monotype-fonts-m39.diff
      - copied unchanged from r15184, /trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/build-java-target.diff
   trunk/patches/dev300/layout-default-enable-config_office.diff
   trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jan 28 00:39:58 2009
@@ -1218,6 +1218,11 @@
 # also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=373974
 printer-properties-disable.diff, i#14036, michael
 
+[ NotDebian <= dev300-m39 ]
+# Enable layout'ed dialogs.  Not to be released, therefore NotDebian.
+layout-default-enable-config_office-m39.diff, janniew
+
+[ NotDebian > dev300-m39 ]
 # Enable layout'ed dialogs.  Not to be released, therefore NotDebian.
 layout-default-enable-config_office.diff, janniew
 
@@ -1327,11 +1332,17 @@
 [ BuildBits >= dev300-m38]
 novell-win32-agfa-monotype-fonts.diff, tml
 
-[ BuildBits ]
+[ BuildBits <= dev300-m39 ]
+# allow to define java target, so the build is usable with the JVM 1.5
+# even when it is built with JDK 1.6
+build-java-target.diff-m39, i#93115, pmladek
+
+[ BuildBits > dev300-m39 ]
 # allow to define java target, so the build is usable with the JVM 1.5
 # even when it is built with JDK 1.6
 build-java-target.diff, i#93115, pmladek
 
+[ BuildBits ]
 # do not create '.' subdirectories
 # omit './' in paths
 solenv-installer-cleaner-paths.diff, pmladek
@@ -1351,7 +1362,7 @@
 # enable build with IBM Java 1.6.0
 build-ibm-java-enable-m37.diff, i#93114, pmladek
 
-[ BuildBits >= dev300-m38 ]
+[ BuildBits >= dev300-m38 <= dev300-m39 ]
 # enable build with IBM Java 1.6.0
 build-ibm-java-enable.diff, i#93114, pmladek
 

Modified: trunk/patches/dev300/build-java-target.diff
==============================================================================
--- trunk/patches/dev300/build-java-target.diff	(original)
+++ trunk/patches/dev300/build-java-target.diff	Wed Jan 28 00:39:58 2009
@@ -1,5 +1,5 @@
---- config_office/configure.in.javatarget~	2008-07-07 19:58:06.108847292 +0200
-+++ config_office/configure.in	2008-07-07 20:04:44.662095262 +0200
+--- configure.in.javatarget~	2008-07-07 19:58:06.108847292 +0200
++++ configure.in	2008-07-07 20:04:44.662095262 +0200
 @@ -559,6 +559,17 @@ AC_ARG_WITH(java,
                            no support for Java components, applets, accessibility
                            or XML filters. 
@@ -90,8 +90,8 @@
 +AC_SUBST(JAVA_TARGET_VER)
  AC_SUBST(JAVAINTERPRETER)
  AC_SUBST(JAVACOMPILER)
---- config_office/set_soenv.in.javatarget~	2008-07-07 19:57:41.109846862 +0200
-+++ config_office/set_soenv.in	2008-07-07 20:04:44.665095643 +0200
+--- set_soenv.in.javatarget~	2008-07-07 19:57:41.109846862 +0200
++++ set_soenv.in	2008-07-07 20:04:44.665095643 +0200
 @@ -1842,6 +1842,7 @@ ToFile( "DMAKEROOT",         $DMAKEROOT,
  if ( $JDK ne "gcj" ) {
     ToFile( "CLASSPATH",         $CLASSPATH,         "e" );

Modified: trunk/patches/dev300/layout-default-enable-config_office.diff
==============================================================================
--- trunk/patches/dev300/layout-default-enable-config_office.diff	(original)
+++ trunk/patches/dev300/layout-default-enable-config_office.diff	Wed Jan 28 00:39:58 2009
@@ -1,7 +1,7 @@
 diff --git a/config_office/configure.in b/config_office/configure.in
 index 39f9cbe..c6bf26f 100644
---- config_office/configure.in
-+++ config_office/configure.in
+--- configure.in.old
++++ configure.in
 @@ -228,7 +228,7 @@ AC_ARG_ENABLE(static-gtk,
                            (enables -Bstatic linker flag for gtk libraries)
  ],,)

Modified: trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff
==============================================================================
--- trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff	(original)
+++ trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff	Wed Jan 28 00:39:58 2009
@@ -1,5 +1,5 @@
---- config_office/configure.in.OLD	2005-11-21 02:16:33.437250000 +0200
-+++ config_office/configure.in	2005-11-23 05:12:58.296875000 +0200
+--- configure.in.OLD	2005-11-21 02:16:33.437250000 +0200
++++ configure.in	2005-11-23 05:12:58.296875000 +0200
 @@ -75,6 +75,11 @@
                            distributions where AFM files or TrueType Fonts
                            are known to be available.