[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.2-1-37-g44fc664
The following commit has been merged in the debian-experimental-3.6 branch:
commit 44fc6649366c574f3dc051a53b4dff9f5bf54a98
Merge: c26fc3b40efe518fcb583c705cf8edd6d11c7d19 604f56de1433f63aab73390f203cd79d02f74f38
Author: Rene Engelhard <rene@debian.org>
Date: Sat Apr 7 05:20:51 2012 +0200
Merge remote branch 'origin/master' into debian-experimental-3.6
diff --combined patches/gcj-safe-jni-h-include.diff
index c3b5169,7a43bfc..3016bcf
--- a/patches/gcj-safe-jni-h-include.diff
+++ b/patches/gcj-safe-jni-h-include.diff
@@@ -1,32 -1,33 +1,32 @@@
--- a/configure.in-old 2012-04-07 00:05:49.607740045 +0200
+++ b/configure.in 2012-04-07 00:06:53.899999955 +0200
- @@ -4287,6 +4287,8 @@
+ @@ -4287,7 +4287,8 @@
if test "$JDK" = "gcj"; then
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
- + GCJ_JNI_INCLUDE=`/usr/lib/jvm/java-gcj/bin/gcj --print-file-name include/jni.h | $SED -e s,\/jni.h,,g`
+ - CFLAGS="$CFLAGS -I$JAVA_HOME/include"
+ + 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"
- CFLAGS="$CFLAGS -I$JAVA_HOME/include"
LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
exec 6>/dev/null # no output
- @@ -5469,7 +5469,6 @@
- AC_CHECK_HEADER(jni.h, [],
-@@ -4336,6 +4338,7 @@
- AC_SUBST(JAVAIFLAGS)
- AC_SUBST(JAVACOMPILER)
- AC_SUBST(JAVADOC)
++@@ -5469,6 +5469,7 @@
+ AC_SUBST(XCLASSPATH)
+ AC_SUBST(x_JAVALIB)
+ AC_SUBST(x_JDKLIB)
- -AC_SUBST(GCJ_JNI_INCLUDE)
+ +AC_SUBST(GCJ_JNI_INCLUDE)
dnl ===================================================================
dnl Checks for specific files.
---- a/set_soenv.in-old 2012-04-06 23:34:58.307738832 +0200
-+++ b/set_soenv.in 2012-04-06 23:37:24.960240235 +0200
-@@ -1311,6 +1311,10 @@
-
- $SOLARINC .=$I.$JAVA_HOME.$INCLUDE.$ds."native_threads".$INCLUDE;
- }
-+ if ($JDK eq "gcj")
-+ {
-+ $SOLARINC .= $I."@GCJ_JNI_INCLUDE@";
-+ }
- #The tail, if needed
- if ($platform =~ m/linux|freebsd|netbsd|aix|openbsd|dragonfly/)
- { if ( $XINC ne "/usr/include" && $XINC ne 'no_x_includes' ) {
+--- a/config_host.mk.in-old 2012-04-07 02:57:37.475759985 +0200
++++ b/config_host.mk.in 2012-04-07 02:58:17.976557350 +0200
+@@ -420,8 +420,8 @@
+ export SIZEOF_POINTER=@SIZEOF_POINTER@
+ export SIZEOF_SHORT=@SIZEOF_SHORT@
+ export SOLARENV=@SRC_ROOT@/solenv
+-export SOLARINC=@SOLARINC@
+-export SOLARINC_FOR_BUILD=@SOLARINC_FOR_BUILD@
++export SOLARINC=@SOLARINC@ @GCJ_JNI_INCLUDE@
++export SOLARINC_FOR_BUILD=@SOLARINC_FOR_BUILD@ @GCJ_JNI_INCLUDE@
+ export SOLARLIB=@SOLARLIB@
+ export SOLARLIB_FOR_BUILD=@SOLARLIB_FOR_BUILD@
+ export SOLARVER=@SRC_ROOT@/solver
diff --combined patches/series
index b9aa722,870cdd4..d7dae3c
--- a/patches/series
+++ b/patches/series
@@@ -1,6 -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
@@@ -8,6 -8,7 +8,6 @@@ rhino-build-optional.dif
disable-dynamic-list-cpp.diff
fix-system-lpsolve-build.diff
install-fixes.diff
-smoketest-only-en-US.diff
mention-java-common-package.diff
help-msg-add-package-info.diff
sensible-lomua.diff
@@@ -18,10 -19,18 +18,10 @@@ mysqlcppconn-mysqlclient-SONAME.dif
make-pyuno-work-with-system-wide-module-install.diff
search-usr-share-for-images.diff
make-package-modules-not-suck.diff
-fix-ARM-detection-in-set-soenv.diff
add-debian-multiarch-support.diff
-propagate-gb_FULLDEPS.diff
disable-sc-sw-unoapi-subsequentcheck-for-now.diff
mediwiki-oor-replace.diff
-armhf-bridges.diff
-armhf-bridges-fix-armv4t-armel.diff
-move-binfilter-mimetypes-in-extra-desktop-file.diff
pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
-armhf-bridges-doubles.diff
debian-hardened-buildflags.diff
gtk3-hack-explicit-gmodule.diff
-gcc-4.7.diff
-gcc-4.7-i386.diff
-gcc-4.7-amd64.diff
+pyuno-py3-module.diff
--
LibreOffice packaging repository
Reply to: