OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=527

0001-Adapt-getcompver.awk-to-Java-9.patch

@@ -0,0 +1,38 @@
+From b44f062df9f541b0a1bea974556483c7a5876b35 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Wed, 30 Aug 2017 15:16:22 +0200
+Subject: [PATCH] Adapt getcompver.awk to Java 9
+
+...where at least <http://jdk.java.net/9/> "JDK 9 Early-Access Builds" 'java
+-version' outputs a single-digit
+
+  java version "9"
+
+Change-Id: I7807f56593e5436418b49950ca6c2a178d6721f5
+---
+ solenv/bin/getcompver.awk | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/solenv/bin/getcompver.awk b/solenv/bin/getcompver.awk
+index ae08f4e21790..6744c4dc5c7c 100644
+--- a/solenv/bin/getcompver.awk
++++ b/solenv/bin/getcompver.awk
+@@ -40,8 +40,13 @@ BEGIN {
+ /java version/ || /openjdk version/ {
+     compiler_matched = 1
+     # match on the format of the java versions ( d[d].d[d].d[d] )
+-    x = match( $0, /[0-9]*\.[0-9]*\.[0-9]*/ )
+-    CCversion = substr( $0, RSTART, RLENGTH)
++    if (match($0, /[0-9]+\.[0-9]+\.[0-9]+/)) {
++        CCversion = substr($0, RSTART, RLENGTH)
++    } else if (match($0, /[0-9]+\.[0-9]+/)) {
++        CCversion = substr($0, RSTART, RLENGTH) "."
++    } else if (match($0, /[0-9]+/)) {
++        CCversion = substr($0, RSTART, RLENGTH) ".."
++    }
+ }
+ /^[0-9]*[.][0-9]*\r*$/ {
+     if ( compiler_matched == 0 ) {
+-- 
+2.14.1
+

0001-This-hunk-breaks-jdk9-build.patch

@@ -0,0 +1,32 @@
+From 93157811a1e290416422fea91c5bbc2a03b6324a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
+Date: Mon, 4 Sep 2017 20:59:02 +0200
+Subject: [PATCH 1/2] This hunk breaks jdk9 build
+
+Change-Id: I80b6619a95ccac43a06ffd9b1b64dc1115510d90
+---
+ external/rhino/rhino1_5R5.patch | 8 --------
+ 1 file changed, 8 deletions(-)
+
+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 @@
+-- 
+2.14.1
+

0002-Detect-libjawt-automatically-on-java9-too.patch

@@ -0,0 +1,31 @@
+From f0e34eaf4969af89eab22331c882a0a8a10e82d8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
+Date: Tue, 12 Sep 2017 10:32:26 +0200
+Subject: [PATCH 2/2] Detect libjawt automatically on java9 too
+
+Change-Id: Ie8eb53a915682b7a188b1af4b2d435eb0cc9ff81
+---
+ configure.ac | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index f053df0192c7..d99b67676177 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7003,7 +7003,12 @@ then
+             my_java_arch=$host_cpu
+             ;;
+         esac
+-        JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
++        # This is where JDK9 puts the library
++        if test -e "$JAVA_HOME/lib/libjawt.so"; then
++            JAWTLIB="-L$JAVA_HOME/lib/ -ljawt"
++        else
++            JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
++        fi
+         AS_IF([test "$JAVA_ARCH" != ""], [AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$JAVA_ARCH"])])
+     fi
+     AC_MSG_RESULT([$JAWTLIB])
+-- 
+2.14.1
+

libreoffice.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Sep 12 08:41:51 UTC 2017 - fstrba@suse.com
+
+- Added patches:
+  * 0001-This-hunk-breaks-jdk9-build.patch
+    + Remove a patch hunk that breaks rhino build
+  * 0002-Detect-libjawt-automatically-on-java9-too.patch
+    + Fix detection of JDK9's libjawt.so
+  * 0001-Adapt-getcompver.awk-to-Java-9.patch
+    + Adapt getcompver.awk to Java 9 where the version might be
+      single digit
+
 -------------------------------------------------------------------
 Mon Aug 28 08:11:19 UTC 2017 - tchvatal@suse.com
 

libreoffice.spec

@@ -82,11 +82,18 @@ Patch5:         mediawiki-no-broken-help.diff
 # PATCH-HOTFIX-UPSTREAM: disable test that rounds wrongly on most archs
 Patch16:        libreoffice-hotfix-disablebrokenshapetest.patch
 Patch17:        gnome-documents-check-ntimeoutid.patch
+# PATCH-FIX-UPSTREAM: remove a patch hunk that breaks rhino build
+Patch100:       0001-This-hunk-breaks-jdk9-build.patch
+# PATCH-FIX-UPSTREAM: fix detection of JDK9's libjawt.so
+Patch101:       0002-Detect-libjawt-automatically-on-java9-too.patch
+# PATCH-FIX-UPSTREAM: addapt getcompver.awk to java 9
+Patch102:       0001-Adapt-getcompver.awk-to-Java-9.patch
 # try to save space by using hardlinks
 Patch990:       install-with-hardlinks.diff
 BuildRequires:  %{name}-share-linker
 BuildRequires:  ant
 BuildRequires:  autoconf
+BuildRequires:  awk
 BuildRequires:  bison
 BuildRequires:  bsh2
 BuildRequires:  commons-codec
@@ -908,6 +915,9 @@ Provides additional %{langname} translations and resources for %{project}. \
 %patch5
 %patch16 -p1
 %patch17 -p1
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
 %patch990 -p1
 
 # Do not generate doxygen timestamp