ooo-build r11381 - trunk/patches/src680

[strba svn gnome org]

Author: strba
Date: Wed Jan 23 16:31:30 2008
New Revision: 11381
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11381&view=rev

Log:
make apply even in hsqldb, now does it build?

Modified:
   trunk/patches/src680/build-java-target.diff

Modified: trunk/patches/src680/build-java-target.diff
==============================================================================
--- trunk/patches/src680/build-java-target.diff	(original)
+++ trunk/patches/src680/build-java-target.diff	Wed Jan 23 16:31:30 2008
@@ -221,9 +221,12 @@
  # --- Files --------------------------------------------------------
  
  TARFILE_NAME=hsqldb_$(HSQLDB_VERSION)
-@@ -57,28 +55,23 @@
+@@ -57,30 +55,25 @@
  
- #PATCH_FILE_NAME=hsqldb_1_8_0
+ #CONVERTFILES=build$/build.xml
+ 
+-#PATCH_FILE_NAME=hsqldb_1_8_0
++PATCH_FILE_NAME=hsqldb_1_8_0
  
 +ADDITIONAL_FILES=makefile.mk
 +
@@ -258,12 +261,9 @@
 +        @echo java disabled
 +.ENDIF
 dummy line to avoid confusing diff-mode
-#--- hsqldb/hsqldb_1_8_0-old	2007-11-04 00:49:08.000000000 +0100
-#+++ hsqldb/hsqldb_1_8_0	2007-11-04 00:49:18.000000000 +0100
-#@@ -23077,3 +23077,176 @@
- +  
- +          String msg;
- +  
+--- /dev/null   2007-04-19 15:48:30.000000000 +0200
++++ hsqldb/hsqldb_1_8_0	2007-11-04 00:49:18.000000000 +0100
+@@ -0,0 +1,173 @@
 +diff -crN misc/hsqldb/makefile.mk misc/build/hsqldb/makefile.mk
 +*** misc/hsqldb/makefile.mk	2006-11-28 12:45:49.000000000 +0100
 +--- misc/build/hsqldb/makefile.mk	2006-11-28 12:31:12.000000000 +0100
@@ -437,9 +437,7 @@
 +           >
 +           <classpath>
 +              <pathelement location="lib/junit.jar"/>
- diff -pcr misc/hsqldb/src/org/hsqldb/Constraint.java misc/build/hsqldb/src/org/hsqldb/Constraint.java
- *** misc/hsqldb/src/org/hsqldb/Constraint.java	2007-08-03 16:30:30.000000000 +0200
- --- misc/build/hsqldb/src/org/hsqldb/Constraint.java	2007-08-03 16:31:00.000000000 +0200
+dummy line to avoid confusing diff-mode
 --- qadevOOo/build.xml.old	2006-10-10 21:48:45.000000000 +0200
 +++ qadevOOo/build.xml	2006-10-11 15:58:25.000000000 +0200
 @@ -19,7 +19,9 @@