external/hsqldb/ExternalProject_hsqldb.mk | 1 + external/hsqldb/UnpackedTarball_hsqldb.mk | 1 + external/hsqldb/patches/applet.patch.0 | 13 +++++++++++++ 3 files changed, 15 insertions(+)
New commits: commit 21ecb4695113058f6fd3c3685d43a267eb27df82 Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Feb 4 09:48:39 2026 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Fri Feb 13 12:15:32 2026 +0100 external/hsqldb: Adapt to java.applet gone from Java 26 ...with a minimally invasive attempt of no longer building any affected functionality (and which was hopefully completely optional and not used by us) Change-Id: I087753e9ad0276150c90aa65c550213a9d1ec44b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198679 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> (cherry picked from commit 5832a9db70344599de651471a3d807569ae2970f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199317 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/external/hsqldb/ExternalProject_hsqldb.mk b/external/hsqldb/ExternalProject_hsqldb.mk index 4e5c750c7f3c..fb6dc4d49d71 100644 --- a/external/hsqldb/ExternalProject_hsqldb.mk +++ b/external/hsqldb/ExternalProject_hsqldb.mk @@ -30,6 +30,7 @@ $(call gb_ExternalProject_get_state_target,hsqldb,build) : -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ -Dant.build.javac.source=$(JAVA_SOURCE_VER) \ -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + -Dnoswing=true \ $(if $(debug),-Dbuild.debug="on") \ jar \ ) diff --git a/external/hsqldb/UnpackedTarball_hsqldb.mk b/external/hsqldb/UnpackedTarball_hsqldb.mk index 1ee4beb5e430..29bd33cb7860 100644 --- a/external/hsqldb/UnpackedTarball_hsqldb.mk +++ b/external/hsqldb/UnpackedTarball_hsqldb.mk @@ -31,6 +31,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\ external/hsqldb/patches/multipleResultSets.patch \ external/hsqldb/patches/disable-dump-script.patch \ external/hsqldb/patches/abstract.patch \ + external/hsqldb/patches/applet.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/hsqldb/patches/applet.patch.0 b/external/hsqldb/patches/applet.patch.0 new file mode 100644 index 000000000000..bb38f84ef890 --- /dev/null +++ b/external/hsqldb/patches/applet.patch.0 @@ -0,0 +1,13 @@ +--- build/build.xml ++++ build/build.xml +@@ -430,6 +430,10 @@ + > + <include name="org/hsqldb/util/**"/> + <exclude name="org/hsqldb/util/*Swing.java"/> ++ <exclude name="org/hsqldb/util/DatabaseManager.java"/> ++ <exclude name="org/hsqldb/util/QueryTool.java"/> ++ <exclude name="org/hsqldb/util/Transfer.java"/> ++ <exclude name="org/hsqldb/util/ZaurusDatabaseManager.java"/> + <exclude name="org/hsqldb/util/TableSorter.java"/> + </javac> + <copy todir="classes/org/hsqldb/util">
