11 files changed, 107 insertions, 90 deletions
diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD
index b2343ec57..c7795e04e 100644
--- a/extra/gnome-color-manager/PKGBUILD
+++ b/extra/gnome-color-manager/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 213478 2014-05-23 23:41:13Z heftig $
+# $Id: PKGBUILD 216814 2014-07-11 18:24:37Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-color-manager
-pkgver=3.12.2
+pkgver=3.12.3
 pkgrel=1
 pkgdesc="Color profile manager for the GNOME desktop"
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@ install=gnome-color-manager.install
 options=('!emptydirs')
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7f406233c03499c786dac69d54a3b9312f7fd36a6c75e8b9c899cad1588731d0')
+sha256sums=('ce62f9d2d8702547b5083f800a2747cb6c8fd5a04a71e2dc6928166951d1d039')
 
 build(){
   cd $pkgname-$pkgver
diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD
index 18342a9bf..1333ba6bf 100644
--- a/extra/harfbuzz/PKGBUILD
+++ b/extra/harfbuzz/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 215423 2014-06-24 19:18:03Z heftig $
+# $Id: PKGBUILD 216817 2014-07-11 18:35:27Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=(harfbuzz)
 pkgname=(harfbuzz harfbuzz-icu)
-pkgver=0.9.29
+pkgver=0.9.30
 pkgrel=1
 pkgdesc="OpenType text shaping engine"
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@ url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
 license=(MIT)
 makedepends=(glib2 freetype2 graphite cairo icu gobject-introspection)
 source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('601cea38c6fa0cf362dd9042c66cf4db711c5f9390de4ca46d6d2fc3f64de390')
+sha256sums=('fa873f9fe4a5ad4f7beb524475e13a5a8729d7414d2bc64a557c0d5651d58586')
 
 build() {
   cd $pkgbase-$pkgver
@@ -21,6 +21,11 @@ build() {
   make
 }
 
+check() {
+  cd $pkgbase-$pkgver
+  make -k check || :
+}
+
 package_harfbuzz() {
   depends=(glib2 freetype2 graphite)
   optdepends=('cairo: hb-view program')
diff --git a/extra/kdelibs4support/PKGBUILD b/extra/kdelibs4support/PKGBUILD
index 0cff1484c..f0de2f7ed 100644
--- a/extra/kdelibs4support/PKGBUILD
+++ b/extra/kdelibs4support/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 216708 2014-07-08 18:37:28Z andrea $
+# $Id: PKGBUILD 216790 2014-07-11 11:50:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdelibs4support
 pkgver=5.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc='KDE 4 Support'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/frameworks/kdelibs4support'
@@ -13,11 +13,16 @@ makedepends=('extra-cmake-modules' 'kdoctools' 'qt5-tools') # 'networkmanager'
 groups=('kf5-aids')
 replaces=('kde4support')
 conflicts=('kde4support')
-source=("http://download.kde.org/stable/frameworks/${pkgver}/portingAids/${pkgname}-${pkgver}.tar.xz")
-md5sums=('1fe3fc10a31a2c123338c3a8ae82455a')
+source=("http://download.kde.org/stable/frameworks/${pkgver}/portingAids/${pkgname}-${pkgver}.tar.xz"
+        'update-FindGettext.patch')
+md5sums=('1fe3fc10a31a2c123338c3a8ae82455a'
+         'cfde4360628836b039cb614f6641112d')
 
 prepare() {
   mkdir -p build
+
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/update-FindGettext.patch
 }
 
 build() {
diff --git a/extra/kdelibs4support/update-FindGettext.patch b/extra/kdelibs4support/update-FindGettext.patch
new file mode 100644
index 000000000..5647feac2
--- /dev/null
+++ b/extra/kdelibs4support/update-FindGettext.patch
@@ -0,0 +1,37 @@
+From: Alex Merry <alex.merry@kde.org>
+Date: Fri, 04 Jul 2014 10:10:27 +0000
+Subject: Make FindGettext compatible with the one provided by CMake
+X-Git-Url: http://quickgit.kde.org/?p=kdelibs4support.git&a=commitdiff&h=581ee6b370d8b5627196c8d6d8760d3655f6daea
+---
+Make FindGettext compatible with the one provided by CMake
+
+This version will accept the old GETTEXT_PROCESS_PO_FILES() syntax (no
+PO_FILES argument), but will also accept the new syntax required by
+CMake's version of this file. It will also warn when PO_FILES is not
+given.
+
+REVIEW: 119111
+---
+
+
+--- a/cmake/modules/FindGettext.cmake
++++ b/cmake/modules/FindGettext.cmake
+@@ -212,7 +212,16 @@
+       LIST(REMOVE_AT _args 0 1)
+    ENDIF("${_tmp}" STREQUAL "INSTALL_DESTINATION")
+    
+-#    message(STATUS "2 all ${_addToAll} dest ${_installDest} args: ${_args}")
++   LIST(GET _args 0 _tmp)
++   IF("${_tmp}" STREQUAL "PO_FILES")
++      LIST(REMOVE_AT _args 0)
++   ELSE()
++      SET(_deprecation_arg DEPRECATION)
++      IF(CMAKE_VERSION VERSION_LESS 3.0.0)
++         SET(_deprecation_arg AUTHOR_WARNING)
++      ENDIF()
++      MESSAGE(${_deprecation_arg} "GETTEXT_PROCESS_PO_FILES without a PO_FILES argument is deprecated")
++   ENDIF()
+    
+    FOREACH(_current_PO_FILE ${_args})
+       GET_FILENAME_COMPONENT(_name ${_current_PO_FILE} NAME)
+
diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD
index 37ea037b6..1b44b5c0d 100644
--- a/extra/libxi/PKGBUILD
+++ b/extra/libxi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198284 2013-10-30 13:55:49Z allan $
+# $Id: PKGBUILD 216802 2014-07-11 15:20:34Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxi
-pkgver=1.7.2
+pkgver=1.7.3
 pkgrel=1
 pkgdesc="X11 Input extension library"
 arch=('i686' 'x86_64')
@@ -12,18 +12,16 @@ depends=('libxext' 'inputproto')
 makedepends=('pkgconfig' 'xorg-util-macros' 'libxfixes' 'automake')
 license=('custom')
 source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2)
-sha256sums=('df24781dc63645e2b561cd0b20bd8a0e7aff02e426a8d2a7641159004d4cb20e')
+sha256sums=('763db879f57b44c6e2cc96ae4bb756cf276170c979ef8a51b4db6e04c969953c')
 
 build() {
-  cd "${srcdir}/libXi-${pkgver}"
-
+  cd libXi-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
 }
 
 package() {
-  cd "${srcdir}/libXi-${pkgver}"
-
+  cd libXi-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/polkit-qt/PKGBUILD b/extra/polkit-qt/PKGBUILD
index c8f52877c..f6449603e 100644
--- a/extra/polkit-qt/PKGBUILD
+++ b/extra/polkit-qt/PKGBUILD
@@ -2,31 +2,52 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
-pkgname=polkit-qt
-pkgver=0.103.0
-pkgrel=3
+pkgbase=polkit-qt
+pkgname=('polkit-qt4' 'polkit-qt5')
+pkgver=0.112
+pkgrel=1
 pkgdesc='A library that allows developers to access PolicyKit API with a nice Qt-style API'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kdesupport/polkit-qt-1'
 license=('LGPL')
-depends=('polkit' 'qt4')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/apps/KDE4.x/admin/${pkgname}-1-${pkgver}.tar.bz2")
-md5sums=('a105e233e6733fb072c9080cd7ae1af2')
+makedepends=('cmake' 'automoc4' 'polkit' 'qt4' 'qt5-base')
+source=(${pkgbase}-${pkgver}.tar.bz2::"http://quickgit.kde.org/?p=${pkgbase}-1.git&a=snapshot&h=40afa675bfa4cacd95487ce8b0544654c5f34e21&fmt=tbz2")
+md5sums=('c46401dbb55e2276616849e22b096768')
 
 prepare() {
-  mkdir build
+  mkdir build{,-qt5}
 }
 
 build() {
   cd build
-  cmake ../${pkgname}-1-${pkgver} \
+  cmake ../${pkgbase}-1 \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_DESTINATION=/usr/lib \
+    -DUSE_QT4=ON
+  make
+
+  cd ../build-qt5
+  cmake ../${pkgbase}-1 \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_DESTINATION=/usr/lib
   make
 }
 
-package() {
+package_polkit-qt4() {
+  depends=('polkit' 'qt4')
+  replaces=('polkit-qt')
+  provides=('polkit-qt')
+  conflicts=('polkit-qt')
+
   cd build
   make DESTDIR="${pkgdir}" install
 }
+
+package_polkit-qt5() {
+  depends=('polkit' 'qt5-base')
+
+  cd build-qt5
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/polkit-qt5/PKGBUILD b/extra/polkit-qt5/PKGBUILD
deleted file mode 100644
index 49340c37e..000000000
--- a/extra/polkit-qt5/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 212982 2014-05-16 23:15:17Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Antonio Rojas <nqn1976 @ gmail.com>
-
-pkgname=polkit-qt5
-pkgver=0.103.0.bac771e
-pkgrel=1
-pkgdesc='Qt wrapper around polkit-1 client libraries'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kdesupport/polkit-qt-1'
-license=('LGPL')
-depends=('polkit' 'qt5-base')
-makedepends=('extra-cmake-modules' 'git')
-source=('git://anongit.kde.org/polkit-qt-1#commit=bac771e69887c9253f2b0973f6310810db0061f8')
-md5sums=('SKIP')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../polkit-qt-1 \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_INSTALL_DIR=lib
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index 7584569ac..f83e3179e 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 215169 2014-06-14 19:17:22Z andyrtr $
+# $Id: PKGBUILD 216819 2014-07-11 18:38:43Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgbase=tracker
 pkgname=(tracker libtracker-sparql)
-pkgver=1.0.1
-pkgrel=2
+pkgver=1.0.2
+pkgrel=1
 pkgdesc="All-in-one indexer, search tool and metadata database"
 arch=(i686 x86_64)
 license=(GPL)
@@ -19,7 +19,7 @@ url="http://www.gnome.org"
 options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:3}/$pkgbase-$pkgver.tar.xz
         tracker-1.0.1-giflib-5.1.0.patch)
-sha256sums=('76e7918e62526a8209f9c9226f82abe592a6332826ac7c12e6e405063181e889'
+sha256sums=('73491517006a58802630ff28243fc6fe07a24fe8bea563670da0ad28595468c4'
             'b5440e8129256a315f932229e9a25a3586b9dfdc3505bd2c018351573345b0bc')
 
 prepare() {
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD
index 748cc7c50..b44d4e9b9 100644
--- a/extra/webkitgtk/PKGBUILD
+++ b/extra/webkitgtk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 216508 2014-07-04 19:12:59Z heftig $
+# $Id: PKGBUILD 216826 2014-07-11 21:54:26Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=webkitgtk
 pkgname=(webkitgtk webkitgtk2)
-pkgver=2.4.3
-pkgrel=2
+pkgver=2.4.4
+pkgrel=1
 pkgdesc="GTK+ Web content engine library"
 arch=(i686 x86_64)
 url="http://webkitgtk.org/"
@@ -17,11 +17,9 @@ optdepends=('gst-plugins-base: free media decoding'
             'gst-libav: nonfree media decoding')
 options=(!emptydirs)
 source=(http://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz
-        fix-pretty-quotes.patch
-        webkitgtk-2.4.3-angle_symbol_table.patch)
-sha256sums=('9862c3eac1d12cc6e52cc39060a1284163950b304d534529a0dbcc5958a8ceac'
-            '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6'
-            'a2c0b96a1671d43c18baf3cbe53c84738181aa08c3ac448c423b50722953a50b')
+        fix-pretty-quotes.patch)
+sha256sums=('58cbfc7e352ae1e1f5e383f9f766795794d88483e9a52377a295f56eedf53ab9'
+            '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6')
 
 prepare() {
   mkdir build-gtk{,2} path
@@ -30,7 +28,6 @@ prepare() {
 
   cd $pkgbase-$pkgver
   patch -Np0 -i ../fix-pretty-quotes.patch
-  patch -Np1 -i ../webkitgtk-2.4.3-angle_symbol_table.patch
 }
 
 _build() (
diff --git a/extra/webkitgtk/webkitgtk-2.4.3-angle_symbol_table.patch b/extra/webkitgtk/webkitgtk-2.4.3-angle_symbol_table.patch
deleted file mode 100644
index 8d3096670..000000000
--- a/extra/webkitgtk/webkitgtk-2.4.3-angle_symbol_table.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp
-+++ b/Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp
-@@ -171,7 +171,8 @@ TFunction::~TFunction()
- TSymbolTableLevel::~TSymbolTableLevel()
- {
-     for (tLevel::iterator it = level.begin(); it != level.end(); ++it)
--        delete (*it).second;
-+        if ((*it).first == (*it).second->getMangledName())
-+            delete (*it).second;
- }
-
- //
-
diff --git a/extra/x2goclient/PKGBUILD b/extra/x2goclient/PKGBUILD
index 8db9e19d8..12a1e5fe8 100644
--- a/extra/x2goclient/PKGBUILD
+++ b/extra/x2goclient/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 210182 2014-04-10 18:18:43Z andyrtr $
+# $Id: PKGBUILD 216796 2014-07-11 14:49:07Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
 # Contributor: Richard Murri <admin@richardmurri.com>
 
 pkgname=x2goclient
-pkgver=4.0.2.0
+pkgver=4.0.2.1
 pkgrel=1
 pkgdesc="x2go qt4 client"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-the
 makedepends=('man2html')
 install=x2goclient.install
 source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
-sha1sums=('bbe8efb2df88bfa18b056c52ee0b1cca7a52b71b'
+sha1sums=('fb9e787afc610f69a56ddf61ecc255d62d111189'
           'SKIP')
 
 build() {