Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/mplayer2/PKGBUILD
	community/pcmanfm/PKGBUILD
	extra/liblrdf/PKGBUILD
	extra/php-apc/PKGBUILD
	extra/sqlite/PKGBUILD
	kde-unstable/libkgapi/PKGBUILD
	kde-unstable/soprano/PKGBUILD
	multilib/lib32-libphobos-ldc/PKGBUILD
	multilib/lib32-pixman/PKGBUILD
	multilib/lib32-sqlite3/PKGBUILD

36 files changed, 384 insertions, 132 deletions

diff --git a/extra/catdoc/PKGBUILD b/extra/catdoc/PKGBUILD
index aa4f7da01..e4399c1be 100644
--- a/extra/catdoc/PKGBUILD
+++ b/extra/catdoc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 128489 2011-06-24 04:50:44Z eric $
+# $Id: PKGBUILD 161488 2012-06-11 21:02:16Z eric $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Paulius Palevicius <paulius@birzai.com>
 
 pkgname=catdoc
-pkgver=0.94.2
-pkgrel=3
+pkgver=0.94.3
+pkgrel=1
 pkgdesc="A convertor for Microsoft Word, Excel, PowerPoint and RTF Files to text"
 arch=(i686 x86_64 'mips64el')
 url="http://www.wagner.pp.ru/~vitus/software/catdoc/"
@@ -12,11 +12,13 @@ license=('GPL')
 depends=('glibc')
 optdepends=('tk: for using wordview')
 options=('!makeflags')
