Date: Wednesday, August 11, 2010 @ 00:01:39
Author: andyrtr
Revision: 87224
prepare next shot
Modified:
openoffice-base-devel/trunk/PKGBUILD
----------+
PKGBUILD | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-08-11 03:31:22 UTC (rev 87223)
+++ PKGBUILD 2010-08-11 04:01:39 UTC (rev 87224)
@@ -33,6 +33,7 @@
http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/sal-cpprt-gcc-4.5-workaround.diff
dictionaries-needs-th-gen-idx.pl.diff
cppunit_gcc45.diff
+
http://www.openoffice.org/nonav/issues/showattachment.cgi/70906/fixup.patch
openoffice.profile)
options=('!distcc' '!ccache' '!makeflags')
@@ -72,6 +73,8 @@
# gcc4.5 fix
patch -Np0 -i ${srcdir}/cppu-lbnames-enable-gcc-4.5.diff
patch -Np0 -i ${srcdir}/sal-cpprt-gcc-4.5-workaround.diff
+ # buildfix for http://www.openoffice.org/issues/show_bug.cgi?id=113563
+ patch -Np1 -i ${srcdir}/fixup.patch
# http://www.openoffice.org/issues/show_bug.cgi?id=113223
# patch -Np1 -i ${srcdir}/dictionaries-needs-th-gen-idx.pl.diff
@@ -91,7 +94,7 @@
sed -i "s:lib64\/libjpeg.so:lib\/libjpeg.so:g"
${srcdir}/${_OO_milestone}/solenv/inc/libs.mk
else EXTRAOPTS="--with-stlport --without-system-cppunit"
# http://hg.services.openoffice.org/cws/sb122/raw-rev/f77b0e62cc92
-# cp -v ${srcdir}/cppunit_gcc45.diff
${srcdir}/${_OO_milestone}/cppunit/ldflags.patch
+ cp -v ${srcdir}/cppunit_gcc45.diff
${srcdir}/${_OO_milestone}/cppunit/ldflags.patch
fi
cd ${srcdir}/${_OO_milestone}
