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

[andyrtr at archlinux.org]

    Date: Sunday, December 12, 2010 @ 13:07:28
  Author: andyrtr
Revision: 102884

upgpkg: openoffice-base-beta 3.3.0_ooo330_m17-1
new upstream release OOO330_m17; finally managed to get it built again; use autoconf instead of autoreconf to fix configure's  pkg-config detections

Modified:
  openoffice-base-beta/trunk/PKGBUILD

----------+
 PKGBUILD |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-12 17:43:16 UTC (rev 102883)
+++ PKGBUILD	2010-12-12 18:07:28 UTC (rev 102884)
@@ -15,10 +15,11 @@
              '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" "python2>=2.7" 'libwpd' 'libxaw' "neon>=0.28.6"
-             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.2.1" 'libxslt'
+             "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6"
+             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt'
              'redland>=1.0.11.99' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'
              'hicolor-icon-theme' 'desktop-file-utils' 'gtk2') # keep gtk2 for install script
+	     #'libwpd' - currently broken since libwpd 0.9 bump - http://www.openoffice.org/issues/show_bug.cgi?id=116036
     	     # 'saxon' 
 _additional_source_url=http://hg.services.openoffice.org/binaries
 source=(${_OO_milestone}.tar.xz
@@ -276,10 +277,7 @@
 	export PYTHON=python2
 
 	# Need to recreate the configure script because of patches
-	#autoreconf -v
-	# fix configure not detecting .pc files properly
-#	export PKG_CONFIG=/usr/bin/pkg-config
-	autoconf # 
+	autoconf
 
 	./configure --with-build-version="${pkgver} ArchLinux build-${pkgrel} (${_OO_milestone})" \
 	--with-vendor="ArchLinux"\
@@ -372,10 +370,11 @@
 
  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" "python2>=2.7" 'libwpd' 'libxaw' "neon>=0.28.6"
-          'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.2.1" 'libxslt'
+ depends=("curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6"
+          'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt'
 	  'redland' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'
 	  'hicolor-icon-theme' 'desktop-file-utils' 'gtk2') # keep gtk2 for install script
+	  # 'libwpd'
 	  # 'saxon' 
  optdepends=('java-runtime:	adds java support'
              'libcups:		adds printing support'