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

[andyrtr at archlinux.org]

    Date: Tuesday, May 29, 2012 @ 15:20:54
  Author: andyrtr
Revision: 160067

upgpkg: libreoffice 3.5.4-1

upstream update 3.5.4

Modified:
  libreoffice/trunk/PKGBUILD

----------+
 PKGBUILD |   18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-29 18:46:42 UTC (rev 160066)
+++ PKGBUILD	2012-05-29 19:20:54 UTC (rev 160067)
@@ -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.3.2
-pkgver=3.5.3
-pkgrel=3
+_LOver=3.5.4.2
+pkgver=3.5.4
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -78,9 +78,7 @@
 	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e
 	smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810
-	poppler_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=ac68934592ec7d838cf5c22744be8d97aa4a1a47
 	fix_broken_hebrew_wordwrapping.diff
-	buildfix_icu49.diff
 	libreoffice-common.sh libreoffice-common.csh)
 noextract=(2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2
 	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
@@ -110,9 +108,9 @@
 	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
 	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('d22cd79e7463ac4caf0a4b47d78a82ac'
-         '3455f3f523d739aa391b5a5bf04ff958'
-         '945fbf7888c464f4e1cf7282d370b257'
+md5sums=('61afc900785dd7d071b96d9ab0af46f3'
+         'd2e7414a60eacafef45fbc4bc1a8ccb3'
+         '545d1608da2cc736be5c8bf941adbbfb'
          '18f577b374d60b3c760a3a3350407632'
          '2fa6028324347860e684e75310818d43'
          '1f24ab1d39f4a51faf22244c94a6203f'
@@ -143,9 +141,7 @@
          '185d60944ea767075d27247c3162b3bc'
          '60ce5dc9bd098f95c2e621a930c98dd9'
          '661a52a02a31b3afbe4b3b3146061afd'
-         '72ba8d57cefdc25a6f1bc845edfd4d78'
          '025d9b17d9eb90dc282c5c1289a666aa'
-         '9734ea20c9f67e1b6e1c5a1247fbd3ff'
          'f0e72d0e1bc93a50a3aa9d31350b156c'
          '867c682b45f477f916786e00c45d7ab7')
 
@@ -171,8 +167,6 @@
 	# one late fix to solve make distro-pack-install issue
 	patch -Np1 -i ${srcdir}/gmake_install.diff
 	patch -Np1 -i ${srcdir}/smp_buildfix.diff
-	#patch -Np0 -i ${srcdir}/buildfix_icu49.diff
-	patch -Np1 -i ${srcdir}/poppler_buildfix.diff
 	# https://bugs.archlinux.org/task/29854 based on 3.6/master patch http://cgit.freedesktop.org/libreoffice/core/patch/?id=20c24114143d6d38774b56a142fd4ae05094308e
 	patch -Np1 -i ${srcdir}/fix_broken_hebrew_wordwrapping.diff