[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - external/rhino

[Fridrich Štrba]

 external/rhino/rhino1_5R5.patch |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit d54056d8860e58ba8c5f6cde46e11c7c120c3551
Author: Fridrich Štrba <fridrich.strba at bluewin.ch>
Date:   Mon Sep 4 20:59:02 2017 +0200

    This hunk breaks jdk9 build
    
    Change-Id: I80b6619a95ccac43a06ffd9b1b64dc1115510d90
    (cherry picked from commit 57adce8b88073b813aacb668629968f29b7d706a)
    Reviewed-on: https://gerrit.libreoffice.org/54531
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

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 @@