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

[andyrtr at archlinux.org]

    Date: Friday, October 15, 2010 @ 03:45:31
  Author: andyrtr
Revision: 95102

upgpkg: openoffice-base-beta 3.3.0_ooo330_m10-1
new version OOO330_m10; add buildfix for new rasqal/redland and python2

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

-----------+
 ChangeLog |    6 ++++++
 PKGBUILD  |   18 +++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-10-14 19:53:00 UTC (rev 95101)
+++ ChangeLog	2010-10-15 07:45:31 UTC (rev 95102)
@@ -1,3 +1,9 @@
+2010-10-12 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.3.0-OOO330_m10-1 :
+	- new snapshot
+	- add a buildfix to compile with recent redland/rasqal
+
 2010-09-29 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.3.0-OOO330_m9-1 :

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-14 19:53:00 UTC (rev 95101)
+++ PKGBUILD	2010-10-15 07:45:31 UTC (rev 95102)
@@ -4,7 +4,7 @@
 
 pkgbase="openoffice-base-beta"
 pkgname=('openoffice-base-beta' 'openoffice-sdk-beta')
-_OO_milestone=OOO330_m9
+_OO_milestone=OOO330_m10
 pkgver=3.3.0_${_OO_milestone/OOO/ooo} # m3 = beta 1
 pkgrel=1
 arch=('i686' 'x86_64')
@@ -15,9 +15,9 @@
              'apache-ant' 'gperf' 'poppler' 'kdelibs' 'gconf' 'openjdk6' 'cppunit'
 	     'beanshell'  'vigra' 'libldap' 'lucene' 'libmythes' 'junit'
              # from main OOo the deps
-             "curl>=7.20.0" "hunspell>=1.2.8" "python>=2.6.5" 'libwpd' 'libxaw' "neon>=0.28.6"
+             "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd' 'libxaw' "neon>=0.28.6"
              'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.2.1" 'libxslt'
-             'redland' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'
+             'redland>=1.0.11.99' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'
              'hicolor-icon-theme' 'desktop-file-utils' 'gtk2') # keep gtk2 for install script
     	     # 'saxon' 
 _additional_source_url=http://hg.services.openoffice.org/binaries
@@ -29,6 +29,7 @@
 	soffice-detect-mozilla-certificates.diff
 	buildfix-gcc44.diff
 	buildfix_FormulaMissingHeader.diff
+	http://www.openoffice.org/nonav/issues/showattachment.cgi/72052/configure.set-redland-cflags.patch
 	http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/cppu-lbnames-enable-gcc-4.5.diff
 	http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/sal-cpprt-gcc-4.5-workaround.diff
 	cppunit_gcc45.diff
@@ -108,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=('104fe6684e29f8ba2c11a926532e1621'
+md5sums=('6865d4b3d174e5edf29f7ed2d5e99c6c'
          'e3a0b76dcd876f3d721ee7183729153d'
          'aa65d79fe9023e982835c77227ead2b0'
          '71f136a31e296a04ab68932a31dd533e'
@@ -116,6 +117,7 @@
          '1dc7480a04f572ad136d35923a2af66d'
          'c8e82b4d2324fe62ad8c6e29213e80b5'
          '863a3ab2c17a3d11b8fa3ec321986366'
+         '283e7ac83bafd04eaeaffe9ad51e5f6e'
          'e666e8cea0ef557a8bce41c58dd16408'
          'cf01fa2669f828864146842e040e3cf8'
          'bb5ada95f7b11a5cac5d669f7ae8baaa'
@@ -224,6 +226,9 @@
 	# build fixes
 	patch -Np0 -i ${srcdir}/buildfix-gcc44.diff
 	patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff
+	# http://www.openoffice.org/issues/show_bug.cgi?id=114999
+	patch -Np1 -i ${srcdir}/configure.set-redland-cflags.patch
+	
 	# 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
@@ -257,6 +262,9 @@
 	unset CFLAGS
 	unset CXXFLAGS
 
+	# python2 fix
+	export PYTHON=python2
+
 	# Need to recreate the configure script because of patches
 	autoreconf -v
 
@@ -350,7 +358,7 @@
 
  pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite - testing branch leading to next stable release"
  install=openoffice.install
- depends=("curl>=7.20.0" "hunspell>=1.2.8" "python>=2.6.5" 'libwpd' 'libxaw' "neon>=0.28.6"
+ depends=("curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd' 'libxaw' "neon>=0.28.6"
           'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.2.1" 'libxslt'
 	  'redland' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'
 	  'hicolor-icon-theme' 'desktop-file-utils' 'gtk2') # keep gtk2 for install script