[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.2-1-38-g53b2104
The following commit has been merged in the debian-experimental-3.6 branch:
commit 53b2104e7b7d8af663d5e378c3c1e1e2a35534d2
Author: Rene Engelhard <rene@debian.org>
Date: Sat Apr 7 05:27:01 2012 +0200
fix up somehow malformed gcj-safe-jni-h-include.diff
diff --git a/patches/gcj-safe-jni-h-include.diff b/patches/gcj-safe-jni-h-include.diff
index 3016bcf..cd58bd1 100644
--- a/patches/gcj-safe-jni-h-include.diff
+++ b/patches/gcj-safe-jni-h-include.diff
@@ -1,6 +1,6 @@
--- a/configure.in-old 2012-04-07 00:05:49.607740045 +0200
+++ b/configure.in 2012-04-07 00:06:53.899999955 +0200
-@@ -4287,7 +4287,8 @@
+@@ -5135,7 +5135,8 @@
if test "$JDK" = "gcj"; then
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
@@ -9,7 +9,8 @@
+ CFLAGS="$CFLAGS -I$JAVA_HOME/include -I$GCJ_JNI_INCLUDE"
LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
exec 6>/dev/null # no output
-@@ -5469,6 +5469,7 @@
+ AC_CHECK_HEADER(jni.h, [],
+@@ -5469,6 +5470,7 @@
AC_SUBST(XCLASSPATH)
AC_SUBST(x_JAVALIB)
AC_SUBST(x_JDKLIB)
--
LibreOffice packaging repository
Reply to: