From edaebb65d92a48d7075c8c1f64c5ffd87054827b Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sun, 7 Apr 2024 11:07:31 +0200
Subject: Adding debian version 4:7.4.7-1+deb12u1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 debian/patches/fix-internal-hsqldb-build.diff | 45 +++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 debian/patches/fix-internal-hsqldb-build.diff

(limited to 'debian/patches/fix-internal-hsqldb-build.diff')

diff --git a/debian/patches/fix-internal-hsqldb-build.diff b/debian/patches/fix-internal-hsqldb-build.diff
new file mode 100644
index 000000000..101da5e96
--- /dev/null
+++ b/debian/patches/fix-internal-hsqldb-build.diff
@@ -0,0 +1,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 389572377fa6..d43d1418049d 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/jdbc-4.1.patch \
+ 	external/hsqldb/patches/multipleResultSets.patch \
+ 	external/hsqldb/patches/disable-dump-script.patch \
++	external/hsqldb/patches/use-system-servlet-api.jar.diff \
+ ))
+ 
+ # vim: set noet sw=4 ts=4:
-- 
cgit v1.2.3