ooo-build r14099 - in branches/ooo-build-3-0: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Fri Sep 26 09:48:31 2008
New Revision: 14099
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14099&view=rev

Log:
2008-09-25  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300//stax-saxon-no-java.diff: --without-java again


Added:
   branches/ooo-build-3-0/patches/dev300/stax-saxon-no-java.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Fri Sep 26 09:48:31 2008
@@ -1186,6 +1186,8 @@
 
 [ BuildBits < ooo300-m7 ]
 lucene-no-java.diff
+[ BuildBits < ooo300-m8 ]
+stax-saxon-no-java.diff
 
 [ DebianOnly ]
 seamonkey-is-iceape.diff

Added: branches/ooo-build-3-0/patches/dev300/stax-saxon-no-java.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/dev300/stax-saxon-no-java.diff	Fri Sep 26 09:48:31 2008
@@ -0,0 +1,32 @@
+? stax/unxlngx6.pro
+? saxon/unxlngx6.pro
+Index: stax/makefile.mk
+===================================================================
+RCS file: /cvs/external/stax/makefile.mk,v
+retrieving revision 1.4
+diff -u -r1.4 makefile.mk
+--- stax/makefile.mk	28 Jul 2008 11:59:31 -0000	1.4
++++ stax/makefile.mk	26 Sep 2008 09:32:56 -0000
+@@ -64,5 +64,7 @@
+ 
+ .INCLUDE : set_ext.mk
+ .INCLUDE : target.mk
++.IF "$(SOLAR_JAVA)" != ""
+ .INCLUDE : tg_ext.mk
++.ENDIF
+ 
+Index: saxon/makefile.mk
+===================================================================
+RCS file: /cvs/external/saxon/makefile.mk,v
+retrieving revision 1.1
+diff -u -r1.1 makefile.mk
+--- saxon/makefile.mk	14 Jul 2008 15:43:51 -0000	1.1
++++ saxon/makefile.mk	26 Sep 2008 09:32:56 -0000
+@@ -63,5 +63,7 @@
+ 
+ .INCLUDE : set_ext.mk
+ .INCLUDE : target.mk
++.IF "$(SOLAR_JAVA)" != ""
+ .INCLUDE : tg_ext.mk
++.ENDIF
+