[libreoffice] 02/02: kfreebsd-openjdk8-JAVAINC.diff is upstream
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit 602a9d55198b410178d3fd0ff4bf3b06b0534138
Author: Rene Engelhard <rene@debian.org>
Date: Fri Feb 5 17:12:30 2016 +0100
kfreebsd-openjdk8-JAVAINC.diff is upstream
---
patches/kfreebsd-openjdk8-JAVAINC.diff | 28 ----------------------------
patches/series | 1 -
2 files changed, 29 deletions(-)
diff --git a/patches/kfreebsd-openjdk8-JAVAINC.diff b/patches/kfreebsd-openjdk8-JAVAINC.diff
deleted file mode 100644
index 824bcce..0000000
--- a/patches/kfreebsd-openjdk8-JAVAINC.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-From cf7362afe670706a385fdba579deef4ad455aba7 Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@debian.org>
-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 995954a..3225d9f 100644
--- a/patches/series
+++ b/patches/series
@@ -1,5 +1,4 @@
debian-opt.diff
-kfreebsd-openjdk8-JAVAINC.diff
gcj-safe-jni-h-include.diff
jurt-soffice-location.diff
split-evoab.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: