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

[andyrtr at archlinux.org]

    Date: Sunday, June 24, 2012 @ 06:46:17
  Author: andyrtr
Revision: 162246

upgpkg: libreoffice 3.5.4-2

poppler 0.20.1 rebuild

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

-------------+
 PKGBUILD    |   22 ++++++++++++----------
 PKGBUILD.36 |    6 +++---
 2 files changed, 15 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-24 10:15:48 UTC (rev 162245)
+++ PKGBUILD	2012-06-24 10:46:17 UTC (rev 162246)
@@ -22,15 +22,15 @@
 	'libreoffice-scripting-beanshell'
 	'libreoffice-scripting-javascript'
 	'libreoffice-extension-scripting-python') # svn up -r 142692 (last one with all extensions built
-_LOver=3.5.5.1
-pkgver=3.5.5rc1
-pkgrel=1
+_LOver=3.5.4.2
+pkgver=3.5.4
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
              'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost'
-             'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit'
+             'apache-ant' 'gperf' 'poppler>=0.20.1' 'kdelibs' 'gconf' 'cppunit'
              'beanshell'  'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
              'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs'
               #'saxon' - currently broken 
@@ -49,7 +49,8 @@
 _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}/90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
+	${_additional_source_url}/2fa6028324347860e684e75310818d43-libvisio-0.0.16.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
@@ -80,7 +81,8 @@
 	smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810
 	fix_broken_hebrew_wordwrapping.diff
 	libreoffice-common.sh libreoffice-common.csh)
-noextract=(90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
+noextract=(2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2
+#	90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
 	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
@@ -108,11 +110,11 @@
 	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
 	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('7f68071451e13d3f8d1f71d09a7203d4'
-         '1d05f3f8dfbfa4f77763759f407af18e'
-         '4981bb46cb5f1861d43ea2932dd7de6c'
+md5sums=('61afc900785dd7d071b96d9ab0af46f3'
+         'd2e7414a60eacafef45fbc4bc1a8ccb3'
+         '545d1608da2cc736be5c8bf941adbbfb'
          '18f577b374d60b3c760a3a3350407632'
-         '90010e213dd25648e70f0cc12f8fed55'
+         '2fa6028324347860e684e75310818d43'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
          '798b2ffdc8bcfe7bca2cf92b62caf685'

Modified: PKGBUILD.36
===================================================================
--- PKGBUILD.36	2012-06-24 10:15:48 UTC (rev 162245)
+++ PKGBUILD.36	2012-06-24 10:46:17 UTC (rev 162246)
@@ -167,7 +167,7 @@
 	ln -s ../libreoffice-translations-$_LOver/translations .
 
 	# buildfixes & bugfixes
-#    patch -Np1 -i ${srcdir}/buildfix.diff
+    patch -Np1 -i ${srcdir}/buildfix.diff
     
 	#use the CFLAGS but remove the LibO overridden ones
 	for i in $CFLAGS; do
@@ -180,10 +180,10 @@
 	# python2 fix
 	export PYTHON=python2
 
-#	autoconf -f
+	autoconf -f
 
 	# non-SMP test build
-#	export MAKEFLAGS="-j1"
+	export MAKEFLAGS="-j1"
 	#./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
 #	touch autogen.lastrun
 	./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \