[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.3.3-1-86-g1e55932
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit f2bc1610f5b9da2d53eb5c74d3822e543c577000
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jun 25 10:24:07 2011 +0200
fix odk-jni-include.diff
diff --git a/patches/odk-jni-include.diff b/patches/odk-jni-include.diff
index 996fd02..d6d0f7f 100644
--- a/patches/odk-jni-include.diff
+++ b/patches/odk-jni-include.diff
@@ -1,15 +1,15 @@
--- /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
++--- odk/source/unowinreg/win/makefile.mk-old 2011-06-25 10:18:32.000000000 +0200
+++++ odk/source/unowinreg/win/makefile.mk 2011-06-25 10:19:22.000000000 +0200
+@@ -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 \
++ -I$(PRJ)/inc/pch -shared -o $(BIN)$/unowinreg.dll unowinreg.cxx \
+ -Wl,--kill-at -lkernel32 -ladvapi32
+ $(MINGWSTRIP) $(BIN)$/unowinreg.dll
--- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old 2011-04-30 12:09:37.000000000 +0000
--
LibreOffice packaging repository
Reply to: