Makefile.fetch | 1 - configure.ac | 7 ++----- download.lst | 5 ----- external/rhino/README | 9 --------- solenv/flatpak-manifest.in | 7 ------- 5 files changed, 2 insertions(+), 27 deletions(-)
New commits: commit 60a187494196de909abf65edd0e074cd58dd8062 Author: Rene Engelhard <[email protected]> AuthorDate: Wed Apr 3 23:26:08 2024 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Thu Apr 11 07:32:45 2024 +0200 clean up after removal of patched rhino Change-Id: I193fd0c10d297555faa7a832718dbd6cd929a406 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165762 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/Makefile.fetch b/Makefile.fetch index 625e781dc36a..412b9f16927f 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -206,7 +206,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,REDLAND,REDLAND_TARBALL) \ $(call fetch_Optional,REVENGE,REVENGE_TARBALL) \ $(call fetch_Optional,RHINO,RHINO_TARBALL) \ - $(call fetch_Optional,RHINO,SWING_TARBALL) \ $(call fetch_Optional,SKIA,SKIA_TARBALL) \ $(call fetch_Optional,STAROFFICE,STAROFFICE_TARBALL) \ $(if $(filter WNT,$(OS)),TWAIN_DSM_TARBALL) \ diff --git a/configure.ac b/configure.ac index 1a19592bbc88..5558740e8be3 100644 --- a/configure.ac +++ b/configure.ac @@ -2356,11 +2356,8 @@ libo_FUZZ_ARG_ENABLE(scripting-javascript, AC_ARG_WITH(system-rhino, AS_HELP_STRING([--with-system-rhino], - [Use rhino already on system.]),,) -# [with_system_rhino="$with_system_jars"]) -# Above is not used as we have different debug interface -# patched into internal rhino. This code needs to be fixed -# before we can enable it by default. + [Use rhino already on system.]),, + [with_system_rhino="$with_system_jars"]) AC_ARG_WITH(rhino-jar, AS_HELP_STRING([--with-rhino-jar=JARFILE], diff --git a/download.lst b/download.lst index b2af90eb35bc..3d5cdfabf905 100644 --- a/download.lst +++ b/download.lst @@ -517,11 +517,6 @@ STAROFFICE_TARBALL := libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -SWING_SHA256SUM := 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 -SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip -# three static lines -# so that git cherry-pick -# will not run into conflicts TWAIN_DSM_SHA256SUM := 82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6 TWAIN_DSM_TARBALL := twaindsm_2.4.1.orig.tar.gz # three static lines diff --git a/external/rhino/README b/external/rhino/README index 83e4135d0b89..c60378c32262 100644 --- a/external/rhino/README +++ b/external/rhino/README @@ -3,12 +3,3 @@ JavaScript engine/interpreter written in Java, used to provide JavaScript extens The Scripting Framework makes use of the Rhino ([http://www.mozilla.org/rhino/]) JavaScript interpreter, available under the Mozilla Public License ([http://www.mozilla.org/MPL/MPL-1.1.html]). - -In addition, to support the debugging of scripts contained in OpenOffice.org -documents, we have modified the Java source file Main.java. - -The Rhino source tarball is unpacked and patched with the modified code. The -Rhino Jar file (js.jar) is then built (download/swingExSrc.zip is unpacked and -built as part of this procesS) and delivered to the solver. The file -rhino1_5R5.patch contains the changes made in order to build Rhino. The patch -was generated using the command: diff -wurN diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 112747942471..b14797f252dc 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -618,13 +618,6 @@ "dest": "external/tarballs", "dest-filename": "@JFREEREPORT_SAC_TARBALL@" }, - { - "url": "https://dev-www.libreoffice.org/src/@SWING_TARBALL@";, - "sha256": "@SWING_SHA256SUM@", - "type": "file", - "dest": "external/tarballs", - "dest-filename": "@SWING_TARBALL@" - }, { "url": "https://dev-www.libreoffice.org/src/@LIBNUMBERTEXT_TARBALL@";, "sha256": "@LIBNUMBERTEXT_SHA256SUM@",
