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

Tue Nov 1 04:17:55 UTC 2011

Date: Tuesday, November 1, 2011 @ 00:17:55
  Author: andyrtr
Revision: 141638

prepare next release

Modified:
  libreoffice/trunk/PKGBUILD

----------+
 PKGBUILD |   45 ++++++++++++---------------------------------
 1 file changed, 12 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2011-11-01 02:51:18 UTC (rev 141637)
+++ PKGBUILD	2011-11-01 04:17:55 UTC (rev 141638)
@@ -44,7 +44,7 @@
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' #'boost' - we use internal one for now that has some gcc4.6 fixes.
+             'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' 'boost' #- we use internal one for now that has some gcc4.6 fixes.
              'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
              'beanshell'  'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick'
              'mesa' 'gstreamer0.10-base' 'java-environment'
@@ -53,9 +53,9 @@
              "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
              'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt'
              'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' # keep gtk2 for install script
+             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' # keep gtk2 for install script
 	     'ttf-dejavu') # to satisfy regression tests
-	     # translate-toolkit - todo move them to extra to allow --with-system-foo builds
+
 # http://download.documentfoundation.org/mirrors/all.html
 # http://wiki.documentfoundation.org/Mirrors
 
@@ -88,9 +88,8 @@
 	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
 	http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
 	http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
-	http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+	#http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
@@ -104,15 +103,8 @@
 	buildfix_boost.diff
 	buildfix_ct2n.diff
 	vbahelper.visibility.patch
-	scp2-more-reasonable-file-access-rights.diff
-	java-detection.diff::http://cgit.freedesktop.org/libreoffice/libs-core/patch/?id=14bc9100d36eae3999f1623efce8ee84091da842
-	oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1
-	poppler-check.diff::http://cgit.freedesktop.org/libreoffice/bootstrap/patch/?id=72a5f87cb3f0a367f1cd6a5cc15101acc83396fe
-	pdfimport.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=53e66aea4c1b3617363fd138a7903190d964da6b
-	poppler-buildfix.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=9540db43f3f1b11d3407a45aefda235d7e78f76b
-	build-without-glib-poppler-bindings.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=a9cc06fa45d4cd9547f40a9869c64c912b821b42)
+	scp2-more-reasonable-file-access-rights.diff)
 noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
 	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -148,7 +140,8 @@
 	dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
 	b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
 	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
-	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2)
+	#f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+	)
 md5sums=('e72c2e635a7d135b023a7f6bb5702d68'
          'ceff417262fb7126d88ae007e062e3ce'
          '1e7cd7836b147101802c8f89fee67675'
@@ -193,9 +186,7 @@
          '18f577b374d60b3c760a3a3350407632'
          '0ff7d225d087793c8c2c680d77aac3e7'
          '185d60944ea767075d27247c3162b3bc'
-         'b4cae0700aa1c2aef7eb7f345365e6f1'
          '90401bca927835b6fbae4a707ed187c8'
-         'f02578f5218f217a9f20e9c30e119c6a'
          '451ccf439a36a568653b024534669971'
          '7e7efc5d4a03126bb9ae3ae9aa2c4e87'
          '41c9b65ad60af4b3255bbecdfef11736'
@@ -209,18 +200,12 @@
          'bc228237108cab7745897a9f466b6d39'
          'eee273f501ff45dc5f1365e78c6d57c0'
          '43b145db28e6c0d73578ae6fd35e510d'
-         '37638431e7e40baf2e47966ebb9bc0e9'
-         'ca6032e86229ae798f3744ae244f5bfe'
-         '3c6c62e77c30649a3dfe73512947cc9a'
-         '64497be966802e62ffe3282d3facf7b7'
-         '89ff871e77e10357a976fe9d1ab3a65a'
-         'c4cb0d7f2602396a3f4cac55b8a4e308'
-         'b8f1fb7f3902d22aeaa2575c6b08a62c')
+         '37638431e7e40baf2e47966ebb9bc0e9')
 
 build() {
 
 	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
-	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh || . /etc/profile.d/jdk7-openjdk.sh
+	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
 	[ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
 	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
 
@@ -241,16 +226,10 @@
 	cd ${srcdir}/build
 
 	# buildfixes & bugfixes
-	patch -Np1 -i ${srcdir}/buildfix_boost.diff
+	#patch -Np1 -i ${srcdir}/buildfix_boost.diff
 	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
 	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
 	patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
-	patch -Np1 -i ${srcdir}/java-detection.diff
-	patch -Np1 -i ${srcdir}/oracle-recognition.diff
-	patch -Np1 -i ${srcdir}/poppler-check.diff
-	patch -Np1 -i ${srcdir}/pdfimport.diff
-	patch -Np1 -i ${srcdir}/poppler-buildfix.diff
-	patch -Np1 -i ${srcdir}/build-without-glib-poppler-bindings.diff
 	
 	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
@@ -279,7 +258,7 @@
 #	fi
 
 	# needed for 0003-distro-install-fix-en-US-only-installation.patch
-	autoconf -v -f
+	autoconf -f
 
 	# non-SMP test build
 #	export MAKEFLAGS="-j1"
@@ -348,7 +327,7 @@
 		--with-external-libtextcat-data \
 		--with-openldap\
 		--with-ant-home="/usr/share/java/apache-ant"\
-		--without-system-boost\
+		--with-system-boost\
 		--with-system-cairo\
 		--with-system-libs\
 		--with-system-mozilla\


