[arch-commits] CVS update of unstable/office/openoffice-base-devel (ChangeLog PKGBUILD)

[andyrtr at archlinux.org]

    Date: Friday, November 2, 2007 @ 04:14:20
  Author: andyrtr
    Path: /home/cvs-unstable/unstable/office/openoffice-base-devel

Modified: ChangeLog (1.1 -> 1.2) PKGBUILD (1.4 -> 1.5)

upgpkg: openoffice-base-devel 2.4_src680_m235-1
disabled smp build; readded --without-stlport4


-----------+
 ChangeLog |    2 ++
 PKGBUILD  |   28 +++++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)


Index: unstable/office/openoffice-base-devel/ChangeLog
diff -u unstable/office/openoffice-base-devel/ChangeLog:1.1 unstable/office/openoffice-base-devel/ChangeLog:1.2
--- unstable/office/openoffice-base-devel/ChangeLog:1.1	Thu Nov  1 00:52:52 2007
+++ unstable/office/openoffice-base-devel/ChangeLog	Fri Nov  2 04:14:19 2007
@@ -1,4 +1,6 @@
 openoffice-base-devel - 2.4_src680_m235-1
+- try --without-stlport4 again on i686
+- build failure in testtools due to smp on i686 -> -P1
 - switched to build with internal icu due to 
   http://www.openoffice.org/issues/show_bug.cgi?id=83146
 - added pstoedit depenency to fix #8390
Index: unstable/office/openoffice-base-devel/PKGBUILD
diff -u unstable/office/openoffice-base-devel/PKGBUILD:1.4 unstable/office/openoffice-base-devel/PKGBUILD:1.5
--- unstable/office/openoffice-base-devel/PKGBUILD:1.4	Thu Nov  1 00:26:06 2007
+++ unstable/office/openoffice-base-devel/PKGBUILD	Fri Nov  2 04:14:19 2007
@@ -80,11 +80,31 @@
 	soffice-detect-mozilla-certificates_oog_m5.diff
 	ooo82608.vcl.gtkbadfree_oog_m5.diff
 	detect_db46_src233.diff
-	buildfix-configure-system-icu.diff
 	#http://oooconv.free.fr/fontooo/FontOOo.sxw
 	FontOOo_1.7.1.sxw # from http://www.openoffice.org/issues/show_bug.cgi?id=81102
 	awt_x86_64.diff)
 options=('!distcc' '!ccache' '!strip')
+md5sums=('20cd5520c2dc7eaee3a3e39c2d3c2b43'
+         '2484ed5f462d12b309e23739611959fe'
+         '8984eb3ed21e3bbd0f7fc1d17022751d'
+         '72dba5b4cd94d4439e06f75769402c6f'
+         'd9475c3aaf879c294bd9bc692071bd41'
+         '0faab33566196ddc9c405d68cf614663'
+         '39e4c1b1e864b22ee4650b2bff44c695'
+         'd00bba7046fe64b20f9d1884203a34bf'
+         'a411c3dd9751a7b9cc6a327992d44026'
+         '753a6f760eed98764ac6432878c4935d'
+         'e68ae258f3adb37022d649a99ce00e01'
+         '509697a7da6508ac9377b7750a57bfc4'
+         '4c76c07e867d51c416ea258220a90a6a'
+         '135f1b3c837435de504c84e4db9dc4f7'
+         '7fadadecaf511bb118bc1b657192520a'
+         'a8b96e9d0ce92a8f6690f277b1cfacc9'
+         '4271702d6e9e912b663d3e2d9b8a17e8'
+         '1cc4e58f28093f179378dc3bd69986af'
+         'cd8ff2b60ee86f576a1e04bac8dcb51b'
+         '1fc1ca5205730655eab2d2e119aa06fe'
+         '83bb5e235c4e4062eed404829d760c14')
 
 
 # see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
@@ -110,8 +130,6 @@
 	patch -Np0 -i ../detect_db46_src233.diff || return 1
 	# allows internal Berkely db to build without java bindings.
 	patch -Np0 -i ../internal-db-no-java_src235.diff || return 1
-	# allows to build against new icu
-#	patch -Np0 -i ../buildfix-configure-system-icu.diff || return 1
 
 	# allows xmlsec to be able to read the format of the digital certificates.
 	patch -Np0 -i ../libxmlsec-findcerts_oog_m5.diff || return 1
@@ -140,7 +158,7 @@
 
 	# arch related fixes & configure options
 	if [ "$CARCH" = "i686" ]; then
-	  EXTRAOPTS="--with-arch=x86 "
+	  EXTRAOPTS="--with-arch=x86 --without-stlport4"
 	fi
 
 	if [ "$CARCH" = "x86_64" ]; then
@@ -237,7 +255,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 -P6 --all || return 1
+	build.pl -P1 --all || return 1
 	cd ..
 
 	# install binaries