Sat Jun 21 04:02:26 UTC 2014

6 files changed, 73 insertions, 42 deletions

diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index c17ab4573..98f4f1887 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 215150 2014-06-14 19:16:57Z andyrtr $
+# $Id: PKGBUILD 215313 2014-06-20 13:57:37Z bpiotrowski $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
@@ -18,9 +18,9 @@ pkgname=('libreoffice-common'
 	'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 @@ makedepends=( # makedepends
 # 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 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc}
 	${_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 @@ noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
 	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 @@ md5sums=('698a482f0cacd8b5eba9865fdd8a5403'
          '504af523f5d1a5590bbeb6a4b55e8a97'
          '07d2bf5ad839a394cca008b3ec6e7bb1'
          '4195735a80876ae812fca5736b50192a'
-         'e7e4b3e70e99e5cba8f8dfcacf3b0d87'
-         'fa2109339289663cb8ea7cf27cc22f4e'
-         '07f53a9f899e533f9393e48b5d429165'
-         '2a296750092824cd5631e7b529433b28')
+         'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
 
 prepare() {
 
@@ -214,14 +208,6 @@ prepare() {
     # 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
diff --git a/extra/libva/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch b/extra/libva/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch
new file mode 100644
index 000000000..6c1df31f1
--- /dev/null
+++ b/extra/libva/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch
@@ -0,0 +1,38 @@
+From d4988142a3f2256e38c5c5cdcdfc1b4f5f3c1ea9 Mon Sep 17 00:00:00 2001
+From: "Xiang, Haihao" <haihao.xiang@intel.com>
+Date: Thu, 18 Jul 2013 13:13:31 +0800
+Subject: [PATCH] va: release VADisplayContext at the end of vaTerminate()
+
+Otherwise it will result in invalid reading in va_TraceEnd()
+
+Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
+---
+ va/va.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/va/va.c b/va/va.c
+index 6cb17ef..0ba595b 100644
+--- a/va/va.c
++++ b/va/va.c
+@@ -515,15 +515,15 @@ VAStatus vaTerminate (
+   free(old_ctx->vtable_vpp);
+   old_ctx->vtable_vpp = NULL;
+ 
+-  if (VA_STATUS_SUCCESS == vaStatus)
+-      pDisplayContext->vaDestroy(pDisplayContext);
+-
+   VA_TRACE_LOG(va_TraceTerminate, dpy);
+ 
+   va_TraceEnd(dpy);
+ 
+   va_FoolEnd(dpy);
+ 
++  if (VA_STATUS_SUCCESS == vaStatus)
++      pDisplayContext->vaDestroy(pDisplayContext);
++
+   return vaStatus;
+ }
+ 
+-- 
+2.0.0
+
diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD
index c8417e1ff..a7f38613a 100644
--- a/extra/libva/PKGBUILD
+++ b/extra/libva/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 212230 2014-05-11 10:00:41Z bpiotrowski $
+# $Id: PKGBUILD 215317 2014-06-20 15:19:34Z bpiotrowski $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 
 pkgname=libva
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Video Acceleration (VA) API for Linux'
 arch=('i686' 'x86_64')
 url='http://freedesktop.org/wiki/Software/vaapi'
@@ -13,8 +13,15 @@ depends=('libgl' 'libdrm' 'libxfixes')
 makedepends=('mesa')
 optdepends=('libva-vdpau-driver: vdpau back-end for nvidia'
             'libva-intel-driver: back-end for intel cards')
-source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('eb4db967f068854444b597071c66b480')
+source=(http://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2
+        0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch)
+md5sums=('eb4db967f068854444b597071c66b480'
+         'e564ae7c20962c821ac2b5cb1693e1a2')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch
+}
 
 build() {
   cd $pkgname-$pkgver
@@ -25,5 +32,5 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-  install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
diff --git a/extra/phonon-gstreamer/PKGBUILD b/extra/phonon-gstreamer/PKGBUILD
index 0722ad188..413a1f03e 100644
--- a/extra/phonon-gstreamer/PKGBUILD
+++ b/extra/phonon-gstreamer/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 211973 2014-05-02 12:02:18Z andrea $
+# $Id: PKGBUILD 215326 2014-06-20 19:31:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=phonon-gstreamer
 pkgname=('phonon-qt4-gstreamer' 'phonon-qt5-gstreamer')
-pkgver=4.7.1
+pkgver=4.7.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://phonon.kde.org/'
 license=('LGPL')
 makedepends=('gstreamer0.10-base-plugins' 'cmake' 'automoc4' 'phonon-qt4' 'phonon-qt5')
-source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/phonon-backend-gstreamer-${pkgver}.tar.xz")
-md5sums=('7c0cfab4ec0bbe1f201503e6ccc7290a')
+source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/src/phonon-backend-gstreamer-${pkgver}.tar.xz")
+md5sums=('d437478c3ef2da2cda0da0abda20ef11')
 
 prepare() {
   mkdir build-qt4
diff --git a/extra/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD
index e522e2066..7c873bb23 100644
--- a/extra/phonon-vlc/PKGBUILD
+++ b/extra/phonon-vlc/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 211971 2014-05-02 11:48:12Z andrea $
+# $Id: PKGBUILD 215322 2014-06-20 19:29:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=phonon-vlc
 pkgname=('phonon-qt4-vlc' 'phonon-qt5-vlc')
-pkgver=0.7.1
+pkgver=0.7.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://phonon.kde.org/'
 license=('LGPL')
 makedepends=('vlc' 'cmake' 'automoc4' 'phonon-qt4' 'phonon-qt5')
-source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/phonon-backend-vlc-${pkgver}.tar.xz")
-md5sums=('3c41a3d141d40cedd2819676cdca5ea4')
+source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/src/phonon-backend-vlc-${pkgver}.tar.xz")
+md5sums=('10f26393df35c01f0526807980eadb1c')
 
 prepare() {
   mkdir build-qt4
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD
index 934dd9c77..e45f196a6 100644
--- a/extra/phonon/PKGBUILD
+++ b/extra/phonon/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 211976 2014-05-02 12:06:54Z andrea $
+# $Id: PKGBUILD 215324 2014-06-20 19:30:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=phonon
 pkgname=('phonon-qt4' 'phonon-qt5')
-pkgver=4.7.1
-pkgrel=2
+pkgver=4.7.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://phonon.kde.org/'
 license=('LGPL')
 makedepends=('cmake' 'automoc4' 'libpulse' 'libqzeitgeist' 'qt5-base' 'qt5-tools' 'qt5-quick1')
 options=('!emptydirs')
 source=("http://download.kde.org/stable/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz")
-md5sums=('0935e1c00440a03e3032860030398665')
+md5sums=('a8b722a11a301fc2cda7ff8228209531')
 
 prepare() {
   mkdir build