[arch-commits] CVS update of extra/office/openoffice-base (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Saturday, July 7, 2007 @ 19:56:46
  Author: andyrtr
    Path: /home/cvs-extra/extra/office/openoffice-base

Modified: PKGBUILD (1.43 -> 1.44)

rebuild against latest gcc-gcj/readded pppds


----------+
 PKGBUILD |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)


Index: extra/office/openoffice-base/PKGBUILD
diff -u extra/office/openoffice-base/PKGBUILD:1.43 extra/office/openoffice-base/PKGBUILD:1.44
--- extra/office/openoffice-base/PKGBUILD:1.43	Fri Jun 22 16:39:57 2007
+++ extra/office/openoffice-base/PKGBUILD	Sat Jul  7 19:56:46 2007
@@ -3,7 +3,7 @@
 
 pkgname=openoffice-base
 pkgver=2.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=(i686 x86_64)
 _OO_milestone=OOF680_m18
@@ -60,7 +60,7 @@
 	buildfix-without-stlport.diff
 	remove-broken-wizards.diff
 	openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
-	jvmfwk-gij-paths.diff
+	jvmfwk-gij-paths-03.diff
 	helpcontent2-no-java.diff
 	no-db.jar-v05.diff
 	bean-gcj-bug-workaround.diff
@@ -97,7 +97,7 @@
          '8810538499f279cb5cf8aae48056dda8'
          'd0a788a9d2f99d435f485a7f10a79d06'
          '45a8a334a5079bbc2bcb18723105dfcc'
-         'a64f079b79f0e81d8b2897c75e7905fe'
+         '16fd0652748039de238dd3374b364d0f'
          '1b13116d02fd2b008b07f0640fcd95f2'
          '8338bd9ee02a85b16454cd0ed5768776'
          '1c25839152c1ce4786afe2dcf1048fb3'
@@ -138,7 +138,7 @@
 	# make it build in smp mode
 	patch -Np1 -i ../openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch || return 1
 	# gcj build fix
-	patch -Np0 -i ../jvmfwk-gij-paths.diff || return 1
+	patch -Np0 -i ../jvmfwk-gij-paths-03.diff || return 1
 	# make use of C++ for helpcontent, java no more needed for it
 	patch -Np0 -i ../helpcontent2-no-java.diff || return 1
 	# fix for --with-system-db
@@ -205,8 +205,6 @@
 	  EXTRAOPTS="--with-arch=x86_64"   #" --without-stlport4 "
 	  # some new 64bit fixes
 	  patch -Np1 -i ../workspace.sixtyfour11.patch || return 1
-	  # FIXME: workaround for qadevOOo build failure
-	  export ANT_OPTS="-Xmx512m"
 	  
           # fixes to build with SUN jdk/jre
           # http://qa.openoffice.org/issues/show_bug.cgi?id=74749
@@ -268,7 +266,6 @@
 	--without-nas\
 	--with-xulrunner\
 	--without-docdir\
-	--without-ppds\
 	--without-afms\
 	--without-myspell-dicts\
 	--with-jdk-home=${JAVA_HOME} \
@@ -285,6 +282,7 @@
 	--with-gcc-speedup=ccache \
 	 $EXTRAOPTS || return 1
 
+	#--without-ppds\
 	#--enable-gcjaot\
 	
 	cd ..
@@ -300,7 +298,7 @@
 
 	# to compile with SMP add -P2 or above, remove any -Px if your cou has only one core or if you want to fix it for non smp build
 	cd instsetoo_native
-	build.pl -P2 --all || return 1
+	build.pl -P8 --all || return 1
 	cd ..
 
 	# install binaries