[arch-commits] Commit in libreoffice/trunk (PKGBUILD vbahelper.visibility.patch)

[andyrtr at archlinux.org]

    Date: Wednesday, May 18, 2011 @ 16:26:54
  Author: andyrtr
Revision: 124291

prepare 3.4 branch builds; add a buildfix, it still doesn't finish

Added:
  libreoffice/trunk/vbahelper.visibility.patch
Modified:
  libreoffice/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   13 +++++++++----
 vbahelper.visibility.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-18 18:46:46 UTC (rev 124290)
+++ PKGBUILD	2011-05-18 20:26:54 UTC (rev 124291)
@@ -92,7 +92,8 @@
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
 	buildfix_i116795.diff
 	buildfix_boost.diff
-	buildfix_ct2n.diff)
+	buildfix_ct2n.diff
+	vbahelper.visibility.patch)
 noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
 	7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
@@ -191,8 +192,8 @@
          'b7b2d0e04e142f26dd96119c80757d1f'
          '0520d63c946e272ed3bdfc863fbdc42e'
          'bc228237108cab7745897a9f466b6d39'
-         'eee273f501ff45dc5f1365e78c6d57c0')
-
+         'eee273f501ff45dc5f1365e78c6d57c0'
+         '43b145db28e6c0d73578ae6fd35e510d')
 build() {
 
 	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
@@ -218,12 +219,16 @@
 	patch -Np1 -i ${srcdir}/buildfix_i116795.diff
 	patch -Np1 -i ${srcdir}/buildfix_boost.diff
 	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
+	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
 	
 	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
 	unset CFLAGS
 	unset CXXFLAGS
 
+	# workaround for bison2.5
+#	export CXXFLAGS="-fpermissive"
+	
 	# python2 fix
 	export PYTHON=python2
 
@@ -248,7 +253,7 @@
 		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
 		--with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \
 		--with-lang="" \
-		--disable-verbose \
+		--enable-verbose \
 		--enable-cairo\
 		--enable-crashdump \
 		--enable-dbus \

Added: vbahelper.visibility.patch
===================================================================
--- vbahelper.visibility.patch	                        (rev 0)
+++ vbahelper.visibility.patch	2011-05-18 20:26:54 UTC (rev 124291)
@@ -0,0 +1,33 @@
+--- 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) \