external/beanshell/UnpackedTarball_beanshell.mk | 1 + external/beanshell/applet.patch.0 | 11 +++++++++++ external/hsqldb/ExternalProject_hsqldb.mk | 1 + external/hsqldb/UnpackedTarball_hsqldb.mk | 1 + external/hsqldb/patches/applet.patch.0 | 13 +++++++++++++ 5 files changed, 27 insertions(+)
New commits: commit 5832a9db70344599de651471a3d807569ae2970f Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Feb 4 09:48:39 2026 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Wed Feb 4 18:17:16 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]> 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"> commit 537057a44daa4a6e48bba21bf8655331041a09ac Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Feb 4 09:50:15 2026 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Wed Feb 4 18:17:01 2026 +0100 external/beanshell: 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: I32aef78f7257ffb558704a60e69878baee777537 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198678 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/external/beanshell/UnpackedTarball_beanshell.mk b/external/beanshell/UnpackedTarball_beanshell.mk index 5248a7da0486..ba472ebda6f1 100644 --- a/external/beanshell/UnpackedTarball_beanshell.mk +++ b/external/beanshell/UnpackedTarball_beanshell.mk @@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,beanshell,\ external/beanshell/bsh-2.0b1-src.patch \ external/beanshell/beanshell-invoke.patch \ external/beanshell/java9.patch.0 \ + external/beanshell/applet.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/beanshell/applet.patch.0 b/external/beanshell/applet.patch.0 new file mode 100644 index 000000000000..af5d24655517 --- /dev/null +++ b/external/beanshell/applet.patch.0 @@ -0,0 +1,11 @@ +--- build.xml ++++ build.xml +@@ -101,7 +101,7 @@ + <!-- Add up all of the excludes --> + <!-- how do I add strings to break this long line? --> + <property name="excludes" +- value="${exclude-1.2},${exclude-1.1},${exclude-bsf},${exclude-engine},${exclude-servlet},${excludes-legacy},${exclude-classgen},${excludes-arbitrary}"/> ++ value="${exclude-1.2},${exclude-1.1},${exclude-bsf},${exclude-engine},${exclude-servlet},${excludes-legacy},${exclude-classgen},${excludes-arbitrary},bsh/util/AWTDemoApplet.java,bsh/util/AWTRemoteApplet.java,bsh/util/JDemoApplet.java,bsh/util/JRemoteApplet.java"/> + + <!-- JARs --> + <property name="javadoc-zip" value="${dist-dir}/bsh-${version}-javadoc.zip"/>
