[libreoffice] 01/01: fix kfreebsd-openjdk8-JAVAINC.diff apply and update gcj-safe-jni-h-include.diff
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 16263bbfe816e917cf7ec6d9d91a7bf986dfc4db
Author: Rene Engelhard <rene@debian.org>
Date: Fri Feb 5 14:08:44 2016 +0100
fix kfreebsd-openjdk8-JAVAINC.diff apply and update gcj-safe-jni-h-include.diff
---
patches/gcj-safe-jni-h-include.diff | 2 +-
patches/series | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/patches/gcj-safe-jni-h-include.diff b/patches/gcj-safe-jni-h-include.diff
index 9217259..a875fb7 100644
--- a/patches/gcj-safe-jni-h-include.diff
+++ b/patches/gcj-safe-jni-h-include.diff
@@ -3,8 +3,8 @@ index 053fc51..84b323c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7212,12 +7240,18 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
- k*bsd*-gnu*)
JAVAINC="-I$JAVA_HOME/include"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
+ if test "$JDK" = "gcj"; then
+ JAVAINC="$JAVAINC -I`$JAVA_HOME/bin/gcj --print-file-name include/jni.h | $SED -e s,\/jni.h,,g`"
diff --git a/patches/series b/patches/series
index a878f43..ebd4c91 100644
--- a/patches/series
+++ b/patches/series
@@ -1,4 +1,5 @@
debian-opt.diff
+kfreebsd-openjdk8-JAVAINC.diff
gcj-safe-jni-h-include.diff
jurt-soffice-location.diff
split-evoab.diff
@@ -32,4 +33,3 @@ liborcus-0.9.1.diff
debian-branding.diff
icu-56.diff
bash-completion-dir.diff
-kfreebsd-openjdk8-JAVAINC.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: