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

[andyrtr at archlinux.org]

    Date: Sunday, June 24, 2012 @ 11:41:28
  Author: andyrtr
Revision: 162257

prepare 3.6 release - build went fine with system lucene and smp; prepare next stable release 3.5.5rc1 back after poppler rebuild

Modified:
  libreoffice/trunk/PKGBUILD
  libreoffice/trunk/PKGBUILD.36

-------------+
 PKGBUILD    |   20 +++++++++-----------
 PKGBUILD.36 |   14 +++++---------
 2 files changed, 14 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-24 14:30:07 UTC (rev 162256)
+++ PKGBUILD	2012-06-24 15:41:28 UTC (rev 162257)
@@ -22,9 +22,9 @@
 	'libreoffice-scripting-beanshell'
 	'libreoffice-scripting-javascript'
 	'libreoffice-extension-scripting-python') # svn up -r 142692 (last one with all extensions built
-_LOver=3.5.4.2
-pkgver=3.5.4
-pkgrel=2
+_LOver=3.5.5.1
+pkgver=3.5.5rc1
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -49,8 +49,7 @@
 _additional_source_url="http://dev-www.libreoffice.org/src"
 source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
 	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	${_additional_source_url}/2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2
-#	${_additional_source_url}/90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
+	${_additional_source_url}/90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -81,8 +80,7 @@
 	smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810
 	fix_broken_hebrew_wordwrapping.diff
 	libreoffice-common.sh libreoffice-common.csh)
-noextract=(2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2
-#	90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
+noextract=(90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
 	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
@@ -110,11 +108,11 @@
 	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
 	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('61afc900785dd7d071b96d9ab0af46f3'
-         'd2e7414a60eacafef45fbc4bc1a8ccb3'
-         '545d1608da2cc736be5c8bf941adbbfb'
+md5sums=('7f68071451e13d3f8d1f71d09a7203d4'
+         '1d05f3f8dfbfa4f77763759f407af18e'
+         '4981bb46cb5f1861d43ea2932dd7de6c'
          '18f577b374d60b3c760a3a3350407632'
-         '2fa6028324347860e684e75310818d43'
+         '90010e213dd25648e70f0cc12f8fed55'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
          '798b2ffdc8bcfe7bca2cf92b62caf685'

Modified: PKGBUILD.36
===================================================================
--- PKGBUILD.36	2012-06-24 14:30:07 UTC (rev 162256)
+++ PKGBUILD.36	2012-06-24 15:41:28 UTC (rev 162257)
@@ -32,7 +32,7 @@
              'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost'
              'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit'
              'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
-             'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen'
+             'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene'
               #'saxon' - currently broken 
              # the runtime dependencies
              "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
@@ -50,7 +50,6 @@
 _additional_source_url2="http://dev-www.libreoffice.org/extern"
 source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
 	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	${_additional_source_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
 	${_additional_source_url}/90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -83,7 +82,6 @@
 	libreoffice-common.sh libreoffice-common.csh)
 noextract=(90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
 	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
@@ -115,7 +113,6 @@
          '3368bc1adfa9e7d6d6f3ce2cee9e164e'
          '7191e46a3f48ad7a7d5a21e985790e6a'
          '18f577b374d60b3c760a3a3350407632'
-         '48d647fbd8ef8889e5a7f422c1bfda94'
          '90010e213dd25648e70f0cc12f8fed55'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
@@ -180,12 +177,11 @@
 	# python2 fix
 	export PYTHON=python2
 
-	autoconf -f
+	#autoconf -f
 
 	# non-SMP test build
-	export MAKEFLAGS="-j1"
-	#./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
-#	touch autogen.lastrun
+	#export MAKEFLAGS="-j1"
+#	./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
 	./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
 		--with-unix-wrapper="libreoffice" \
 		--enable-split-app-modules \
@@ -247,7 +243,7 @@
 		--with-system-headers\
 		--with-system-hsqldb \
 		--with-alloc=system\
-		--without-system-clucene\
+		--with-system-clucene\
 		--with-java-target-version=1.5 \
 		$EXTRAOPTS