[arch-commits] Commit in libreoffice/trunk (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Saturday, April 23, 2011 @ 03:03:05
  Author: andyrtr
Revision: 120374

prepare 3.4 branch builds; add more STLport source for i686 builds

Modified:
  libreoffice/trunk/PKGBUILD

----------+
 PKGBUILD |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-22 23:37:14 UTC (rev 120373)
+++ PKGBUILD	2011-04-23 07:03:05 UTC (rev 120374)
@@ -57,6 +57,7 @@
 	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
 	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
 	${_additional_source_url}/7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
 	http://download.go-oo.org/src/7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
 	http://download.go-oo.org/src/9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2
@@ -96,6 +97,8 @@
 	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
 	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+	7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
 	451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
 	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
 	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2)
@@ -142,6 +145,7 @@
          'ace6ab49184e329db254e454a010f56d'
          'db60e4fde8dd6d6807523deb71ee34dc'
          'ba2930200c9f019c2d93a8c88c651a0f'
+         '18f577b374d60b3c760a3a3350407632'
          '7376930b0d3f3d77a685d94c4a3acda8'
          '7a0dcb3fe1e8c7229ab4fb868b7325e6'
          '9e436bff44c60dc8b97cba0c7fc11a5c'
@@ -157,7 +161,7 @@
 
 build() {
 
-	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
+	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
 	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh
 	[ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
 	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
@@ -196,13 +200,13 @@
 #	
 	# http://wiki.documentfoundation.org/Development/How_to_build/Configure_options
 
-	if [ "$CARCH" = "x86_64" ]; then
-	      EXTRAOPTS="--without-stlport"
-	 else 
-	      EXTRAOPTS="--with-stlport" # --without-system-boost"
-	      # # avoid problems with ixion for now
+#	if [ "$CARCH" = "x86_64" ]; then
+#	      EXTRAOPTS="--without-stlport"
+#	 else 
+#	      EXTRAOPTS="--with-stlport" # --without-system-boost"
+#	      # # avoid problems with ixion for now
 #	      sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
-	fi
+#	fi
 
 	autoconf -v -f
 	./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" \