external/rhino/rhino1_5R5-find_swing.patch | 13 +++++--------
external/rhino/rhino1_5R5.patch | 8 --------
2 files changed, 5 insertions(+), 16 deletions(-)
New commits:
commit e34f86efb64240937dad99ff5f629fd1c6bb8bc7
Author: Fridrich Štrba <fridrich.st...@bluewin.ch>
AuthorDate: Mon Sep 4 20:59:02 2017 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon May 10 12:25:43 2021 +0200
This hunk breaks jdk9 build
Change-Id: I80b6619a95ccac43a06ffd9b1b64dc1115510d90
diff --git a/external/rhino/rhino1_5R5.patch b/external/rhino/rhino1_5R5.patch
index e44872e3df8f..40fc6cc9427b 100644
--- a/external/rhino/rhino1_5R5.patch
+++ b/external/rhino/rhino1_5R5.patch
@@ -185,14 +185,6 @@
</target>
<target name="compile" depends="properties,get-swing-ex">
-@@ -68,6 +54,7 @@
- includes="org/**/*.java"
- deprecation="on"
- debug="${debug}">
-+ <compilerarg
value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
- </javac>
- <copy todir="${nest}/${classes}">
- <fileset dir="." includes="org/**/*.properties" />
--- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java
2004-03-25 21:54:34.000000000 +0100
+++
misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java
2009-01-17 20:44:22.000000000 +0100
@@ -470,15 +470,21 @@
commit 82bf7684bab196917a24865ce61ab88f5f288517
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Aug 30 17:43:03 2017 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon May 10 12:25:37 2021 +0200
Compact content of external/rhino/rhino1_5R5-find_swing.patch to single
place
...instead of adding something into the middle of the previous
external/rhino/rhino1_5R5.patch
Change-Id: I94a0e022776db67f50e785c45b0982977eec17f1
diff --git a/external/rhino/rhino1_5R5-find_swing.patch
b/external/rhino/rhino1_5R5-find_swing.patch
index 38ff78e4ec58..905336eb1b0d 100644
--- a/external/rhino/rhino1_5R5-find_swing.patch
+++ b/external/rhino/rhino1_5R5-find_swing.patch
@@ -1,14 +1,11 @@
--- misc/rhino1_5R5/toolsrc/build.xml 2009-10-29 18:29:46.605524507 +0100
+++ misc/build/rhino1_5R5/toolsrc/build.xml 2009-10-29 18:29:26.536908810
+0100
-@@ -16,6 +16,7 @@
- </or>
- </and>
- </condition>
+@@ -38,11 +38,12 @@
+ property="swing-ex-available"/>
+ </target>
+
+ <property name="swing_zip"
value="${TARFILE_LOCATION}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"/>
- <path id="macPath" location="${java.home}/../Classes/classes.jar"/>
- <!-- rhino.jar from OpenJDK breaks build -->
- <path id="nonMacPath">
-@@ -42,7 +43,7 @@
+ <target name="get-swing-ex" unless="swing-ex-available">
<!-- Download source from Sun's site, unzip it, remove
the files we don't need, and change the package
-->
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
