[libreoffice] 06/06: fix rhino build with Java9

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit cb383fa431a33459677730cde561d2347ec92304
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Nov 7 07:59:02 2017 +0100

    fix rhino build with Java9
---
 changelog                |  4 +++-
 patches/java9-rhino.diff | 29 +++++++++++++++++++++++++++++
 patches/series           |  1 +
 rules                    |  2 ++
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index a16bacf..89656ce 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,7 @@ libreoffice (1:5.4.3-1) unstable; urgency=medium
   * New upstream release
 
   * debian/patches/java9-jawt.diff: add from master; find jawt with Java9
+  * debian/patches/java9-jawt.rhino: add from master; fix rhino build with Java9
 
   * debian/rules:
     - be consequent and enable the junit tests on armhf/arm64 now that
@@ -14,6 +15,7 @@ libreoffice (1:5.4.3-1) unstable; urgency=medium
     - set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 in build-indep (needed for
       Java9 in reportbuilder) 
     - make testsuite failures on i386 fatal again
+    - temporarily disable rhino for Java9 builds
   * debian/rules, debian/shlibs.override.mysql-connector-c++:
     temporarily force a lower dependency on libmysqlcppconn7v5, works
     also with 1.1.7 and we don't get blocked by mariadb-10.1...
@@ -23,7 +25,7 @@ libreoffice (1:5.4.3-1) unstable; urgency=medium
     apparmor profiles (add missing /). mv_conffile the files to the new
     name...
 
- -- Rene Engelhard <rene at debian.org>  Tue, 07 Nov 2017 07:29:33 +0100
+ -- Rene Engelhard <rene at debian.org>  Tue, 07 Nov 2017 07:59:37 +0100
 
 libreoffice (1:5.4.3~rc1-2) unstable; urgency=medium
 
diff --git a/patches/java9-rhino.diff b/patches/java9-rhino.diff
new file mode 100644
index 0000000..4b0d6c2
--- /dev/null
+++ b/patches/java9-rhino.diff
@@ -0,0 +1,29 @@
+From 57adce8b88073b813aacb668629968f29b7d706a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba at bluewin.ch>
+Date: Mon, 4 Sep 2017 20:59:02 +0200
+Subject: This hunk breaks jdk9 build
+
+Change-Id: I80b6619a95ccac43a06ffd9b1b64dc1115510d90
+
+diff --git a/external/rhino/rhino1_5R5.patch b/external/rhino/rhino1_5R5.patch
+index e44872e..40fc6cc 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 @@
+-- 
+cgit v0.10.2
+
diff --git a/patches/series b/patches/series
index 95d6b56..0f944d9 100644
--- a/patches/series
+++ b/patches/series
@@ -37,3 +37,4 @@ icu-no-icu-config.diff
 ww8export-HAVE_MORE_FONTS.diff
 fix-JVM_ONE_PATH_CHECK.diff
 java9-jawt.diff
+java9-rhino.diff
diff --git a/rules b/rules
index eb38c81..d34e02c 100755
--- a/rules
+++ b/rules
@@ -1449,11 +1449,13 @@ ifeq "$(ENABLE_JAVA)" "y"
     endif
 	CONFIGURE_FLAGS += --enable-scripting-beanshell
   else
+	CONFIGURE_FLAGS += --disble-scripting-beanshell
  	DEBHELPER_OPTIONS += -Nlibreoffice-script-provider-bsh
   endif
   ifeq "$(ENABLE_SCRIPT_PROVIDER_JS)" "y"
 	CONFIGURE_FLAGS += --enable-scripting-javascript	
   else
+	CONFIGURE_FLAGS += --disable-scripting-javascript	
 	DEBHELPER_OPTIONS += -Nlibreoffice-script-provider-js
   endif
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git