[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.1-2-7-g3a6e7b1
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 3a6e7b183e9d1d2350a53d08d28813b587836354
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jul 20 22:33:28 2011 +0200
fix sc build on i386, imported from Fedora
diff --git a/changelog b/changelog
index 28e1703..ccb5d2e 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,9 @@
libreoffice (1:3.4.1-2) experimental; urgency=low
[ Rene Engelhard ]
+ * debian/patches/vbaobj-visibility-fix.diff: fix sc build on i386, imported
+ from Fedora
+
* debian/libreoffice-common.postinst.in, libreoffice-core.postinst.in,
debian/shell-lib-components.sh:
check for /@OOBASISDIR@/program/.services.rdb before using it
@@ -34,7 +37,7 @@ libreoffice (1:3.4.1-2) experimental; urgency=low
- Fix deprecated options when calling soffice and libreoffice
(closes: #634001)
- -- Rene Engelhard <rene@debian.org> Wed, 20 Jul 2011 16:37:31 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 20 Jul 2011 22:28:52 +0200
libreoffice (1:3.4.1-1) experimental; urgency=low
diff --git a/patches/series b/patches/series
index 9e0f6ae..7968ce1 100644
--- a/patches/series
+++ b/patches/series
@@ -15,3 +15,4 @@ mips-openjdk-jre-paths.diff
autogen.diff
disable-dynamic-list-cpp.diff
libebook-1.2.so.11.diff
+vbaobj-visibility-fix.diff
diff --git a/patches/vbaobj-visibility-fix.diff b/patches/vbaobj-visibility-fix.diff
new file mode 100644
index 0000000..7281f4b
--- /dev/null
+++ b/patches/vbaobj-visibility-fix.diff
@@ -0,0 +1,38 @@
+--- /dev/null 2011-07-16 21:04:31.031883505 +0200
++++ libreoffice-3.4.1/libreoffice-build/patches/hotfixes/vbaobj-visibility-fix.diff 2011-07-20 22:26:42.000000000 +0200
+@@ -0,0 +1,35 @@
++http://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg10561.html
++
++--- vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:27:51.507604173 +0000
+++++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:28:26.230045727 +0000
++@@ -238,7 +238,7 @@
++
++ // including a HelperInterface implementation
++ template< typename Ifc1 >
++-class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
+++class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
++ {
++ typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
++ protected:
++--- sc/Library_vbaobj.mk
+++++ sc/Library_vbaobj.mk
++@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
++ sc/source/ui/vba/vbaquerytable \
++ sc/source/ui/vba/vbarange \
++ sc/source/ui/vba/vbasheetobject \
++- sc/source/ui/vba/vbasheetobjects \
++ sc/source/ui/vba/vbastyle \
++ sc/source/ui/vba/vbastyles \
++ sc/source/ui/vba/vbatextboxshape \
++@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
++ sc/source/ui/vba/vbawsfunction \
++ ))
++
+++$(eval $(call gb_Library_add_cxxobjects,vbaobj,\
+++ sc/source/ui/vba/vbasheetobjects \
+++ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+++))
+++
++ ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
++ $(eval $(call gb_Library_set_ldflags,vbaobj,\
++ $$(LDFLAGS) \
--
LibreOffice packaging repository
Reply to: