From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Mon, 23 Sep 2019 10:39:49 +0000 (+0100)
Subject: fix-internal-hsqldb-build
X-Git-Tag: archive/raspbian/1%6.3.2-1+rpi1^2~23
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=50989379014701d4791477f0be9f2abc2256c768;p=libreoffice.git

fix-internal-hsqldb-build


Gbp-Pq: Name fix-internal-hsqldb-build.diff
---

diff --git a/external/hsqldb/UnpackedTarball_hsqldb.mk b/external/hsqldb/UnpackedTarball_hsqldb.mk
index cbba770f19a..42ab936ead5 100644
--- a/external/hsqldb/UnpackedTarball_hsqldb.mk
+++ b/external/hsqldb/UnpackedTarball_hsqldb.mk
@@ -29,6 +29,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:
diff --git a/external/hsqldb/patches/use-system-servlet-api.jar.diff b/external/hsqldb/patches/use-system-servlet-api.jar.diff
new file mode 100644
index 00000000000..a937f7ed67d
--- /dev/null
+++ b/external/hsqldb/patches/use-system-servlet-api.jar.diff
@@ -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"