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

[andyrtr at archlinux.org]

    Date: Monday, April 5, 2010 @ 11:10:34
  Author: andyrtr
Revision: 75993

rebuild for heimdal/icu; back to internal redland to solve some bugs

Modified:
  go-openoffice/trunk/ChangeLog
  go-openoffice/trunk/PKGBUILD

-----------+
 ChangeLog |    6 ++++++
 PKGBUILD  |   11 ++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-04-05 12:56:36 UTC (rev 75992)
+++ ChangeLog	2010-04-05 15:10:34 UTC (rev 75993)
@@ -1,3 +1,9 @@
+2010-04-04 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.2.0.9-2 :
+	- rebuild for icu 4.4
+	- use internal redland. system one is still too broken
+
 2010-03-26 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.2.0.9-1 :

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-05 12:56:36 UTC (rev 75992)
+++ PKGBUILD	2010-04-05 15:10:34 UTC (rev 75993)
@@ -4,7 +4,7 @@
 pkgname=go-openoffice
 _GOver=3.2.0.9 # = post OOo 3.2.0 final bugfix
 pkgver=${_GOver}
-pkgrel=1
+pkgrel=2
 pkgdesc="OpenOffice.org - go-oo.org enhanced version of SUN's office suite"
 arch=('i686' 'x86_64')
 _go_tree="OOO320"
@@ -12,10 +12,10 @@
 license=('LGPL3')
 url="http://go-oo.org/"
 install=${pkgname}.install
-depends=("curl>=7.19.6" "hunspell>=1.2.8" "python>=2.6.4" 'libwpd' 'redland>=1.0.10' 
+depends=("curl>=7.19.6" "hunspell>=1.2.8" "python>=2.6.4" 'libwpd'
          'libxaw' "neon>=0.28.6" "icu>=4.2.1" 'hsqldb-java' 'libxslt' 'libxtst' 'lpsolve'
 	  'beanshell' 'saxon' 'vigra' 'hyphen' 'libmspack' 'libldap' 'gtk2' 'lucene'
-	 'hicolor-icon-theme' 'shared-mime-info' 'desktop-file-utils') #   'libmythes' 'libgraphite' 
+	 'hicolor-icon-theme' 'shared-mime-info' 'desktop-file-utils') #   'libmythes' 'libgraphite' 'redland>=1.0.10'
 optdepends=('java-runtime:	adds java support'
             'libcups:		adds printing support'
             'gconf:		adds additional gnome support'
@@ -54,7 +54,7 @@
 	system-redland.patch
 	localize-ooo.diff)
 #options=('!distcc' '!ccache' '!makeflags')
-options=('!makeflags')
+#options=('!makeflags')
 noextract=(ooo-cli-prebuilt-3.2.tar.bz2 cairo-1.4.10.tar.gz mdbtools-0.6pre1.tar.gz extras-3.tar.bz2 biblio.tar.bz2 unowinreg.dll 
            scsolver.2008-10-30.tar.bz2 libwpd-0.8.14.tar.gz libwps-0.1.2.tar.gz libwpg-0.1.3.tar.gz ooo_oxygen_images-2009-06-17.tar.gz)
 
@@ -86,7 +86,7 @@
 	patch -Np0 -i ${srcdir}/localize-ooo.diff || return 1
 
 	# fix bugs with recent system redland
-	patch -Np1 -i ${srcdir}/system-redland.patch || return 1
+#	patch -Np1 -i ${srcdir}/system-redland.patch || return 1
 
 	# hotfixes not yet upstream
 #	cp ${srcdir}/*.diff ${srcdir}/ooo-build-${_GOver}/patches/hotfixes/
@@ -140,6 +140,7 @@
 		--with-system-vigra\
 		--with-system-altlinuxhyph\
 		--with-system-lpsolve\
+		--without-system-redland \
 		$EXTRAOPTS || return 1
 
 #		--with-system-mythes\