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

[Bartłomiej Piotrowski]

    Date: Friday, June 20, 2014 @ 15:57:22
  Author: bpiotrowski
Revision: 215312

upgpkg: libreoffice 4.2.5-1

new upstream release

Modified:
  libreoffice/trunk/PKGBUILD

----------+
 PKGBUILD |   34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-20 00:40:38 UTC (rev 215311)
+++ PKGBUILD	2014-06-20 13:57:22 UTC (rev 215312)
@@ -18,9 +18,9 @@
 	'libreoffice-postgresql-connector'
 	'libreoffice-extension-wiki-publisher'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=4.2.4.2
-pkgver=4.2.4
-pkgrel=2
+_LOver=4.2.5.2
+pkgver=4.2.5
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -48,8 +48,8 @@
 # http://download.documentfoundation.org/mirrors/all.html
 # http://wiki.documentfoundation.org/Mirrors
 
-#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
+_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
+#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
 _additional_source_url="http://dev-www.libreoffice.org/src"
 _additional_source_url2="http://dev-www.libreoffice.org/extern"
 source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc}
@@ -95,10 +95,7 @@
 	${_additional_source_url}/libabw-0.0.2.tar.bz2
 	${_additional_source_url}/language-subtag-registry-2014-03-27.tar.bz2 
 	make-pyuno-work-with-system-wide-module-install.diff
-	libreoffice-common.sh libreoffice-common.csh
-	prevent_KDE_Qt_from_interfering_with_the_session_manager.diff
-	icu53.diff
-	icu53_crashfix.diff)
+	libreoffice-common.sh libreoffice-common.csh)
 noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -140,11 +137,11 @@
 	libe-book-0.0.3.tar.bz2
 	libabw-0.0.2.tar.bz2
 	language-subtag-registry-2014-03-27.tar.bz2)
-md5sums=('698a482f0cacd8b5eba9865fdd8a5403'
+md5sums=('eb44cc33bb9331db4c1b6ae0b03fff9f'
          'SKIP'
-         'a0ed88ac1758d2f87687fcf4bb7c9432'
+         '867c10167b05ba19162b78032405524b'
          'SKIP'
-         '3db05930dc7c694d2cf58875b3245c2e'
+         '6bcd61a3f977f78c64b1eaa13a40524c'
          'SKIP'
          '15cb8c0803064faef0c4ddf5bc5ca279'
          '1f24ab1d39f4a51faf22244c94a6203f'
@@ -189,10 +186,7 @@
          '504af523f5d1a5590bbeb6a4b55e8a97'
          '07d2bf5ad839a394cca008b3ec6e7bb1'
          '4195735a80876ae812fca5736b50192a'
-         'e7e4b3e70e99e5cba8f8dfcacf3b0d87'
-         'fa2109339289663cb8ea7cf27cc22f4e'
-         '07f53a9f899e533f9393e48b5d429165'
-         '2a296750092824cd5631e7b529433b28')
+         'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
 
 prepare() {
 
@@ -214,14 +208,6 @@
     # fix not upstreamable pyuno paths - patch taken from Debian
     patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
     
-    # fix some startup issues with kde4 integration
-    # https://bugs.archlinux.org/task/39819 - https://bugs.freedesktop.org/show_bug.cgi?id=77128
-    patch -Np1 -i ${srcdir}/prevent_KDE_Qt_from_interfering_with_the_session_manager.diff
-
-    # upstream fixes for icu 53
-    patch -Np1 -i ${srcdir}/icu53.diff
-    patch -Np1 -i ${srcdir}/icu53_crashfix.diff
-
 	#use the CFLAGS but remove the LibO overridden ones
 	for i in $CFLAGS; do
 		case "$i" in