-source=(http://ftp.wagner.pp.ru/pub/catdoc/$pkgname-$pkgver.tar.gz)
-md5sums=('243e1680bb3e703616f5adecfee24491')
+source=(http://ftp.de.debian.org/debian/pool/main/c/catdoc/${pkgname}_$pkgver.orig.tar.gz)
+md5sums=('61212b9fd06b0a31aa7bc9a671130f57')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  sed -i 's/$(prefix)/$(installroot)$(prefix)/' desktop/Makefile.in
+  sed -i 's/0.94.2/0.94.3/' configure* doc/*.1 src/makefile.tc
   ./configure --prefix=/usr  --with-wish=/usr/bin/wish
   make
 }
@@ -24,4 +26,6 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make installroot="$pkgdir" mandir=/usr/share/man/man1 install
+  install -d "$pkgdir"/usr/share/man/man1
+  install -m644 doc/*.1 "$pkgdir"/usr/share/man/man1
 }
diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD
index f8b72b637..484b251cd 100644
--- a/extra/cifs-utils/PKGBUILD
+++ b/extra/cifs-utils/PKGBUILD
@@ -1,29 +1,25 @@
-# $Id: PKGBUILD 158736 2012-05-08 14:32:25Z tpowa $
+# $Id: PKGBUILD 161430 2012-06-11 13:06:12Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=cifs-utils
-pkgver=5.4
+pkgver=5.5
 pkgrel=1
 pkgdesc="CIFS filesystem user-space tools"
 arch=(i686 x86_64 'mips64el')
 url="http://wiki.samba.org/index.php/LinuxCIFS_utils"
 license=('GPL')
 depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient')
-source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2
-        mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch)
+source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-   # add fedora build patch
-  patch -Np1 -i ../mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch
   ./configure --prefix=/usr
   make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" ROOTSBINDIR=/usr/bin install
   # set mount.cifs uid, to enable none root mounting form fstab
-  chmod +s $pkgdir/sbin/mount.cifs
+  chmod +s $pkgdir/usr/bin/mount.cifs
 }
-md5sums=('dde98336c833b59777114145cb8f3c64'
-         'b1b0a5a21aedd5421ff6e1e1a8720771')
+md5sums=('4de6c660ccdb9506d0e2cff4f37b8707')
diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD
index 7cf6f0dc9..7fc6c1250 100644
--- a/extra/colord/PKGBUILD
+++ b/extra/colord/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 160605 2012-06-02 20:59:03Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 161614 2012-06-12 13:49:01Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=colord
 pkgver=0.1.21
-pkgrel=1
+pkgrel=2
 pkgdesc="Color daemon"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/software/colord"
@@ -30,7 +30,8 @@ build() {
 
 package() {
   cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install \
+    bashcompletiondir=/usr/share/bash-completion/completions
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD
index 44cd86f23..d37d66780 100644
--- a/extra/dbus-python/PKGBUILD
+++ b/extra/dbus-python/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 161366 2012-06-10 10:37:10Z jgc $
+# $Id: PKGBUILD 161472 2012-06-11 18:34:18Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=dbus-python
 pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common')
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Python bindings for DBUS"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
@@ -29,6 +29,7 @@ build() {
 
 package_python-dbus-common() {
   pkgdesc="Common dbus-python files shared between python-dbus and python2-dbus"
+  conflicts=('dbus-python<1.1.0')
 
   cd "${srcdir}/build-python3"
   make DESTDIR="${pkgdir}" install-data
diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD
index dd8e7e69f..42ae10313 100644
--- a/extra/dconf/PKGBUILD
+++ b/extra/dconf/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158084 2012-05-02 16:51:02Z ibiru $
+# $Id: PKGBUILD 161615 2012-06-12 13:50:01Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=dconf
 pkgver=0.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A low-level configuration system."
 arch=(i686 x86_64 'mips64el')
 url="http://live.gnome.org/dconf"
@@ -25,7 +25,7 @@ build() {
 
 package() {
   cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
+  make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD
index 0bc839ac8..5b1fd0f71 100644
--- a/extra/emacs/PKGBUILD
+++ b/extra/emacs/PKGBUILD
@@ -1,28 +1,22 @@
-# $Id: PKGBUILD 156054 2012-04-12 12:20:45Z juergen $
+# $Id: PKGBUILD 161436 2012-06-11 15:03:29Z juergen $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
 
 pkgname=emacs
-pkgver=23.4
+pkgver=24.1
 pkgrel=2
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
-depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib')
+depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
 install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig}
-  emacs-subversion17.patch
-  emacs-23.3-xgselect_init.patch)
-md5sums=('070c68ad8e3c31fb3cb2414feaf5e6f0'
-         '55eb16eb48b44987693c0e3ea5ab8075'
-         '12e2e7a66df5cc5ded54e1d30083a1fb'
-	 '0d3b3d701ba1295613ace30e8d67ca88')
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig})
+md5sums=('8ba0932c498bc8fb10d7ddba52227e5b' 'c303d5c0bd0f7ea28acd14c9738faff4')
+
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
-  patch -p1 -i ../emacs-subversion17.patch
-  patch -p1 -i ../emacs-23.3-xgselect_init.patch
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
     --localstatedir=/var --with-x-toolkit=gtk --with-xft
   make
@@ -34,7 +28,7 @@ package() {
 
   # remove conflict with ctags package
   mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
-  mv "$pkgdir"/usr/share/man/man1/{ctags.1,ctags.emacs.1}
+  mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
   # fix all the 777 perms on directories
   find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \;
   # fix user/root permissions on usr/share files
diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD
index 2fcd3036e..82513034b 100644
--- a/extra/fcitx/PKGBUILD
+++ b/extra/fcitx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 160913 2012-06-06 22:50:26Z eric $
+# $Id: PKGBUILD 161484 2012-06-11 19:50:28Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: csslayer <wengxt AT gmail com>
 
 pkgbase=fcitx
 pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
-pkgver=4.2.4
+pkgver=4.2.4.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx/"
@@ -12,7 +12,7 @@ license=('GPL')
 makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'icu' \
              'iso-codes' 'gobject-introspection' 'libxkbfile' 'enchant')
 source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz)
-sha1sums=('68aaf220d3f7e9bfe34062379e22388a44250fc2')
+sha1sums=('835fe4ee7005641a79b4456654e70ed5a5c49b85')
 
 build() {
   cd "${srcdir}"
@@ -36,7 +36,7 @@ check() {
 package_fcitx() {
   pkgdesc="Free Chinese Input Toy of X - Input Method Server for X window system"
   depends=('pango' 'libxinerama' 'gtk-update-icon-cache' 'shared-mime-info' \
-           'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile' 'enchant')
+           'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile' 'enchant' 'icu')
   install=fcitx.install
 
   cd "${srcdir}"/build
diff --git a/extra/gtk-engines/PKGBUILD b/extra/gtk-engines/PKGBUILD
index f06d22d49..d6fb51626 100644
--- a/extra/gtk-engines/PKGBUILD
+++ b/extra/gtk-engines/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 148768 2012-02-05 11:49:45Z ibiru $
+# $Id: PKGBUILD 161439 2012-06-11 15:51:44Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gtk-engines
-pkgver=2.20.2
-pkgrel=2
+pkgver=2.21.0
+pkgrel=1
 pkgdesc="Theme engines for GTK+ 2"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
@@ -11,10 +11,12 @@ depends=('gtk2>=2.22.0')
 makedepends=('pkg-config' 'intltool')
 options=('!libtool')
 url="http://live.gnome.org/GnomeArt"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
+source=(ftp://ftp.archlinux.org/other/gtk-engines/${pkgname}-${pkgver}.tar.gz
+        ftp://ftp.archlinux.org/other/gtk-engines/${pkgname}-${pkgver}.tar.gz.sig)
 conflicts=('lighthouse-gtk2' 'clearlooks-gtk2')
 replaces=('lighthouse-gtk2')
-sha256sums=('15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5')
+md5sums=('d82ae66d6eb045d83c30b78b13818d41'
+         'c1166505961b9aa2ef98228a7cea1860')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/liblrdf/PKGBUILD b/extra/liblrdf/PKGBUILD
index f740dbff7..4186550d4 100644
--- a/extra/liblrdf/PKGBUILD
+++ b/extra/liblrdf/PKGBUILD
@@ -1,37 +1,27 @@
-# $Id: PKGBUILD 139617 2011-10-03 19:42:49Z jgc $
+# $Id: PKGBUILD 161476 2012-06-11 19:18:53Z eric $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=liblrdf
-pkgver=0.4.0
-pkgrel=9
+pkgver=0.5.0
+pkgrel=1
 pkgdesc="A library for the manipulation of RDF file in LADSPA plugins"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://sourceforge.net/projects/lrdf" #"http://sourceforge.net/projects/lrdf"
+url="https://github.com/swh/LRDF"
 depends=('raptor' 'ladspa')
-makedepends=('pkgconfig')
 license=('GPL')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/lrdf/${pkgname}-${pkgver}.tar.gz
-	md5.patch
-	raptor2.diff
-        pkgconfig-raptor.patch)
 groups=('ladspa-plugins')
-md5sums=('327a5674f671c4b360c6353800226877'
-         'a6d231d052dc188cbc4c1039cf3a2003' 
-         '80e938469da06a178e03107ca5b41e55'
-         '982ae1bd4b39c2fb5cba108fbcbfbad1')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/swh/LRDF/tarball/${pkgver})
+md5sums=('005ea24152620da7f2ee80a78e17f784')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/md5.patch"
-  patch -Np0 -i "${srcdir}/raptor2.diff"
-  patch -Np1 -i "${srcdir}/pkgconfig-raptor.patch"
+  cd "${srcdir}"/swh-LRDF-*
   autoreconf -vfi
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}"/swh-LRDF-*
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index cba826fb8..ea50b63c4 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 158713 2012-05-08 07:40:05Z andrea $
+# $Id: PKGBUILD 161633 2012-06-12 18:06:14Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.24
+pkgver=5.5.25
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -15,7 +15,7 @@ options=('!libtool')
 source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
         'mysqld'
         'my.cnf')
-md5sums=('dc84f8a0305e054c859533944e79f803'
+md5sums=('9e2a3d5b41eac7fae41b93e5b71ea49c'
          '2234207625baa29b2ff7d7b4f088abce'
          '1c949c0dbea5206af0db14942d9927b6')
 
diff --git a/extra/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD
index 6125d8117..dd35eec56 100644
--- a/extra/php-apc/PKGBUILD
+++ b/extra/php-apc/PKGBUILD
@@ -1,20 +1,23 @@
-# $Id: PKGBUILD 158790 2012-05-09 18:48:32Z pierre $
+# $Id: PKGBUILD 161426 2012-06-11 09:03:14Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=php-apc
 pkgver=3.1.10
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code'
 url='http://pecl.php.net/package/APC'
 depends=('php')
 license=('PHP')
-source=("http://pecl.php.net/get/APC-${pkgver}.tgz")
+source=("http://pecl.php.net/get/APC-${pkgver}.tgz"
+        'svn.patch')
 backup=('etc/php/conf.d/apc.ini')
-md5sums=('f4a6b91903d6ba9dce89fc87bb6f26c9')
+md5sums=('f4a6b91903d6ba9dce89fc87bb6f26c9'
+         'ce07a1b49b5af496e16362899df3e3c4')
 
 build() {
 	cd $srcdir/APC-$pkgver
+	patch -p0 -i ${srcdir}/svn.patch
 	phpize
 	./configure --prefix=/usr
 	make
diff --git a/extra/php-apc/svn.patch b/extra/php-apc/svn.patch
new file mode 100644
index 000000000..6a846a752
--- /dev/null
+++ b/extra/php-apc/svn.patch
@@ -0,0 +1,108 @@
+Index: apc_string.c
+===================================================================
+--- apc_string.c	(Revision 325040)
++++ apc_string.c	(Revision 326091)
+@@ -91,17 +91,18 @@
+         p = p->pNext;
+     }
+    
+-    if (APCSG(interned_strings_top) + ZEND_MM_ALIGNED_SIZE(sizeof(Bucket) + nKeyLength) >=
++    if (APCSG(interned_strings_top) + ZEND_MM_ALIGNED_SIZE(sizeof(Bucket) + nKeyLength + 1) >=
+         APCSG(interned_strings_end)) {
+         /* no memory */
+         return NULL;
+     }
+ 
+     p = (Bucket *) APCSG(interned_strings_top);
+-    APCSG(interned_strings_top) += ZEND_MM_ALIGNED_SIZE(sizeof(Bucket) + nKeyLength);
++    APCSG(interned_strings_top) += ZEND_MM_ALIGNED_SIZE(sizeof(Bucket) + nKeyLength + 1);
+ 
+     p->arKey = (char*)(p+1);
+     memcpy(p->arKey, arKey, nKeyLength);
++    ((char *)p->arKey)[nKeyLength] = '\0';
+     p->nKeyLength = nKeyLength;
+     p->h = h;
+     p->pData = &p->pDataPtr;
+@@ -154,7 +155,7 @@
+         }
+ 
+ 		if (ce->name) {
+-            ce->name = apc_new_interned_string(ce->name, ce->name_length TSRMLS_CC);
++            ce->name = apc_new_interned_string(ce->name, ce->name_length+1 TSRMLS_CC);
+ 		}
+ 
+         q = ce->properties_info.pListHead;
+@@ -166,7 +167,7 @@
+             }
+ 
+             if (info->name) {
+-                info->name = apc_new_interned_string(info->name, info->name_length TSRMLS_CC);
++                info->name = apc_new_interned_string(info->name, info->name_length+1 TSRMLS_CC);
+             }
+ 
+             q = q->pListNext;
+Index: apc.php
+===================================================================
+--- apc.php	(Revision 325040)
++++ apc.php	(Revision 326091)
+@@ -91,7 +91,7 @@
+ 	'SORT1'	=> '/^[AHSMCDTZ]$/',	// first sort key
+ 	'SORT2'	=> '/^[DA]$/',			// second sort key
+ 	'AGGR'	=> '/^\d+$/',			// aggregation by dir level
+-	'SEARCH'	=> '~^[a-zA-Z0-1/_.-]*$~'			// aggregation by dir level
++	'SEARCH'	=> '~^[a-zA-Z0-9/_.-]*$~'			// aggregation by dir level
+ );
+ 
+ // default cache mode
+Index: php_apc.c
+===================================================================
+--- php_apc.c	(Revision 325040)
++++ php_apc.c	(Revision 326091)
+@@ -724,6 +724,10 @@
+     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz", &strkey, &strkey_len, &(args.step), &success) == FAILURE) {
+         return;
+     }
++    
++	if (success) {
++		zval_dtor(success);
++	}
+ 
+     if(_apc_update(strkey, strkey_len, inc_updater, &args TSRMLS_CC)) {
+         if(success) ZVAL_TRUE(success);
+@@ -747,6 +751,10 @@
+     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz", &strkey, &strkey_len, &(args.step), &success) == FAILURE) {
+         return;
+     }
++    
++	if (success) {
++		zval_dtor(success);
++	}
+ 
+     args.step = args.step * -1;
+ 
+Index: php_apc.h
+===================================================================
+--- php_apc.h	(Revision 325040)
++++ php_apc.h	(Revision 326091)
+@@ -35,7 +35,7 @@
+ #include "apc_php.h"
+ #include "apc_globals.h"
+ 
+-#define PHP_APC_VERSION "3.1.9"
++#define PHP_APC_VERSION "3.1.10"
+ 
+ extern zend_module_entry apc_module_entry;
+ #define apc_module_ptr &apc_module_entry
+Index: apc_cache.c
+===================================================================
+--- apc_cache.c	(Revision 325040)
++++ apc_cache.c	(Revision 326091)
+@@ -944,7 +944,7 @@
+ 
+     len = strlen(filename);
+     if(APCG(fpstat)==0) {
+-        if(IS_ABSOLUTE_PATH(filename,len)) {
++        if(IS_ABSOLUTE_PATH(filename,len) || strstr(filename, "://")) {
+             key->data.fpfile.fullpath = filename;
+             key->data.fpfile.fullpath_len = len;
+             key->h = string_nhash_8(key->data.fpfile.fullpath, key->data.fpfile.fullpath_len);
diff --git a/extra/qt-gstreamer/PKGBUILD b/extra/qt-gstreamer/PKGBUILD
new file mode 100644
index 000000000..d083ecff0
--- /dev/null
+++ b/extra/qt-gstreamer/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 161451 2012-06-11 17:44:06Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: laloch <laloch@atlas.cz>
+
+pkgname=qt-gstreamer
+pkgver=0.10.2
+pkgrel=1
+pkgdesc="Qt bindings for GStreamer"
+arch=('i686' 'x86_64')
+url='http://gstreamer.freedesktop.org/modules/qt-gstreamer.html'
+license=('LGPL2.1')
+depends=('qt' 'gstreamer0.10-base' 'libgles')
+makedepends=('cmake' 'automoc4' 'boost' 'mesa' 'doxygen')
+source=("http://gstreamer.freedesktop.org/src/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('0428aedf2874fd0884ad4c41db9da20e')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DQTGSTREAMER_EXAMPLES=OFF
+  make
+}
+
+package() {
+  cd "$srcdir/build"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index 54235bfd4..d7fdee331 100644
--- a/extra/sqlite/PKGBUILD
+++ b/extra/sqlite/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 159464 2012-05-24 16:48:31Z andyrtr $
+# $Id: PKGBUILD 161621 2012-06-12 15:12:59Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase="sqlite"
 pkgname=('sqlite' 'sqlite-tcl')
-_amalgamationver=3071201
+_amalgamationver=3071300
 _amalgamationver2=${_amalgamationver/00/}
 #pkgver=${_amalgamationver2//0/.}
-pkgver=3.7.12.1
+pkgver=3.7.13
 pkgrel=1
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with
 	http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
 	license.txt)
 options=('!libtool' '!emptydirs')
-md5sums=('eb7bbd258913518ad30971ea7ecb0ca9'
+md5sums=('c97df403e8a3d5b67bb408fcd6aabd8e'
          'c1cdbc5544034d9012e421e75a5e4890')
 
 build() {
diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD
index 3a09140e5..dfcd8d912 100644
--- a/extra/telepathy-kde-accounts-kcm/PKGBUILD
+++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157039 2012-04-23 09:53:28Z ibiru $
+# $Id: PKGBUILD 161459 2012-06-11 18:14:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-accounts-kcm
 _pkgname=ktp-accounts-kcm
-pkgver=0.3.1
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ groups=('kde-telepathy')
 conflicts=('telepathy-kde-accounts-kcm-plugins')
 replaces=('telepathy-kde-accounts-kcm-plugins')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('290daae2530a0bb8473fbb5239a039766776c831')
+sha1sums=('fa48134361f955704700d211fdd3489ca58dc9c5')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD
index 350934a48..0b0c98177 100644
--- a/extra/telepathy-kde-approver/PKGBUILD
+++ b/extra/telepathy-kde-approver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157041 2012-04-23 09:53:31Z ibiru $
+# $Id: PKGBUILD 161460 2012-06-11 18:15:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-approver
 _pkgname=ktp-approver
-pkgver=0.3.1
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="KDE Channel Approver for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('156418a7f194a1df8f50fe6f8b371adac067f840')
+sha1sums=('d672826fac18817ec115aa0c52831e2c7761cade')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD
index cf9f0a3b0..31a84d65a 100644
--- a/extra/telepathy-kde-auth-handler/PKGBUILD
+++ b/extra/telepathy-kde-auth-handler/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 157043 2012-04-23 09:53:33Z ibiru $
+# $Id: PKGBUILD 161461 2012-06-11 18:15:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-auth-handler
 _pkgname=ktp-auth-handler
-pkgver=0.3.1
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
-depends=('telepathy-kde-common-internals')
+depends=('telepathy-kde-common-internals' 'qjson')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('153ddfd1c19c4a6719993df27357c70f18700f88')
+sha1sums=('a0158322f96a1f0356fdb9f1713af19ac4e45b8e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-call-ui/PKGBUILD b/extra/telepathy-kde-call-ui/PKGBUILD
new file mode 100644
index 000000000..de3bd0d50
--- /dev/null
+++ b/extra/telepathy-kde-call-ui/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 161457 2012-06-11 18:11:28Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=telepathy-kde-call-ui
+_pkgname=ktp-call-ui
+pkgver=0.4.0
+pkgrel=1
+pkgdesc="Voice/Video Call UI for Telepathy"
+arch=('i686' 'x86_64')
+url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
+license=('GPL')
+depends=('telepathy-kde-common-internals' 'qt-gstreamer')
+makedepends=('cmake' 'automoc4' 'boost')
+groups=('kde-telepathy')
+source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('be6bcaecde4091cad41520f203c559b614416bc6')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${_pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD
index 3d86f181d..cd4ca8b2b 100644
--- a/extra/telepathy-kde-common-internals/PKGBUILD
+++ b/extra/telepathy-kde-common-internals/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157059 2012-04-23 09:55:28Z ibiru $
+# $Id: PKGBUILD 161462 2012-06-11 18:16:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-common-internals
 _pkgname=ktp-common-internals
-pkgver=0.3.1
-pkgrel=2
+pkgver=0.4.0
+pkgrel=1
 pkgdesc="Common components for KDE-Telepathy"
 arch=('i686' 'x86_64')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
@@ -12,8 +12,9 @@ license=('GPL')
 depends=('kdelibs' 'telepathy-qt' 'telepathy-mission-control')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
+install=${pkgname}.install
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('f68c4587377fde7e2bd0e7201b30219f8aa7ce84')
+sha1sums=('db3bdbd93a27c77a1e593e84252cf2950ca773e6')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-common-internals/telepathy-kde-common-internals.install b/extra/telepathy-kde-common-internals/telepathy-kde-common-internals.install
new file mode 100644
index 000000000..0b9f228a9
--- /dev/null
+++ b/extra/telepathy-kde-common-internals/telepathy-kde-common-internals.install
@@ -0,0 +1,11 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_update() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
\ No newline at end of file
diff --git a/extra/telepathy-kde-contact-applet/PKGBUILD b/extra/telepathy-kde-contact-applet/PKGBUILD
index 0e52c568e..2dce5c0ca 100644
--- a/extra/telepathy-kde-contact-applet/PKGBUILD
+++ b/extra/telepathy-kde-contact-applet/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 157045 2012-04-23 09:53:35Z ibiru $
+# $Id: PKGBUILD 161463 2012-06-11 18:16:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-contact-applet
 _pkgname=ktp-contact-applet
-pkgver=0.3.1
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="The KDE-Telepathy contact plasmoid"
 arch=('i686' 'x86_64')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
-depends=('telepathy-kde-common-internals')
+depends=('telepathy-kde-common-internals' 'kdebase-workspace')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('f0eba19beaa97029e3012047108c27710d3a9a63')
+sha1sums=('bffa7ed930519c574d25a59917219fa1735b6a2e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD
index 17c62c7ae..77ec4af2f 100644
--- a/extra/telepathy-kde-contact-list/PKGBUILD
+++ b/extra/telepathy-kde-contact-list/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157047 2012-04-23 09:53:38Z ibiru $
+# $Id: PKGBUILD 161464 2012-06-11 18:17:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-contact-list
 _pkgname=ktp-contact-list
-pkgver=0.3.1
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="Telepathy contact list application"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('5126abb03184da209b8745afb6ee0ab70a24536e')
+sha1sums=('a9f059f434adec33f57e2a77444d704ae8563bc2')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD
new file mode 100644
index 000000000..7de5e78f6
--- /dev/null
+++ b/extra/telepathy-kde-contact-runner/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 161458 2012-06-11 18:12:10Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=telepathy-kde-contact-runner
+_pkgname=ktp-contact-runner
+pkgver=0.4.0
+pkgrel=1
+pkgdesc="KRunner plugin for KDE Telepathy"
+arch=('i686' 'x86_64')
+url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
+license=('GPL')
+depends=('telepathy-kde-common-internals')
+makedepends=('cmake' 'automoc4')
+groups=('kde-telepathy')
+source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('fe7f7d37740b732f8618b1e6129d4e7f30998b43')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${_pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
index 7ac79027c..01fad98b2 100644
--- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD
+++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157049 2012-04-23 09:53:40Z ibiru $
+# $Id: PKGBUILD 161465 2012-06-11 18:17:36Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-filetransfer-handler
 _pkgname=ktp-filetransfer-handler
-pkgver=0.3.1
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="Telepathy file transfer handler"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('16c677416bf2c3ac8f99cdb6da10140af9252b3b')
+sha1sums=('f318849c4e8a171bff97defc19b7a94f2ee13512')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD
index e61e77aaa..c75398e04 100644
--- a/extra/telepathy-kde-integration-module/PKGBUILD
+++ b/extra/telepathy-kde-integration-module/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157051 2012-04-23 09:53:43Z ibiru $
+# $Id: PKGBUILD 161466 2012-06-11 18:18:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-integration-module
 _pkgname=ktp-kded-integration-module
-pkgver=0.3.1
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('f5c9cd6ddd300ae824d63e7a69ae5ae4c7c4da20')
+sha1sums=('552d02b237ac167aef4707fd599dfb69cd944a72')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-presence-applet/PKGBUILD b/extra/telepathy-kde-presence-applet/PKGBUILD
index 02b922435..e0b15aa96 100644
--- a/extra/telepathy-kde-presence-applet/PKGBUILD
+++ b/extra/telepathy-kde-presence-applet/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 157053 2012-04-23 09:53:45Z ibiru $
+# $Id: PKGBUILD 161467 2012-06-11 18:18:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-presence-applet
 _pkgname=ktp-presence-applet
-pkgver=0.3.1
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="Plasma applet for managing your Telepathy account presence"
 arch=('i686' 'x86_64')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
-depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list')
+depends=('telepathy-kde-contact-list')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('b15b66dd0783fefb9df2acaedb242c9008cb688b')
+sha1sums=('beb12d534492da288cdda1826b43ba5bcd549fee')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD
index d9e5ded32..2cb5721f3 100644
--- a/extra/telepathy-kde-send-file/PKGBUILD
+++ b/extra/telepathy-kde-send-file/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 157055 2012-04-23 09:53:48Z ibiru $
+# $Id: PKGBUILD 161468 2012-06-11 18:19:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-send-file
 _pkgname=ktp-send-file
-pkgver=0.3.1
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
-depends=('telepathy-kde-common-internals' 'telepathy-kde-filetransfer-handler' 'telepathy-kde-contact-list')
+depends=('telepathy-kde-filetransfer-handler' 'telepathy-kde-contact-list')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('ce523b929c05df3149e3e674ba3bc4f61658aac3')
+sha1sums=('c72f5a9e26ba24b6558a8dab6d0ec2694aa55afc')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD
index e4c6ccdf3..a378f5b4d 100644
--- a/extra/telepathy-kde-text-ui/PKGBUILD
+++ b/extra/telepathy-kde-text-ui/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 157057 2012-04-23 09:53:50Z ibiru $
+# $Id: PKGBUILD 161470 2012-06-11 18:19:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-text-ui
 _pkgname=ktp-text-ui
-pkgver=0.3.1
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="Telepathy handler for Text Chats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
-depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list')
-makedepends=('cmake' 'automoc4')
+depends=('telepathy-kde-contact-list' 'telepathy-logger-qt')
+makedepends=('cmake' 'automoc4' 'boost')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('78741579fa62d5beca6ff87f074a3821c02d1f15')
+sha1sums=('4ddf762b928d7e5f1139cdcced27a866c5369312')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-logger-qt/PKGBUILD b/extra/telepathy-logger-qt/PKGBUILD
new file mode 100644
index 000000000..c73503021
--- /dev/null
+++ b/extra/telepathy-logger-qt/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 161454 2012-06-11 18:05:29Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: George Brooke <george+arch.aur@george-brooke.co.uk>
+
+pkgname=telepathy-logger-qt
+pkgver=0.4.0
+pkgrel=1
+pkgdesc="Qt bindings for telepathy logger"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kdereview/telepathy-logger-qt'
+license=('GPL')
+depends=('telepathy-qt' 'telepathy-logger' 'qt-gstreamer' 'boost-libs')
+makedepends=('automoc4' 'cmake' 'python2' 'boost')
+source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('459ab0db97d00d198d05859217cf0f4069e75d5e')
+
+build() {
+  cd "$srcdir"
+  mkdir build 
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2
+  make
+}
+
+package() {
+  cd "$srcdir/build"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD
index 7a95f122e..3cd350c3e 100644
--- a/extra/udisks2/PKGBUILD
+++ b/extra/udisks2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156994 2012-04-23 09:10:49Z ibiru $
+# $Id: PKGBUILD 161616 2012-06-12 13:51:10Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=udisks2
 pkgver=1.94.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Disk Management Service, version 2"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/udisks"
@@ -26,5 +26,6 @@ build() {
 
 package() {
   cd "udisks-$pkgver"
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install \
+    bash_completiondir=/usr/share/bash-completion/completions
 }
diff --git a/extra/unison/PKGBUILD b/extra/unison/PKGBUILD
index 3716289cc..c798669a2 100644
--- a/extra/unison/PKGBUILD
+++ b/extra/unison/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 148950 2012-02-05 11:57:26Z ibiru $
+# $Id: PKGBUILD 161432 2012-06-11 13:29:15Z tpowa $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=unison
 pkgver=2.40.63
-pkgrel=3
+pkgrel=4
 pkgdesc="Unison is a file-synchronization tool"
 arch=(i686 x86_64 'mips64el')
 license=('GPL2')
@@ -48,4 +48,6 @@ package() {
  # make symlink for .desktop file
   cd "$pkgdir"/usr/bin
   ln -s unison-gtk2 unison-x11
+ # make versioned symlink #29827
+  ln -s unison unison-2.40
 }
diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD
index f905ded78..cb1b97c16 100644
--- a/extra/xf86-input-synaptics/PKGBUILD
+++ b/extra/xf86-input-synaptics/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 158878 2012-05-12 16:51:09Z andyrtr $
+# $Id: PKGBUILD 161623 2012-06-12 15:20:16Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski  <tpowa@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-input-synaptics
-pkgver=1.6.1
+pkgver=1.6.2
 pkgrel=1
 pkgdesc="Synaptics driver for notebook touchpads"
 arch=('i686' 'x86_64' 'mips64el')
@@ -22,8 +22,8 @@ options=(!libtool)
 backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
 source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         10-synaptics.conf)
-sha1sums=('963276a5dd240e84efff28d516f8d23cfeedaa13'
-          '68e1f4ef5e1038231d210eb422fa4d18c5922f0f')
+sha256sums=('c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920'
+            'bd506a0545c335faa6da7ec42b3f60f2c09b5ed9e26f03003d6f59be88107ee2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xorg-xdm/PKGBUILD b/extra/xorg-xdm/PKGBUILD
index ac47ef1e2..ef12a75d4 100644
--- a/extra/xorg-xdm/PKGBUILD
+++ b/extra/xorg-xdm/PKGBUILD
@@ -1,38 +1,42 @@
-# $Id: PKGBUILD 140275 2011-10-11 21:28:00Z jgc $
+# $Id: PKGBUILD 161610 2012-06-12 11:02:41Z jgc $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 pkgname=xorg-xdm
 pkgver=1.1.11
-pkgrel=1
+pkgrel=2
 pkgdesc="X Display Manager"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'consolekit')
-makedepends=('pkgconfig' 'xorg-util-macros')
+makedepends=('pkgconfig' 'xorg-util-macros' 'systemd' 'xtrans')
 backup=(etc/X11/xdm/Xaccess etc/X11/xdm/Xresources etc/X11/xdm/Xservers etc/X11/xdm/xdm-config etc/pam.d/xdm etc/X11/xdm/Xsetup_0 etc/X11/xdm/Xsession)
 options=('!libtool')
 source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2
         Xsession-loginshell.patch
         Xsession-xsm.patch
         xdm-consolekit.patch
+        xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
         xdm.pam)
 md5sums=('64a1af1f7eb69feae12e75d4cc3aaf19'
          '234ae568e7b22cbc09433bb396ff3d80'
          '2c30078c50bc653d72eb5114506eb313'
-         '46b11173b58e2241577d5ffd48ab8f8d'
-         '419d6289ba6f851135f5c70c0e3cbec4')
+         '25c6d8adeed0796d432b2bbf1d83a7e9'
+         '13032add23a0a8d48a638418094bfc00'
+         '6de9362b1bf0835026270b20d8029909')
 sha256sums=('d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47'
             'fd3e7c20837b42a8ab111369fd6dc9612f9edb91c1f6904cca1d6a1fa3cfa0ff'
             '77a1ce9bdf363591b72798db08b4df3589bd4e64737fd32cf9028f9245450edb'
-            '47190f311c97c0d85b1fcab47ee5a8575013db1200a5e30a57a7ea4ef3e0c23a'
-            '36cf924a893ef851855ebcdc5468523a9d182c3620698e01dffc35d05d74764b')
+            '10ce850e6a93c6ba68b5d71104b1fd6680ad9760274068512f43a694b1edda76'
+            '5f380a2d6f77feb910d77f7f6843fce9b00ff7610c159fc029ee44cc6c23a48a'
+            '7d6818a1c1a44e9bd38774c035e03b0b831f6646681bc2bf556761aec7baf418')
 
 build() {
   cd "${srcdir}/xdm-${pkgver}"
   patch -Np0 -i "${srcdir}/Xsession-loginshell.patch"
   patch -Np1 -i "${srcdir}/Xsession-xsm.patch"
   patch -Np1 -i "${srcdir}/xdm-consolekit.patch"
+  patch -Np0 -i "${srcdir}/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch"
 
   autoreconf -fi
   ./configure --prefix=/usr \
diff --git a/extra/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch b/extra/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
new file mode 100644
index 000000000..195858883
--- /dev/null
+++ b/extra/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
@@ -0,0 +1,8 @@
+--- config/GiveConsole.sessreg-utmp-fix-bug177890	2006-07-24 04:20:10.000000000 -0400
++++ config/GiveConsole	2006-07-24 04:21:16.000000000 -0400
+@@ -8,3 +8,5 @@
+ # causing serious grief.
+ #
+ chown $USER /dev/console
++exec /usr/bin/sessreg  -a -w "/var/log/wtmp" -u "/run/utmp" \
++        -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
diff --git a/extra/xorg-xdm/xdm-consolekit.patch b/extra/xorg-xdm/xdm-consolekit.patch
index 7d85b97e0..c52a26138 100644
--- a/extra/xorg-xdm/xdm-consolekit.patch
+++ b/extra/xorg-xdm/xdm-consolekit.patch
@@ -97,7 +97,7 @@
 +	LogError("console-kit-daemon not running?\n");
 +	ck_connector_unref(connector);
 +	connector = NULL;
-+	return 0;
++	return 1;
 +    }
 +
 +    verify->userEnviron = setEnv(verify->userEnviron,
diff --git a/extra/xorg-xdm/xdm.pam b/extra/xorg-xdm/xdm.pam
index 862b83fa2..a0b601db6 100644
--- a/extra/xorg-xdm/xdm.pam
+++ b/extra/xorg-xdm/xdm.pam
@@ -6,3 +6,5 @@ account		required	pam_unix.so
 password	required	pam_unix.so
 session		required	pam_unix.so
 session		required	pam_limits.so
+session		required	pam_loginuid.so
+-session	optional	pam_systemd.so