This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository libreoffice.
commit 67849bf2b98ed227b38b59aa9fb96049dc95ac91 Author: Rene Engelhard <[email protected]> Date: Fri Feb 5 12:17:28 2016 +0100 add -I$JAVA_HOME/include/linux to JAVAINC for kFreeBSD to find jni_md.h --- changelog | 4 +++- patches/kfreebsd-openjdk8-JAVAINC.diff | 28 ++++++++++++++++++++++++++++ patches/series | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/changelog b/changelog index 66abc2b..8a4aaa1 100644 --- a/changelog +++ b/changelog @@ -5,6 +5,8 @@ libreoffice (1:5.0.5~rc2-1) unstable; urgency=medium * debian/patches/bash-completion-dir.diff: add from master; install bash completion to "new" /usr/share/bash-completion/completions + * debian/patches/kfreebsd-openjdk8-JAVAINC.diff: add + -I$JAVA_HOME/include/linux to JAVAINC for kFreeBSD to find jni_md.h * debian/rules: - update/clean up up JAVA_RUNTIME_DEPENDS: move gcj-jre after all the @@ -15,7 +17,7 @@ libreoffice (1:5.0.5~rc2-1) unstable; urgency=medium * debian/scripts/gid2pkgdirs.sh: adapt for bash_completion move and install without .sh - -- Rene Engelhard <[email protected]> Fri, 05 Feb 2016 11:11:30 +0100 + -- Rene Engelhard <[email protected]> Fri, 05 Feb 2016 12:14:51 +0100 libreoffice (1:5.0.5~rc1-1) unstable; urgency=medium diff --git a/patches/kfreebsd-openjdk8-JAVAINC.diff b/patches/kfreebsd-openjdk8-JAVAINC.diff new file mode 100644 index 0000000..824bcce --- /dev/null +++ b/patches/kfreebsd-openjdk8-JAVAINC.diff @@ -0,0 +1,28 @@ +From cf7362afe670706a385fdba579deef4ad455aba7 Mon Sep 17 00:00:00 2001 +From: Rene Engelhard <[email protected]> +Date: Fri, 5 Feb 2016 12:10:56 +0100 +Subject: [PATCH] add I$JAVA_HOME/include/linux to JAVAINC to kFreeBSD to fix + build + +jni_md.h not in $JAVA_HOME/include anymore in OpenJDK8 (it was in 7) + +Change-Id: Id5c737182a8e476b609887753047fa7ed6b01193 +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 3175689..fec39bf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7179,6 +7179,7 @@ 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" + ;; + +-- +2.1.4 + diff --git a/patches/series b/patches/series index 1e83637..a878f43 100644 --- a/patches/series +++ b/patches/series @@ -32,3 +32,4 @@ 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
