Package: libreoffice / 1:6.1.5-3

fix-internal-hsqldb-build.diff Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
diff -urN hsqldb.old/patches/use-system-servlet-api.jar.diff hsqldb/patches/use-system-servlet-api.jar.diff
--- a/external/hsqldb/patches/use-system-servlet-api.jar.diff	1970-01-01 01:00:00.000000000 +0100
+++ b/external/hsqldb/patches/use-system-servlet-api.jar.diff	2013-03-19 15:09:42.137801521 +0100
@@ -0,0 +1,29 @@
+--- misc/hsqldb/build/build.xml
++++ misc/build/hsqldb/build/build.xml
+@@ -356,7 +356,7 @@
+                  optimize="${build.optimize}"
+        >
+          <classpath>
+-            <pathelement location="lib/servlet.jar"/>
++            <pathelement location="/usr/share/java/servlet-api-3.1.jar"/>
+          </classpath>
+          <include name="*.java"/>
+          <include name="org/hsqldb/*.java"/>
+@@ -818,7 +818,7 @@
+ 		   				${src}/org/hsqldb/util/RCData.java,
+ 		   				${src}/org/hsqldb/util/SqlTool.java"
+            destdir="${basedir}/doc/src"
+-           classpath="${basedir}/lib/servlet.jar;${basedir}/lib/junit.jar"
++           classpath="/usr/share/java/servlet-api-3.1.jar;${basedir}/lib/junit.jar"
+            author="true"
+            version="false"
+            use="true"
+@@ -839,7 +839,7 @@
+       <javadoc packagenames="org.hsqldb.*,org.hsqldb.jdbc.*,org.hsqldb.lib.*,org.hsqldb.util.*"
+            sourcepath="${src}"
+            destdir="${basedir}/doc/src"
+-           classpath="${basedir}/lib/servlet.jar;${basedir}/lib/junit.jar"
++           classpath="/usr/share/java/servlet-api-3.1.jar;${basedir}/lib/junit.jar"
+            author="true"
+            version="false"
+            use="true"
diff --git a/external/hsqldb/UnpackedTarball_hsqldb.mk b/external/hsqldb/UnpackedTarball_hsqldb.mk
index fc6c18f77c23..e3d553a51236 100644
--- a/external/hsqldb/UnpackedTarball_hsqldb.mk
+++ b/external/hsqldb/UnpackedTarball_hsqldb.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\
 		external/hsqldb/patches/jdbc-4.1.patch \
 		external/hsqldb/patches/multipleResultSets.patch \
 	) \
+	external/hsqldb/patches/use-system-servlet-api.jar.diff \
 ))
 
 # vim: set noet sw=4 ts=4: