[libreoffice] 02/06: backport patch from master to find jawt 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 b4fdbb697b7b2c6de3d07e81a0b0ce1a0b3ea995
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Nov 7 00:37:08 2017 +0100

    backport patch from master to find jawt with Java9
---
 changelog               |  4 +++-
 patches/java9-jawt.diff | 18 ++++++++++++++++++
 patches/series          |  1 +
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index c344799..ada8489 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,8 @@ 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/rules:
     - be consequent and enable the junit tests on armhf/arm64 now that
       those work.
@@ -19,7 +21,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>  Mon, 06 Nov 2017 07:30:33 +0100
+ -- Rene Engelhard <rene at debian.org>  Tue, 07 Nov 2017 00:39:09 +0100
 
 libreoffice (1:5.4.3~rc1-2) unstable; urgency=medium
 
diff --git a/patches/java9-jawt.diff b/patches/java9-jawt.diff
new file mode 100644
index 0000000..aafe9b5
--- /dev/null
+++ b/patches/java9-jawt.diff
@@ -0,0 +1,18 @@
+diff --git a/configure.ac b/configure.ac
+index 93543ddccf4e..6ee677e222a1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7126,7 +6907,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])
diff --git a/patches/series b/patches/series
index 0c79f1e..95d6b56 100644
--- a/patches/series
+++ b/patches/series
@@ -36,3 +36,4 @@ stop-shipping-mimelnk-desktop-files.diff
 icu-no-icu-config.diff
 ww8export-HAVE_MORE_FONTS.diff
 fix-JVM_ONE_PATH_CHECK.diff
+java9-jawt.diff

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