[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. f6e0f0ece62eac484adaed388fce8b1a7f73e8d0
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 490e039995b228faaab3e0cf272ee4b8d523a42e
Author: Rene Engelhard <rene@debian.org>
Date: Sat Apr 30 12:13:12 2011 +0000
add hack to also include e.g. /usr/lib/gcc/x86_64-linux-gnu/4.6.1/include explicitely to work around gcj mismatches
diff --git a/changelog b/changelog
index f305099..15defcc 100644
--- a/changelog
+++ b/changelog
@@ -22,11 +22,14 @@ libreoffice (1:3.3.2-4) UNRELEASED; urgency=low
* debian/patches/gcc4.6.0.diff: fix build with gcc 4.6, imported from
Fedora
+ * debian/patches/odk-jni-include.diff: add hack to also include e.g.
+ /usr/lib/gcc/x86_64-linux-gnu/4.6.1/include explicitely to work around gcj
+ mismatches
* debian/rules:
- disable smoketest on sparc, flaky
- -- Rene Engelhard <rene@debian.org> Sat, 30 Apr 2011 11:44:42 +0000
+ -- Rene Engelhard <rene@debian.org> Sat, 30 Apr 2011 12:02:51 +0000
libreoffice (1:3.3.2-3) unstable; urgency=low
diff --git a/patches/odk-jni-include.diff b/patches/odk-jni-include.diff
new file mode 100644
index 0000000..809864c
--- /dev/null
+++ b/patches/odk-jni-include.diff
@@ -0,0 +1,30 @@
+--- /dev/null 2011-04-24 04:52:22.984502351 +0000
++++ libreoffice-3.3.2/libreoffice-build/patches/dev300/odk-jni-include.diff 2011-04-30 12:07:10.000000000 +0000
+@@ -0,0 +1,11 @@
++--- odk/source/unowinreg/win/makefile.mk-old 2011-04-30 12:06:11.000000000 +0000
+++++ odk/source/unowinreg/win/makefile.mk 2011-04-30 12:07:03.000000000 +0000
++@@ -62,7 +62,7 @@
++ .IF "$(BUILD_UNOWINREG)" == "YES"
++
++ $(BIN)$/unowinreg.dll : unowinreg.cxx
++- $(MINGWCXX) -Wall -D_JNI_IMPLEMENTATION_ $(JAVA_INCLUDES) \
+++ $(MINGWCXX) -Wall -D_JNI_IMPLEMENTATION_ $(JAVA_INCLUDES) -I/usr/lib/gcc/`dpkg-architecture -qDEB_BUILD_GNU_TYPE`/`gcc --version | head -n 1 | awk '{ print $$4 }'`/include \
++ -I$(PRJ)/inc/pch -shared -o $(BIN)$/unowinreg.dll unowinreg.cxx \
++ -Wl,--kill-at -lkernel32 -ladvapi32
++ $(MINGWSTRIP) $(BIN)$/unowinreg.dll
+--- libreoffice-3.3.2/libreoffice-build/patches/dev300/apply-old 2011-04-30 12:09:37.000000000 +0000
++++ libreoffice-3.3.2/libreoffice-build/patches/dev300/apply 2011-04-30 12:10:00.000000000 +0000
+@@ -235,10 +235,12 @@
+ # configmgr paths are not yet existing then
+ speed-sal-fewer-lstats.diff, i#89730, jholesov
+
+-# set unomaxservices and javamaxservices to 1
+ [ TemporaryHacks and DebianOnly ]
++# set unomaxservices and javamaxservices to 1
+ installer-globals-max-1-regcomp.diff
+
++odk-jni-include.diff
++
+ [ OOo4KidsPatches ]
+
+ # TODO: updated icons missing, updated sdf files missing
diff --git a/patches/series b/patches/series
index 0b711c6..7130656 100644
--- a/patches/series
+++ b/patches/series
@@ -10,3 +10,4 @@ no-minimaltoc.diff
update-debian-opt.diff
fix-evolution-local.diff
gcc4.6.0.diff
+odk-jni-include.diff
--
LibreOffice packaging repository
Reply to: