ooo-build r13609 - in trunk: . distro-configs patches/dev300 scratch

[pmladek svn gnome org]

Author: pmladek
Date: Mon Aug 18 13:49:55 2008
New Revision: 13609
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13609&view=rev

Log:
2008-08-18  Petr Mladek  <pmladek suse cz>

	* patches/dev300/build-java-1.4-filter.diff, patches/dev300/apply:
	  (SUSE-10.1-only) disable optional @Override to allow build with
	  Java 1.4
	* patches/dev300/build-java-1.4-enable.diff, patches/dev300/apply:
	  (SUSE-10.1-only) enable build with Java 1.4

	* distro-configs/SUSE-10.1.conf.in: add --with-system-saxon
	  --with-saxon-jar=/usr/share/saxon/saxon.jar

	* scratch/Makefile.am, Makefile.am, configure.in: bin the lpsolve stuff



Added:
   trunk/patches/dev300/build-java-1.4-enable.diff   (contents, props changed)
   trunk/patches/dev300/build-java-1.4-filter.diff
Removed:
   trunk/scratch/Makefile.am
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/distro-configs/SUSE-10.1.conf.in
   trunk/patches/dev300/apply

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Mon Aug 18 13:49:55 2008
@@ -2,7 +2,7 @@
 #  MAYBE_BONOBO = bonobo
 # endif
 
-SUBDIRS = po desktop distro-configs bin etc patches man doc scratch src stamp templates www # $(MAYBE_BONOBO)
+SUBDIRS = po desktop distro-configs bin etc patches man doc src stamp templates www # $(MAYBE_BONOBO)
 
 include $(top_srcdir)/Makefile.shared
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Aug 18 13:49:55 2008
@@ -1348,9 +1348,6 @@
 www/Makefile
 www/images/Makefile
 www/tinder-scripts/Makefile
-scratch/Makefile
-scratch/lpsolve/Makefile
-scratch/lpsolve/prj/Makefile
 ])
 
 if test "$ENABLE_CCACHE" = "yes"; then

Modified: trunk/distro-configs/SUSE-10.1.conf.in
==============================================================================
--- trunk/distro-configs/SUSE-10.1.conf.in	(original)
+++ trunk/distro-configs/SUSE-10.1.conf.in	Mon Aug 18 13:49:55 2008
@@ -19,5 +19,7 @@
 --with-system-mozilla=xulrunner
 --with-system-neon
 --with-system-odbc-headers
+--with-system-saxon
+--with-saxon-jar=/usr/share/saxon/saxon.jar
 --with-xulrunner
 --without-myspell-dicts

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Aug 18 13:49:55 2008
@@ -57,7 +57,7 @@
 SUSE-9.2  : NovellBase
 SUSE-9.3  : NovellBase
 SUSE-10.0 : NovellBase
-SUSE-10.1 : NovellBase, BerkeleyDB43, BrokenSystemNSS
+SUSE-10.1 : NovellBase, BerkeleyDB43, BrokenSystemNSS, Java14
 SUSE-10.2 : NovellBase, BerkeleyDB43, EMFPlus
 SUSE-10.3 : NovellBase, BerkeleyDB43, EMFPlus
 SUSE-11.0 : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts
@@ -985,6 +985,13 @@
 buildfix-bridges-strdup-header.diff, i#89762, kohei
 buildfix-filter-memcmp-header.diff, i#89803, kohei
 
+[ Java14 ]
+
+# enable build with Java 1.4; can't go upstream
+build-java-1.4-enable.diff, i#12345, pmladek
+# disable optional @Override; can't go upstream
+buildfix-java-1.4-filter.diff, i#12345, pmladek
+
 [ NovellOnlyWin32 ]
 SectionOwner => tml
 

Added: trunk/patches/dev300/build-java-1.4-enable.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/build-java-1.4-enable.diff	Mon Aug 18 13:49:55 2008
@@ -0,0 +1,13 @@
+--- config_office/configure.in.old	2008-08-13 17:24:35.000000000 +0200
++++ config_office/configure.in	2008-08-13 17:27:10.000000000 +0200
+@@ -2815,8 +2815,8 @@ if test "$SOLAR_JAVA" != ""; then
+         _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
+         _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
+    
+-        if test "$_jdk_ver" -lt 10500; then
+-             AC_MSG_ERROR([JDK is too old, you need at least 1.5])
++        if test "$_jdk_ver" -lt 10400; then
++             AC_MSG_ERROR([JDK is too old, you need at least 1.4])
+         fi
+         AC_MSG_RESULT([checked (JDK $_jdk)])
+         JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`

Added: trunk/patches/dev300/build-java-1.4-filter.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/build-java-1.4-filter.diff	Mon Aug 18 13:49:55 2008
@@ -0,0 +1,14 @@
+--- filter/source/xsltfilter/XSLTransformer.java.old	2008-08-06 16:04:33.000000000 +0200
++++ filter/source/xsltfilter/XSLTransformer.java	2008-08-15 20:43:41.000000000 +0200
+@@ -217,7 +217,10 @@ public class XSLTransformer
+         // notify listeners
+         t = new Thread() {
+ 
+-            @Override
++            // @Override is optional; It just helps the compiler to catch errors, see
++            // http://java.sun.com/docs/books/tutorial/java/javaOO/annotations.html
++            // We will disable to to be able to compile with JRE 1.4
++            // @Override
+             public void run() {
+ 
+                 // Local variabes used outside try block in finally block