[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2-1-14-g604f56d
The following commit has been merged in the master branch:
commit 604f56de1433f63aab73390f203cd79d02f74f38
Author: Rene Engelhard <rene@debian.org>
Date: Sat Apr 7 05:15:57 2012 +0200
use instead of hardcoded /usr/lib/jvm/java-gcj
diff --git a/patches/safe-jni-h-include.diff b/patches/gcj-safe-jni-h-include.diff
similarity index 91%
rename from patches/safe-jni-h-include.diff
rename to patches/gcj-safe-jni-h-include.diff
index 4c850fc..7a43bfc 100644
--- a/patches/safe-jni-h-include.diff
+++ b/patches/gcj-safe-jni-h-include.diff
@@ -5,7 +5,7 @@
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
- CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-+ GCJ_JNI_INCLUDE=`/usr/lib/jvm/java-gcj/bin/gcj --print-file-name include/jni.h | $SED -e s,\/jni.h,,g`
++ GCJ_JNI_INCLUDE=`$JAVA_HOME/bin/gcj --print-file-name include/jni.h | $SED -e s,\/jni.h,,g`
+ CFLAGS="$CFLAGS -I$JAVA_HOME/include -I$GCJ_JNI_INCLUDE"
LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
exec 6>/dev/null # no output
diff --git a/patches/series b/patches/series
index fa1f9b2..870cdd4 100644
--- a/patches/series
+++ b/patches/series
@@ -1,6 +1,6 @@
no-minimaltoc.diff
debian-opt.diff
-safe-jni-h-include.diff
+gcj-safe-jni-h-include.diff
jurt-soffice-location.diff
split-binfilters-and-evo.diff
debian-debug.diff
--
LibreOffice packaging repository
Reply to: