[arch-commits] Commit in openoffice-base-devel/trunk (ChangeLog PKGBUILD)

[andyrtr at archlinux.org]

    Date: Saturday, October 9, 2010 @ 05:17:30
  Author: andyrtr
Revision: 94648

prepare next snapshot; currently broken with enable-gio and with new redland

Modified:
  openoffice-base-devel/trunk/ChangeLog
  openoffice-base-devel/trunk/PKGBUILD

-----------+
 ChangeLog |    5 +++++
 PKGBUILD  |    9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-10-09 05:41:37 UTC (rev 94647)
+++ ChangeLog	2010-10-09 09:17:30 UTC (rev 94648)
@@ -1,3 +1,8 @@
+2010-10-07 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.3_dev300_m89-1:
+	- new snapshot
+
 2010-10-01 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.3_dev300_m88-1:

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-09 05:41:37 UTC (rev 94647)
+++ PKGBUILD	2010-10-09 09:17:30 UTC (rev 94648)
@@ -4,7 +4,7 @@
 
 pkgbase="openoffice-base-devel"
 pkgname=('openoffice-base-devel' 'openoffice-sdk-devel')
-_OO_milestone=DEV300_m88
+_OO_milestone=DEV300_m89
 pkgver=3.4_${_OO_milestone/DEV/dev}
 pkgrel=1
 arch=('i686' 'x86_64')
@@ -109,7 +109,7 @@
 	${_additional_source_url}/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
 	${_additional_source_url}/cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2)
 options=('!distcc' '!ccache' '!makeflags')
-md5sums=('521b2b7d7d3dac98b79bc5a080efa123'
+md5sums=('afc3ed1ace37c728b6533cc8d73af695'
          'e3a0b76dcd876f3d721ee7183729153d'
          '09094988c7bfaa90e5d014523d558ebb'
          '71f136a31e296a04ab68932a31dd533e'
@@ -230,7 +230,7 @@
 	patch -Np0 -i ${srcdir}/buildfix-gcc44.diff
 	patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff
 	# gcc4.5 fix
-	patch -Np0 -i ${srcdir}/cppu-lbnames-enable-gcc-4.5.diff
+#	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=113773, http://www.openoffice.org/issues/show_bug.cgi?id=113632
 #	patch -Np1 -i ${srcdir}/vcl.empty-library_path.patch
@@ -264,6 +264,9 @@
 	unset CFLAGS
 	unset CXXFLAGS
 
+	# python2 fix
+	export PYTHON=python2
+
 	# Need to recreate the configure script because of patches
 	autoreconf -v