[libreoffice] 01/01: update java9-jawt.diff: also fix odk/settings/settings.mk

[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 25e8cb5fc060a6841c9c046108787f5b60460db2
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Nov 7 20:59:36 2017 +0100

    update java9-jawt.diff: also fix odk/settings/settings.mk
---
 changelog               |  5 +++--
 patches/java9-jawt.diff | 13 +++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 04ab315..4c53f24 100644
--- a/changelog
+++ b/changelog
@@ -2,7 +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/patches/java9-jawt.diff: add from master; find jawt with Java9 and
+    also fix odk/settings/settings.mk for it
   * debian/patches/java9-jawt.rhino: add from master; fix rhino build with Java9
 
   * debian/rules:
@@ -24,7 +25,7 @@ libreoffice (1:5.4.3-1) unstable; urgency=medium
   * debian/control.in: make -core conflict against openjdk-{6,7,8}-jre-headless
     on i386- -java-common would make more sense, but it's Arch: all..
 
- -- Rene Engelhard <rene at debian.org>  Tue, 07 Nov 2017 19:34:51 +0100
+ -- Rene Engelhard <rene at debian.org>  Tue, 07 Nov 2017 20:59:01 +0100
 
 libreoffice (1:5.4.3~rc1-2) unstable; urgency=medium
 
diff --git a/patches/java9-jawt.diff b/patches/java9-jawt.diff
index aafe9b5..855416b 100644
--- a/patches/java9-jawt.diff
+++ b/patches/java9-jawt.diff
@@ -16,3 +16,16 @@ index 93543ddccf4e..6ee677e222a1 100644
          AS_IF([test "$JAVA_ARCH" != ""], [AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$JAVA_ARCH"])])
      fi
      AC_MSG_RESULT([$JAWTLIB])
+diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
+index 2813959f5dec..684c39edae91 100644
+--- a/odk/settings/settings.mk
++++ b/odk/settings/settings.mk
+@@ -376,7 +376,7 @@ COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
+ 
+ EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--no-whole-archive
+ LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)"
+-LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
++LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" -L"$(OO_SDK_JAVA_HOME)/lib"
+ 
+ URE_MISC=$(OFFICE_PROGRAM_PATH)
+ 

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