From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 9 Nov 2022 16:20:12 +0000 (+0000)
Subject: fix-internal-hsqldb-build
X-Git-Tag: archive/raspbian/1%7.4.2-4+rpi1~1^2~30
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d9c995c77f438dc00aac457ebd648e2296da1c3c;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 389572377fa..d43d1418049 100644
--- a/external/hsqldb/UnpackedTarball_hsqldb.mk
+++ b/external/hsqldb/UnpackedTarball_hsqldb.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\
 	external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch \
 	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"