Merge branch 'master' of gitpar:abslibre-mips64el

Conflicts:
	extra/seahorse/PKGBUILD

805 files changed, 25812 insertions, 11163 deletions

diff --git a/extra/a2ps/PKGBUILD b/extra/a2ps/PKGBUILD
index b1fa5191c..fd0323114 100644
--- a/extra/a2ps/PKGBUILD
+++ b/extra/a2ps/PKGBUILD
@@ -36,6 +36,8 @@ build() {
   patch -p1 < ../a2ps-4.13-manpage-chmod.patch
   patch -p1 < ../a2ps-4.14-check-mempcpy.patch
   patch -p0 < ../a2ps-4.14-fix-stpcpy-proto.patch
+  sed -i '/AM_C_PROTOTYPES/d' configure.in
+  sed -i '/ansi2knr/d' Makefile.am {src,lib,contrib/sample}/Makefile.am
   libtoolize --force --copy
   autoreconf -I m4
   ./configure --prefix=/usr --sysconfdir=/etc/a2ps \
diff --git a/extra/accountsservice/32bit-crash.patch b/extra/accountsservice/32bit-crash.patch
new file mode 100644
index 000000000..87b5d308e
--- /dev/null
+++ b/extra/accountsservice/32bit-crash.patch
@@ -0,0 +1,26 @@
+From 4d5166d1833e42d81b854374aa6e73f83a67a70e Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Tue, 27 Nov 2012 23:30:45 +0000
+Subject: Fix a crash on 32bit systems
+
+The login-frequency property of the User interface is defined
+as uint64 type. Therefore, when setting it with g_object_set,
+a 64bit value is collected, and passing an int might lead to
+bad things.
+https://bugs.freedesktop.org/show_bug.cgi?id=57343
+---
+diff --git a/src/daemon.c b/src/daemon.c
+index ed3a114..4d6f3ab 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -207,7 +207,7 @@ daemon_local_user_is_excluded (Daemon *daemon, const gchar *username, const gcha
+ #ifdef HAVE_UTMPX_H
+ 
+ typedef struct {
+-        int frequency;
++        guint64 frequency;
+         gint64 time;
+         GList *previous_logins;
+ } UserAccounting;
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD
index 21258e3e1..eb8be47cb 100644
--- a/extra/accountsservice/PKGBUILD
+++ b/extra/accountsservice/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 167219 2012-09-28 15:17:55Z heftig $
+# $Id: PKGBUILD 172182 2012-12-01 09:02:32Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=accountsservice
-pkgver=0.6.25
-pkgrel=1
+pkgver=0.6.29
+pkgrel=2
 pkgdesc="D-Bus interface for user account query and manipulation"
 arch=(i686 x86_64 'mips64el')
-url="http://cgit.freedesktop.org/accountsservice/"
+url="http://www.freedesktop.org/software/accountsservice/"
 license=('GPL3')
-depends=('glib2' 'polkit' 'libsystemd')
+depends=('glib2' 'polkit' 'systemd')
 makedepends=('intltool' 'gobject-introspection' 'vala')
 options=('!libtool')
-source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.xz
-        more-exclusions.patch)
-md5sums=('8438df64afffa3bd065c9c3134adb1e7'
-         '1d5cf127e5aac407fe7c37b2f4fd503c')
+source=($url/$pkgname-$pkgver.tar.xz more-exclusions.patch 32bit-crash.patch)
+md5sums=('396c16f39711e24bb7cc685a170befa3'
+         '1d5cf127e5aac407fe7c37b2f4fd503c'
+         '2d364b82e7bb1df4aaae70e9ac5be0ba')
 
 build() {
   cd $pkgname-$pkgver
   patch -Np1 -i ../more-exclusions.patch
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+  patch -Np1 -i ../32bit-crash.patch
+  ./configure --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/lib/accountsservice \
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
     --localstatedir=/var --disable-static --enable-systemd
diff --git a/extra/aisleriot/PKGBUILD b/extra/aisleriot/PKGBUILD
index 83957b28c..da5b43bb8 100644
--- a/extra/aisleriot/PKGBUILD
+++ b/extra/aisleriot/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 142864 2011-11-17 18:34:18Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 170150 2012-11-03 17:53:42Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=aisleriot
-pkgver=3.2.2
-pkgrel=1.1
+pkgver=3.2.3.2
+pkgrel=1
 pkgdesc="GNOME Solitaire card games"
-arch=(mips64el)
+arch=(i686 x86_64 mips64el)
 license=(GPL)
 url="http://www.gnome.org"
 groups=('gnome-extra')
 depends=(libsm gconf guile libcanberra librsvg hicolor-icon-theme dconf)
-makedepends=(gnome-doc-utils intltool itstool)
+makedepends=(intltool itstool docbook-xsl)
 options=('!emptydirs' '!libtool')
 install=aisleriot.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('818e16767f30238a98332fe07e8b905376a71de05feb3de19815652a48fdfcca')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('06eeeef49e7a0f8a98142085a64bc7830d0dd02e480fbfa1309545fccc977a36')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -27,7 +27,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
diff --git a/extra/alsaplayer/PKGBUILD b/extra/alsaplayer/PKGBUILD
index ea0cde120..446018b78 100644
--- a/extra/alsaplayer/PKGBUILD
+++ b/extra/alsaplayer/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161645 2012-06-13 05:17:46Z eric $
+# $Id: PKGBUILD 170547 2012-11-08 15:28:30Z heftig $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=alsaplayer
 pkgver=0.99.81
-pkgrel=4
+pkgrel=5
 pkgdesc="A heavily multi-threaded PCM player that tries to excercise the ALSA library and driver quite a bit"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.alsaplayer.org/"
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD
index 510062cc1..a277edadc 100644
--- a/extra/amarok/PKGBUILD
+++ b/extra/amarok/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165272 2012-08-14 19:57:06Z ronald $
+# $Id: PKGBUILD 172156 2012-11-30 08:00:25Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
@@ -6,13 +6,13 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.6.0
-pkgrel=1
+pkgrel=3
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64" 'mips64el')
 url="http://amarok.kde.org"
 license=('GPL2' 'LGPL2.1' 'FDL')
 depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
-        'liblastfm' 'ffmpeg' 'libofa' 'qjson')
+        'liblastfm' 'ffmpeg' 'libofa' 'qjson' 'mesa')
 makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
              'libmygpo-qt')
 optdepends=("libgpod: support for Apple iPod audio devices"
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 2493c3359..2afee0879 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 169418 2012-10-20 18:24:37Z giovanni $
+# $Id: PKGBUILD 171940 2012-11-24 17:59:20Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
 # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
 
 pkgname=amule
-pkgver=10795
+pkgver=10802
 pkgrel=1
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ url="http://www.amule.org"
 license=('GPL')
 depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++')
 source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('e64c4f198e66c3e231a292b60b7cafb4')
+md5sums=('46bbfbfba0af431b6baa0c30bd35600c')
 
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
diff --git a/extra/anjuta-extras/PKGBUILD b/extra/anjuta-extras/PKGBUILD
index 1fee6da87..da103ab51 100644
--- a/extra/anjuta-extras/PKGBUILD
+++ b/extra/anjuta-extras/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 156701 2012-04-23 09:03:26Z ibiru $
+# $Id: PKGBUILD 169845 2012-10-30 22:23:48Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=anjuta-extras
-pkgver=3.4.0
-pkgrel=2
+pkgver=3.6.0
+pkgrel=1
 pkgdesc="Anjuta Integrated Development Environment extra plugins"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('anjuta')
 makedepends=('intltool' 'gnome-doc-utils')
 install=anjuta-extras.install
-url="http://anjuta.sourceforge.net/"
+url="http://www.anjuta.org/"
 source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
 options=('!libtool' '!emptydirs')
-sha256sums=('e9aa21dfa7e182c85e15eb4c3f1d0db928826572350f0aaeeae8ee9c947440bd')
+sha256sums=('69df64e6e13a6e0683ebaee5a26ee9b9368eda9ed157607d1e6935b52d7f0b9c')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index 9aa5e46a1..b168f485b 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 164512 2012-08-01 11:18:32Z jgc $
+# $Id: PKGBUILD 170895 2012-11-12 22:30:17Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
 pkgbase=anjuta
 pkgname=('libanjuta' 'anjuta')
-pkgver=3.4.4
+pkgver=3.6.2
 pkgrel=1
 pkgdesc="GNOME Integrated Development Environment (IDE)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-makedepends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf' 'gnome-doc-utils' 'intltool' 'gobject-introspection')
+makedepends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf' 'gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool')
 url="http://www.anjuta.org/"
 source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
 options=('!libtool' '!emptydirs')
-sha256sums=('e97199a6b59bb25f0908018b141b3d6b2dbc23804b84b4be34be669f8556ef7a')
+sha256sums=('2cf44120dcf22c4f4f25bbc65d3641c206e627776ab0f3a37ff0059844d581a2')
 
 build() {
   cd "$pkgbase-$pkgver"
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
+      --localstatedir=/var
   make
 }
 
diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD
index 9f38e2e49..aa9812f84 100644
--- a/extra/apr-util/PKGBUILD
+++ b/extra/apr-util/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149396 2012-02-07 13:30:38Z jgc $
+# $Id: PKGBUILD 172058 2012-11-27 12:16:31Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apr-util
-pkgver=1.4.1
-pkgrel=1.1
+pkgver=1.5.1
+pkgrel=1
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://apr.apache.org/"
@@ -12,7 +12,7 @@ depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc')
 options=('!libtool')
 license=('APACHE')
 source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2")
-md5sums=('52b31b33fb1aa16e65ddaefc76e41151')
+md5sums=('9c1db8606e520f201c451ec9a0b095f6')
 
 build() {
   cd "${srcdir}/apr-util-${pkgver}"
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index 3f20433d9..3dbefac8a 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -39,13 +39,17 @@ build() {
   CXXFLAGS+=" -DBOOST_SYSTEM_NO_DEPRECATED"
   export CFLAGS CXXFLAGS
 
+  # All unknown arches are considered i686 with SSE.
+  [ "$CARCH" == "mips64el" ] && extra="DIST_TARGET=none"
+
   scons $MAKEFLAGS ARCH="$CFLAGS -O3" \
                    PREFIX="/usr" \
                    DIST_LIBDIR="lib" \
                    FREEDESKTOP=0 \
                    FREESOUND=1 \
                    SYSLIBS=1 \
-                   DESTDIR="$pkgdir"
+                   DESTDIR="$pkgdir" \
+                   $extra
 }
 
 package() {
diff --git a/extra/arj/PKGBUILD b/extra/arj/PKGBUILD
index c48de8f65..720f63d5f 100644
--- a/extra/arj/PKGBUILD
+++ b/extra/arj/PKGBUILD
@@ -35,9 +35,7 @@ build() {
   cd gnu
   aclocal
   autoconf
-  rm -f config.{guess,sub}
-  cp /usr/share/automake-1.11/config.{guess,sub} .
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --build=$CHOST --host=$CHOST
   cd ..
   make prepare
   make
diff --git a/extra/aspell-pt/PKGBUILD b/extra/aspell-pt/PKGBUILD
index 86eededde..45b4196a8 100644
--- a/extra/aspell-pt/PKGBUILD
+++ b/extra/aspell-pt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150493 2012-02-18 03:34:52Z allan $
+# $Id: PKGBUILD 171362 2012-11-17 09:56:22Z eric $
 # Maintainer:
 # Contributor: Simo Leone <simo@archlinux.org>
 # Contributor: jlvsimoes <jlvsimoes@oninet.pt>
@@ -7,7 +7,7 @@ pkgname=aspell-pt
 _pkgverPT=20070510
 _pkgverBR=20090702
 pkgver=$_pkgverBR
-pkgrel=3.1
+pkgrel=4
 pkgdesc="Portuguese and Brazilian Portuguese dictionary for aspell"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://aspell.net/"
@@ -17,8 +17,8 @@ conflicts=('aspell-pt_br')
 replaces=('aspell-pt_br')
 source=(ftp://ftp.gnu.org/gnu/aspell/dict/pt_BR/aspell6-pt_BR-$_pkgverBR-0.tar.bz2
         ftp://ftp.gnu.org/gnu/aspell/dict/pt_PT/aspell6-pt_PT-$_pkgverPT-0.tar.bz2)
-md5sums=('e082a8956882eb94a67c12e1b8c4a324' 'a54267ce8f91de6e6a1baf1e8048cba0')
-sha1sums=('add1db9a6a908dccaad13a7fd85c3b202299ff26' 'e136c2f411b582897437b06b9068c98ee333be41')
+sha1sums=('add1db9a6a908dccaad13a7fd85c3b202299ff26'
+          'e136c2f411b582897437b06b9068c98ee333be41')
 
 build() {
   cd "$srcdir/aspell6-pt_BR-$_pkgverBR-0"
@@ -36,4 +36,6 @@ package() {
 
   cd "$srcdir/aspell6-pt_PT-$_pkgverPT-0"
   make DESTDIR="$pkgdir" install
+
+  echo "add pt_BR.multi" > "$pkgdir"/usr/lib/aspell-0.60/brasileiro.alias
 }
diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD
index 102778ca0..66c49f488 100644
--- a/extra/asymptote/PKGBUILD
+++ b/extra/asymptote/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 168597 2012-10-13 11:46:36Z andyrtr $
+# $Id: PKGBUILD 169579 2012-10-23 20:01:18Z remy $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Firmicus <francois.archlinux.org>
 # Contributor: bender02 at gmx dot com
 
 pkgname=asymptote
-pkgver=2.20
+pkgver=2.21
 pkgrel=1
 pkgdesc="A vector graphics language (like metapost)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://asymptote.sourceforge.net/"
 license=("GPL3")
 depends=('texlive-core' 'gc' 'freeglut' 'glu' 'gsl' 'fftw' 'libsigsegv')
-makedepends=('ghostscript' 'imagemagick')
+makedepends=('ghostscript' 'imagemagick'
+             'mesa' # For OpenGL headers
+            )
 optdepends=('python2:           for the xasy GUI'
             'python-imaging:    for the xasy GUI'
             'tix:               for the xasy GUI')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz)
 install=texlive.install
-sha1sums=('4c86ab71cff57a592944303b11d9bb6ec34f1cbd')
+sha1sums=('946269c63b7aa3a7d2875f5faa8a0b8d3d36628c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD
index f22cd3627..acb82a0b4 100644
--- a/extra/at-spi2-atk/PKGBUILD
+++ b/extra/at-spi2-atk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156703 2012-04-23 09:03:30Z ibiru $
+# $Id: PKGBUILD 170879 2012-11-12 21:34:54Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=at-spi2-atk
-pkgver=2.4.0
+pkgver=2.6.2
 pkgrel=1
 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool')
 install=at-spi2-atk.install
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('28e9c21ec8a76cae4914bdbc011c4f6bf1beeaa27751a88534d87364e6a888bf')
+sha256sums=('496c8432e8ab82735145f9af5d45209e9b708bf3c94e527ee091d08641a9bcfa')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD
index 97f8963f8..847ee4068 100644
--- a/extra/at-spi2-core/PKGBUILD
+++ b/extra/at-spi2-core/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 159068 2012-05-15 11:36:43Z heftig $
+# $Id: PKGBUILD 170878 2012-11-12 21:33:49Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=at-spi2-core
-pkgver=2.4.2
+pkgver=2.6.2
 pkgrel=1
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('dbus-core' 'glib2' 'libxtst')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('61d926ffc49c7f9236580468c5c9dabda16cec37ef3aee78ca6f2751595518fd')
+sha256sums=('0d5321ce9fdd7d036b072ef28cba14088394606e1687183ec5d0ae6adea8c87e')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/atk/PKGBUILD b/extra/atk/PKGBUILD
index 18e1b42a2..75f326579 100644
--- a/extra/atk/PKGBUILD
+++ b/extra/atk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156707 2012-04-23 09:03:35Z ibiru $
+# $Id: PKGBUILD 169846 2012-10-30 22:23:52Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=atk
-pkgver=2.4.0
+pkgver=2.6.0
 pkgrel=1
 pkgdesc="A library providing a set of interfaces for accessibility"
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ makedepends=('gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 url='http://www.gtk.org/'
-sha256sums=('091e9ce975a9fbbc7cd8fa64c9c389ffb7fa6cdde58b6d5c01b2c267093d888d')
+sha256sums=('eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index c050e4fc5..3f8891030 100644
--- a/extra/avahi/PKGBUILD
+++ b/extra/avahi/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 166539 2012-09-10 04:37:24Z bisson $
+# $Id: PKGBUILD 172143 2012-11-30 03:01:06Z bisson $
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=4
+pkgrel=5
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 options=('!libtool' '!emptydirs')
-depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
-optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
+depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm')
+optdepends=('dbus: communicating with client applications'
+            'gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
             'gtk2: gtk2 bindings')
 [ "$CARCH" != "mips64el" ] && optdepends+=('qt3: qt3 bindings')
 optdepends+=('qt: qt bindings'
@@ -20,7 +21,7 @@ optdepends+=('qt: qt bindings'
 [ "$CARCH" != "mips64el" ] && optdepends+=('mono: mono bindings')
 optdepends+=('dbus-python: avahi-discover'
             'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'pygtk' 'intltool' 'dbus-python'
+makedepends=('qt' 'pygtk' 'intltool' 'python2-dbus'
              'gobject-introspection' 'gtk3' 'xmltoman')
 [ "$CARCH" != "mips64el" ] && makedepends+=('qt3' 'mono' 'gtk-sharp-2')
 backup=('etc/avahi/hosts'
diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD
index c5090df5a..8b87b1527 100644
--- a/extra/avidemux/PKGBUILD
+++ b/extra/avidemux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163145 2012-07-08 09:30:48Z ibiru $
+# $Id: PKGBUILD 171262 2012-11-16 23:35:36Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=avidemux
 pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
 pkgver=2.5.6
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://fixounet.free.fr/avidemux/"
diff --git a/extra/avidemux/PKGBUILD.WIP b/extra/avidemux/PKGBUILD.WIP
new file mode 100644
index 000000000..361aa2665
--- /dev/null
+++ b/extra/avidemux/PKGBUILD.WIP
@@ -0,0 +1,83 @@
+# $Id: PKGBUILD 160693 2012-06-03 22:00:17Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgbase=avidemux
+pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
+pkgver=2.6.0
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://fixounet.free.fr/avidemux/"
+makedepends=('cmake' 'libxslt' 'gtk3' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \
+             'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
+             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva' \
+             'libvdpau' 'libdca' 'fribidi' 'glu')
+options=('!makeflags' '!emptydirs')
+#source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
+#sha1sums=('d886d61eab70f7b1972c0ebdeeeb7d2ba8c30cbf')
+source=(http://www.avidemux.org/nightly/source/snapshot_8273.tgz)
+sha1sums=('cf5256ce189a51898a2e1071ffd46cd993f453f2')
+
+build() {
+mv snapshot_8273 ${pkgbase}_${pkgver}
+
+  cd "${srcdir}/${pkgbase}_${pkgver}"
+  sed -i 's|avidemux2|avidemux3|' avidemux2.desktop
+  bash bootStrap.bash --with-core --with-cli --with-gtk --with-qt4 --with-plugins
+}
+
+package_avidemux-cli() {
+  pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
+  depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva')
+  optdepends=('lame: for the corresponding audio encoder plugin'
+              'faac: for the corresponding audio encoder plugin'
+              'faad2: for the corresponding audio decoder plugin'
+              'opencore-amr: for the corresponding audio decoder plugin'
+              'jack: for the corresponding audio device plugin'
+              'libpulse: for the corresponding audio device plugin'
+              'sdl: for the corresponding audio device plugin'
+              'x264: for the corresponding video encoder plugin'
+              'xvidcore: for the corresponding video encoder plugin'
+              'qt: for the QtScript scripting support'
+              'libdca: for the corresponding audio decoder plugin'
+              'fribidi: for the corresponding video filter plugin')
+
+  cd "${srcdir}/${pkgbase}_${pkgver}"
+  (cd buildCli; make DESTDIR="${pkgdir}" install)
+  (cd buildCore; make DESTDIR="${pkgdir}" install)
+  (cd buildPluginsCLI; make DESTDIR="${pkgdir}" install)
+  (cd buildPluginsCommon; make DESTDIR="${pkgdir}" install)
+
+  install -D -m644 avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png"
+  install -D -m644 man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
+}
+
+package_avidemux-gtk() {
+  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI"
+  depends=("avidemux-cli=${pkgver}" 'gtk3' 'libxv' 'desktop-file-utils')
+  install=avidemux.install
+
+  cd "${srcdir}/${pkgbase}_${pkgver}"
+  (cd buildGtk; make DESTDIR="${pkgdir}" install)
+  (cd buildPluginsGtk; make DESTDIR="${pkgdir}" install)
+
+  install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
+
+  rm "${pkgdir}"/usr/lib/ADM_plugins6/pluginSettings/x264/1/{PSP.json,iPhone.json}
+  rm "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so"
+}
+
+package_avidemux-qt() {
+  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
+  depends=("avidemux-cli=${pkgver}" 'qt' 'x264' 'glu')
+  install=avidemux.install
+
+  cd "${srcdir}/${pkgbase}_${pkgver}"
+  (cd buildQt4; make DESTDIR="${pkgdir}" install)
+  (cd buildPluginsQt4; make DESTDIR="${pkgdir}" install)
+
+  install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+  sed -i 's|gtk|qt4|' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+
+  rm "${pkgdir}"/usr/lib/ADM_plugins6/pluginSettings/x264/1/{PSP.json,iPhone.json}
+}
diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD
index 0fcba3316..e1ae6bf4c 100644
--- a/extra/banshee/PKGBUILD
+++ b/extra/banshee/PKGBUILD
@@ -3,33 +3,29 @@
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=banshee
-pkgver=2.4.1
-pkgrel=1
+pkgver=2.6.0
+pkgrel=2
 pkgdesc="Music management and playback for GNOME"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://banshee.fm/"
 license=('MIT')
 depends=(libxxf86vm gstreamer0.10-base-plugins mono-addins dbus-sharp-glib boo libwebkit libsoup-gnome gdata-sharp taglib-sharp gudev-sharp gkeyfile-sharp gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme xdg-utils media-player-info gstreamer0.10-bad-plugins mono-upnp)
-makedepends=('intltool' 'gnome-doc-utils' 'gtk-sharp-beans')
+makedepends=('intltool' 'gnome-doc-utils' 'gtk-sharp-beans' 'gnome-common')
 optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
             'gstreamer0.10-ugly-plugins: Extra media codecs'
             'gstreamer0.10-ffmpeg: Extra media codecs'
             'brasero: CD burning')
 options=('!libtool')
 install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/2.4/$pkgname-$pkgver.tar.xz
-        banshee-recent-gpod.patch)
-md5sums=('18d77594e524ff5e51c5cca5c6b31a34'
-         'e988bb83e1a49e5f0da5958e8af6508e')
+source=(http://download.gnome.org/sources/$pkgname/2.6/$pkgname-$pkgver.tar.xz)
+sha256sums=('a47cc741f8ef2f81726ec4872e8179b17efa271c0c991e912e384fabf777394a')
 
 build() {
   export MONO_SHARED_DIR="$srcdir/.wabi"
   mkdir -p "$MONO_SHARED_DIR"
 
   cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/banshee-recent-gpod.patch"
-  
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-docs \
               --disable-static \
               --disable-scrollkeeper \
diff --git a/extra/banshee/gst-1.0.patch b/extra/banshee/gst-1.0.patch
new file mode 100644
index 000000000..f8fa7a7c2
--- /dev/null
+++ b/extra/banshee/gst-1.0.patch
@@ -0,0 +1,1025 @@
+From ec14625f10c26ae3646f382ffd804ee28c3d7334 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
+Date: Wed, 19 Sep 2012 11:34:06 +0200
+Subject: [PATCH] Initial port to GStreamer 1.0
+
+---
+ build/m4/banshee/gstreamer.m4                |   19 +++---
+ data/audio-profiles/wav.xml.in               |    5 +-
+ libbanshee/banshee-bpmdetector.c             |   11 ++--
+ libbanshee/banshee-gst.h                     |    4 +-
+ libbanshee/banshee-player-cdda.c             |    5 +-
+ libbanshee/banshee-player-dvd.c              |    4 +-
+ libbanshee/banshee-player-equalizer.c        |    4 +-
+ libbanshee/banshee-player-missing-elements.c |    2 +-
+ libbanshee/banshee-player-pipeline.c         |   37 ++++++-----
+ libbanshee/banshee-player-private.h          |   13 ++--
+ libbanshee/banshee-player-replaygain.c       |   29 ++++-----
+ libbanshee/banshee-player-video.c            |   89 +++++++++++++-------------
+ libbanshee/banshee-player-vis.c              |   88 ++++++++-----------------
+ libbanshee/banshee-player.c                  |   11 ++--
+ libbanshee/banshee-ripper.c                  |   16 ++---
+ libbanshee/banshee-tagger.c                  |    2 +-
+ libbanshee/banshee-transcoder.c              |   19 +++---
+ 17 files changed, 156 insertions(+), 202 deletions(-)
+
+diff --git a/build/m4/banshee/gstreamer.m4 b/build/m4/banshee/gstreamer.m4
+index 6267cce..917cf58 100644
+--- a/build/m4/banshee/gstreamer.m4
++++ b/build/m4/banshee/gstreamer.m4
+@@ -1,17 +1,18 @@
+ AC_DEFUN([BANSHEE_CHECK_GSTREAMER],
+ [
+-	GSTREAMER_REQUIRED_VERSION=0.10.26
++	GSTREAMER_REQUIRED_VERSION=0.11.99
+ 	AC_SUBST(GSTREAMER_REQUIRED_VERSION)
+ 
+ 	PKG_CHECK_MODULES(GST,
+-		gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
+-		gstreamer-base-0.10 >= $GSTREAMER_REQUIRED_VERSION
+-		gstreamer-plugins-base-0.10 >= $GSTREAMER_REQUIRED_VERSION
+-		gstreamer-controller-0.10 >= $GSTREAMER_REQUIRED_VERSION
+-		gstreamer-dataprotocol-0.10 >= $GSTREAMER_REQUIRED_VERSION
+-		gstreamer-fft-0.10 >= $GSTREAMER_REQUIRED_VERSION)
+-
+-	GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10 -lgstpbutils-0.10 -lgsttag-0.10"
++		gstreamer-1.0 >= $GSTREAMER_REQUIRED_VERSION
++		gstreamer-base-1.0 >= $GSTREAMER_REQUIRED_VERSION
++		gstreamer-controller-1.0 >= $GSTREAMER_REQUIRED_VERSION
++		gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED_VERSION
++		gstreamer-audio-1.0 >= $GSTREAMER_REQUIRED_VERSION
++		gstreamer-fft-1.0 >= $GSTREAMER_REQUIRED_VERSION
++		gstreamer-pbutils-1.0 >= $GSTREAMER_REQUIRED_VERSION
++		gstreamer-tag-1.0 >= $GSTREAMER_REQUIRED_VERSION
++		gstreamer-video-1.0 >= $GSTREAMER_REQUIRED_VERSION)
+ 
+ 	AC_SUBST(GST_CFLAGS)
+ 	AC_SUBST(GST_LIBS)
+diff --git a/data/audio-profiles/wav.xml.in b/data/audio-profiles/wav.xml.in
+index 35cd1d2..6dc1bab 100644
+--- a/data/audio-profiles/wav.xml.in
++++ b/data/audio-profiles/wav.xml.in
+@@ -14,10 +14,7 @@
+                 "audioresample"
+                 "audioconvert" 
+                 (+ "audio/x-raw-int, "
+-                   "endianness=(int)1234, "
+-                   "width=(int)16, "
+-                   "depth=(int)16, "
+-                   "signed=(boolean)true, "
++                   "format=(string)S16LE, "
+                    "rate=(int)44100, "
+                    "channels=(int)2" )
+                 "wavenc")
+diff --git a/libbanshee/banshee-bpmdetector.c b/libbanshee/banshee-bpmdetector.c
+index c06ffcb..68b0419 100644
+--- a/libbanshee/banshee-bpmdetector.c
++++ b/libbanshee/banshee-bpmdetector.c
+@@ -30,6 +30,7 @@
+ #  include "config.h"
+ #endif
+ 
++#include <stdio.h>
+ #include <string.h>
+ #include <glib/gi18n.h>
+ 
+@@ -50,7 +51,7 @@ struct BansheeBpmDetector {
+ 
+     /*
+      * You can run this pipeline on the cmd line with:
+-     * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin2 ! \
++     * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin ! \
+      *    audioconvert ! bpmdetect ! fakesink
+      */
+ 
+@@ -168,14 +169,14 @@ bbd_new_decoded_pad(GstElement *decodebin, GstPad *pad,
+ 
+     g_return_if_fail(detector != NULL);
+ 
+-    audiopad = gst_element_get_pad(detector->audioconvert, "sink");
++    audiopad = gst_element_get_static_pad(detector->audioconvert, "sink");
+     
+     if(GST_PAD_IS_LINKED(audiopad)) {
+         g_object_unref(audiopad);
+         return;
+     }
+ 
+-    caps = gst_pad_get_caps(pad);
++    caps = gst_pad_query_caps(pad, NULL);
+     str = gst_caps_get_structure(caps, 0);
+     
+     if(!g_strrstr(gst_structure_get_name(str), "audio")) {
+@@ -209,9 +210,9 @@ bbd_pipeline_construct (BansheeBpmDetector *detector)
+         return FALSE;
+     }
+   
+-    detector->decodebin = gst_element_factory_make ("decodebin2", "decodebin2");
++    detector->decodebin = gst_element_factory_make ("decodebin", "decodebin");
+     if (detector->decodebin == NULL) {
+-        bbd_raise_error (detector, _("Could not create decodebin2 plugin"), NULL);
++        bbd_raise_error (detector, _("Could not create decodebin plugin"), NULL);
+         return FALSE;
+     }
+ 
+diff --git a/libbanshee/banshee-gst.h b/libbanshee/banshee-gst.h
+index 85662cf..332f356 100644
+--- a/libbanshee/banshee-gst.h
++++ b/libbanshee/banshee-gst.h
+@@ -41,9 +41,11 @@
+ #define BANSHEE_GST_ITERATOR_ITERATE(iter,child_type,child_name,free,block) { \
+     gboolean iter##_done = FALSE; \
+     while (!iter##_done) { \
++        GValue child_value = {0, }; \
+         child_type child_name; \
+-        switch (gst_iterator_next (iter, (gpointer)&child_name)) { \
++        switch (gst_iterator_next (iter, &child_value)) { \
+             case GST_ITERATOR_OK: { \
++                child_name = (child_type) g_value_get_object(&child_value); \
+                 { block; } \
+                 break; \
+             } \
+diff --git a/libbanshee/banshee-player-cdda.c b/libbanshee/banshee-player-cdda.c
+index 8be2bdd..401edf0 100644
+--- a/libbanshee/banshee-player-cdda.c
++++ b/libbanshee/banshee-player-cdda.c
+@@ -28,7 +28,8 @@
+ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ //
+ 
+-#include <gst/cdda/gstcddabasesrc.h>
++#include <stdlib.h>
++#include <gst/audio/gstaudiocdsrc.h>
+ #include "banshee-player-cdda.h"
+ 
+ // ---------------------------------------------------------------------------
+@@ -46,7 +47,7 @@ bp_cdda_get_cdda_source (GstElement *playbin)
+     
+     g_object_get (playbin, "source", &source, NULL);
+     
+-    if (source == NULL || !GST_IS_CDDA_BASE_SRC (source)) {
++    if (source == NULL || !GST_IS_AUDIO_CD_SRC (source)) {
+         if (source != NULL) {
+             g_object_unref (source);
+         }
+diff --git a/libbanshee/banshee-player-dvd.c b/libbanshee/banshee-player-dvd.c
+index 55d499c..991b506 100644
+--- a/libbanshee/banshee-player-dvd.c
++++ b/libbanshee/banshee-player-dvd.c
+@@ -296,7 +296,7 @@ bp_dvd_go_to_next_chapter (BansheePlayer *player)
+ {
+     gint64 index;
+     GstFormat format = gst_format_get_by_nick ("chapter");
+-    gst_element_query_position (player->playbin, &format, &index);
++    gst_element_query_position (player->playbin, format, &index);
+     gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH,
+         GST_SEEK_TYPE_SET, index + 1, GST_SEEK_TYPE_NONE, 0);
+ }
+@@ -306,7 +306,7 @@ bp_dvd_go_to_previous_chapter (BansheePlayer *player)
+ {
+     gint64 index;
+     GstFormat format = gst_format_get_by_nick ("chapter");
+-    gst_element_query_position (player->playbin, &format, &index);
++    gst_element_query_position (player->playbin, format, &index);
+     gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH,
+         GST_SEEK_TYPE_SET, index - 1, GST_SEEK_TYPE_NONE, 0);
+ }
+diff --git a/libbanshee/banshee-player-equalizer.c b/libbanshee/banshee-player-equalizer.c
+index a496ada..0cbb3b7 100644
+--- a/libbanshee/banshee-player-equalizer.c
++++ b/libbanshee/banshee-player-equalizer.c
+@@ -122,7 +122,7 @@ bp_equalizer_set_gain (BansheePlayer *player, guint bandnum, gdouble gain)
+     g_return_if_fail (IS_BANSHEE_PLAYER (player));
+     
+     if (player->equalizer != NULL) {
+-        GstObject *band;
++        GObject *band;
+ 
+         g_return_if_fail (bandnum < gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer)));
+ 
+@@ -188,7 +188,7 @@ bp_equalizer_get_frequencies (BansheePlayer *player, gdouble **freq)
+     count = gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer));
+     
+     for (i = 0; i < count; i++) {
+-        GstObject *band;
++        GObject *band;
+         
+         band = gst_child_proxy_get_child_by_index (GST_CHILD_PROXY (player->equalizer), i);
+         g_object_get (G_OBJECT (band), "freq", &(*freq)[i], NULL);
+diff --git a/libbanshee/banshee-player-missing-elements.c b/libbanshee/banshee-player-missing-elements.c
+index 20804c4..30118c5 100644
+--- a/libbanshee/banshee-player-missing-elements.c
++++ b/libbanshee/banshee-player-missing-elements.c
+@@ -170,7 +170,7 @@ _bp_missing_elements_handle_state_changed (BansheePlayer *player, GstState old,
+     }
+     #endif
+     
+-    install_return = gst_install_plugins_async (details, player->install_plugins_context, 
++    install_return = gst_install_plugins_async ((const gchar * const*) details, player->install_plugins_context, 
+         bp_missing_elements_handle_install_result, player);
+     
+     if (install_return != GST_INSTALL_PLUGINS_STARTED_OK) {
+diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c
+index ed845f3..6c2af35 100644
+--- a/libbanshee/banshee-player-pipeline.c
++++ b/libbanshee/banshee-player-pipeline.c
+@@ -76,7 +76,7 @@ playbin_stream_changed_cb (GstElement * element, BansheePlayer *player)
+     GstMessage *msg;
+ 
+     // We're being called from the streaming thread, so don't do anything here
+-    msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new ("stream-changed", NULL));
++    msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new_empty ("stream-changed"));
+     gst_element_post_message (player->playbin, msg);
+ }
+ 
+@@ -218,6 +218,11 @@ bp_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer userdata)
+             break;
+         }
+ 
++        case GST_MESSAGE_STREAM_START: {
++            bp_next_track_starting (player);
++            break;
++        }
++
+         case GST_MESSAGE_APPLICATION: {
+             const gchar * name;
+             const GstStructure * s = gst_message_get_structure (message);
+@@ -289,11 +294,11 @@ _bp_pipeline_construct (BansheePlayer *player)
+     
+     // Playbin is the core element that handles autoplugging (finding the right
+     // source and decoder elements) based on source URI and stream content
+-    player->playbin = gst_element_factory_make ("playbin2", "playbin");
++    player->playbin = gst_element_factory_make ("playbin", "playbin");
+ 
+ #ifdef ENABLE_GAPLESS
+     // FIXME: Connect a proxy about-to-finish callback that will generate a next-track-starting callback.
+-    // This can be removed once playbin2 generates its own next-track signal.
++    // This can be removed once playbin generates its own next-track signal.
+     // bgo#584987 - this is included in >= 0.10.26
+     g_signal_connect (player->playbin, "about-to-finish", G_CALLBACK (bp_about_to_finish_callback), player);
+ #endif //ENABLE_GAPLESS
+@@ -305,18 +310,13 @@ _bp_pipeline_construct (BansheePlayer *player)
+     g_signal_connect (player->playbin, "audio-changed", G_CALLBACK (playbin_stream_changed_cb), player);
+     g_signal_connect (player->playbin, "text-changed", G_CALLBACK (playbin_stream_changed_cb), player);
+ 
+-    // Try to find an audio sink, prefer gconf, which typically is set to auto these days,
+-    // fall back on auto, which should work on windows, and as a last ditch, try alsa
+-    audiosink = gst_element_factory_make ("gconfaudiosink", "audiosink");
+-    if (audiosink == NULL) {
+-        audiosink = gst_element_factory_make ("directsoundsink", "audiosink");
+-        if (audiosink != NULL) {
+-            g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL);
+-        } else {
+-            audiosink = gst_element_factory_make ("autoaudiosink", "audiosink");
+-            if (audiosink == NULL) {
+-                audiosink = gst_element_factory_make ("alsasink", "audiosink");
+-            }
++    audiosink = gst_element_factory_make ("directsoundsink", "audiosink");
++    if (audiosink != NULL) {
++        g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL);
++    } else {
++        audiosink = gst_element_factory_make ("autoaudiosink", "audiosink");
++        if (audiosink == NULL) {
++            audiosink = gst_element_factory_make ("alsasink", "audiosink");
+         }
+     }
+     
+@@ -341,7 +341,6 @@ _bp_pipeline_construct (BansheePlayer *player)
+         GstIterator *elem_iter = gst_bin_iterate_recurse (GST_BIN (audiosink));
+         BANSHEE_GST_ITERATOR_ITERATE (elem_iter, GstElement *, element, TRUE, {
+             player->audiosink_has_volume |= g_object_class_find_property (G_OBJECT_GET_CLASS (element), "volume") != NULL;
+-            gst_object_unref (element);
+         });
+     }
+     bp_debug ("Audiosink has volume: %s",
+@@ -383,7 +382,7 @@ _bp_pipeline_construct (BansheePlayer *player)
+     }
+    
+     // Ghost pad the audio bin so audio is passed from the bin into the tee
+-    teepad = gst_element_get_pad (player->audiotee, "sink");
++    teepad = gst_element_get_static_pad (player->audiotee, "sink");
+     gst_element_add_pad (player->audiobin, gst_ghost_pad_new ("sink", teepad));
+     gst_object_unref (teepad);
+ 
+@@ -411,8 +410,8 @@ _bp_pipeline_construct (BansheePlayer *player)
+     gst_bus_add_watch (bus, bp_pipeline_bus_callback, player);
+ 
+     // Link the first tee pad to the primary audio sink queue
+-    GstPad *sinkpad = gst_element_get_pad (audiosinkqueue, "sink");
+-    pad = gst_element_get_request_pad (player->audiotee, "src%d");
++    GstPad *sinkpad = gst_element_get_static_pad (audiosinkqueue, "sink");
++    pad = gst_element_get_request_pad (player->audiotee, "src_%u");
+     g_object_set(player->audiotee, "alloc-pad", pad, NULL);
+     gst_pad_link (pad, sinkpad);
+     gst_object_unref (GST_OBJECT (pad));
+diff --git a/libbanshee/banshee-player-private.h b/libbanshee/banshee-player-private.h
+index 9fed356..9346911 100644
+--- a/libbanshee/banshee-player-private.h
++++ b/libbanshee/banshee-player-private.h
+@@ -42,14 +42,14 @@
+ #include <gst/fft/gstfftf32.h>
+ #include <gst/pbutils/pbutils.h>
+ #include <gst/tag/tag.h>
+-#include <gst/interfaces/navigation.h>
++#include <gst/video/navigation.h>
+ 
+ #if defined(GDK_WINDOWING_X11)
+ #  include <gdk/gdkx.h>
+-#  include <gst/interfaces/xoverlay.h>
++#  include <gst/video/videooverlay.h>
+ #elif defined(GDK_WINDOWING_WIN32)
+ #  include <gdk/gdkwin32.h>
+-#  include <gst/interfaces/xoverlay.h>
++#  include <gst/video/videooverlay.h>
+ #endif
+ 
+ #include "banshee-gst.h"
+@@ -155,11 +155,11 @@ struct BansheePlayer {
+     // Video State
+     BpVideoDisplayContextType video_display_context_type;
+     #if defined(GDK_WINDOWING_X11)
+-    GstXOverlay *xoverlay;
++    GstVideoOverlay *video_overlay;
+     GdkWindow *video_window;
+     XID video_window_xid;
+     #elif defined(GDK_WINDOWING_WIN32)
+-    GstXOverlay *xoverlay;
++    GstVideoOverlay *video_overlay;
+     GdkWindow *video_window;
+     HWND video_window_xid;
+     #endif
+@@ -179,6 +179,8 @@ struct BansheePlayer {
+     GstFFTF32 *vis_fft;
+     GstFFTF32Complex *vis_fft_buffer;
+     gfloat *vis_fft_sample_buffer;
++    GstPad *vis_event_probe_pad;
++    gulong vis_event_probe_id;
+     
+     // Plugin Installer State
+     GdkWindow *window;
+@@ -197,6 +199,7 @@ struct BansheePlayer {
+     // http://replaygain.hydrogenaudio.org/player_scale.html
+     gdouble rg_gain_history[10];
+     gint history_size;
++    gulong rg_pad_block_id;
+ 
+     //dvd navigation
+     GstNavigation *navigation;
+diff --git a/libbanshee/banshee-player-replaygain.c b/libbanshee/banshee-player-replaygain.c
+index a479d4a..e42b197 100644
+--- a/libbanshee/banshee-player-replaygain.c
++++ b/libbanshee/banshee-player-replaygain.c
+@@ -79,17 +79,13 @@ static void on_target_gain_changed (GstElement *rgvolume, GParamSpec *pspec, Ban
+     _bp_rgvolume_print_volume (player);
+ }
+ 
+-static void
+-pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data)
++static GstPadProbeReturn
++pad_block_cb (GstPad *srcPad, GstPadProbeInfo *info, gpointer user_data)
+ {
+     BansheePlayer* player;
+ 
+-    if (!blocked) {
+-        return;
+-    }
+-
+     player = (BansheePlayer*) user_data;
+-    g_return_if_fail (IS_BANSHEE_PLAYER (player));
++    g_return_val_if_fail (IS_BANSHEE_PLAYER (player), GST_PAD_PROBE_OK);
+ 
+     // The pad_block_cb can get triggered multiple times, on different threads.
+     // Lock around the link/unlink code, so we don't end up going through here
+@@ -99,11 +95,9 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data)
+     if ((player->replaygain_enabled && player->rgvolume_in_pipeline) ||
+         (!player->replaygain_enabled && !player->rgvolume_in_pipeline)) {
+         // The pipeline is already in the correct state.  Unblock the pad, and return.
++        player->rg_pad_block_id = 0;
+         g_mutex_unlock (player->replaygain_mutex);
+-        if (gst_pad_is_blocked (srcPad)) {
+-            gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player);
+-        }
+-        return;
++        return GST_PAD_PROBE_REMOVE;
+     }
+ 
+     if (player->rgvolume_in_pipeline) {
+@@ -139,13 +133,12 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data)
+     }
+ 
+     // Our state is now consistent
++    player->rg_pad_block_id = 0;
+     g_mutex_unlock (player->replaygain_mutex);
+ 
+-    if (gst_pad_is_blocked (srcPad)) {
+-        gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player);
+-    }
+-
+     _bp_rgvolume_print_volume (player);
++
++    return GST_PAD_PROBE_REMOVE;
+ }
+ 
+ // ---------------------------------------------------------------------------
+@@ -187,9 +180,9 @@ void _bp_replaygain_pipeline_rebuild (BansheePlayer* player)
+     srcPad = gst_element_get_static_pad (player->before_rgvolume, "src");
+ 
+     if (gst_pad_is_active (srcPad) && !gst_pad_is_blocked (srcPad)) {
+-        gst_pad_set_blocked_async (srcPad, TRUE, &pad_block_cb, player);
+-    } else if (srcPad->block_callback == NULL) {
+-        pad_block_cb (srcPad, TRUE, player);
++        player->rg_pad_block_id = gst_pad_add_probe (srcPad, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM, &pad_block_cb, player, NULL);
++    } else if (!player->rg_pad_block_id) {
++        pad_block_cb (srcPad, NULL, player);
+     }
+ }
+ 
+diff --git a/libbanshee/banshee-player-video.c b/libbanshee/banshee-player-video.c
+index b901354..eb95c3f 100644
+--- a/libbanshee/banshee-player-video.c
++++ b/libbanshee/banshee-player-video.c
+@@ -37,54 +37,54 @@
+ #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32)
+ 
+ static gboolean
+-bp_video_find_xoverlay (BansheePlayer *player)
++bp_video_find_video_overlay (BansheePlayer *player)
+ {
+     GstElement *video_sink = NULL;
+-    GstElement *xoverlay;
+-    GstXOverlay *previous_xoverlay;
+-    gboolean    found_xoverlay;
++    GstElement *video_overlay;
++    GstVideoOverlay *previous_video_overlay;
++    gboolean    found_video_overlay;
+ 
+     g_object_get (player->playbin, "video-sink", &video_sink, NULL);
+ 
+     g_mutex_lock (player->video_mutex);
+-    previous_xoverlay = player->xoverlay;
++    previous_video_overlay = player->video_overlay;
+ 
+     if (video_sink == NULL) {
+-        player->xoverlay = NULL;
+-        if (previous_xoverlay != NULL) {
+-            gst_object_unref (previous_xoverlay);
++        player->video_overlay = NULL;
++        if (previous_video_overlay != NULL) {
++            gst_object_unref (previous_video_overlay);
+         }
+         g_mutex_unlock (player->video_mutex);
+         return FALSE;
+     }
+    
+-    xoverlay = GST_IS_BIN (video_sink)
+-        ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_X_OVERLAY)
++    video_overlay = GST_IS_BIN (video_sink)
++        ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_VIDEO_OVERLAY)
+         : video_sink;
+     
+-    player->xoverlay = GST_IS_X_OVERLAY (xoverlay) ? GST_X_OVERLAY (xoverlay) : NULL;
++    player->video_overlay = GST_IS_VIDEO_OVERLAY (video_overlay) ? GST_VIDEO_OVERLAY (video_overlay) : NULL;
+     
+-    if (previous_xoverlay != NULL) {
+-        gst_object_unref (previous_xoverlay);
++    if (previous_video_overlay != NULL) {
++        gst_object_unref (previous_video_overlay);
+     }
+         
+ #if !defined(GDK_WINDOWING_WIN32) // We can't rely on aspect ratio from dshowvideosink
+-    if (player->xoverlay != NULL && g_object_class_find_property (
+-        G_OBJECT_GET_CLASS (player->xoverlay), "force-aspect-ratio")) {
+-        g_object_set (G_OBJECT (player->xoverlay), "force-aspect-ratio", TRUE, NULL);
++    if (player->video_overlay != NULL && g_object_class_find_property (
++        G_OBJECT_GET_CLASS (player->video_overlay), "force-aspect-ratio")) {
++        g_object_set (G_OBJECT (player->video_overlay), "force-aspect-ratio", TRUE, NULL);
+     }
+ #endif
+     
+-    if (player->xoverlay != NULL && g_object_class_find_property (
+-        G_OBJECT_GET_CLASS (player->xoverlay), "handle-events")) {
+-        g_object_set (G_OBJECT (player->xoverlay), "handle-events", FALSE, NULL);
++    if (player->video_overlay != NULL && g_object_class_find_property (
++        G_OBJECT_GET_CLASS (player->video_overlay), "handle-events")) {
++        g_object_set (G_OBJECT (player->video_overlay), "handle-events", FALSE, NULL);
+     }
+ 
+     gst_object_unref (video_sink);
+-    found_xoverlay = (player->xoverlay != NULL) ? TRUE : FALSE;
++    found_video_overlay = (player->video_overlay != NULL) ? TRUE : FALSE;
+ 
+     g_mutex_unlock (player->video_mutex);
+-    return found_xoverlay;
++    return found_video_overlay;
+ }
+ 
+ #endif /* GDK_WINDOWING_X11 || GDK_WINDOWING_WIN32 */
+@@ -130,27 +130,27 @@ bp_video_sink_element_added (GstBin *videosink, GstElement *element, BansheePlay
+     g_return_if_fail (IS_BANSHEE_PLAYER (player));
+ 
+     #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32)
+-    bp_video_find_xoverlay (player);
++    bp_video_find_video_overlay (player);
+     #endif
+ }
+ 
+ static void
+ bp_video_bus_element_sync_message (GstBus *bus, GstMessage *message, BansheePlayer *player)
+ {
+-    gboolean found_xoverlay;
++    gboolean found_video_overlay;
+     
+     g_return_if_fail (IS_BANSHEE_PLAYER (player));
+ 
+     #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32)
+ 
+-    if (message->structure == NULL || !gst_structure_has_name (message->structure, "prepare-xwindow-id")) {
++    if (!gst_is_video_overlay_prepare_window_handle_message (message)) {
+         return;
+     }
+ 
+-    found_xoverlay = bp_video_find_xoverlay (player);
++    found_video_overlay = bp_video_find_video_overlay (player);
+ 
+-    if (found_xoverlay) {
+-        gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid);
++    if (found_video_overlay) {
++        gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid);
+     }
+ 
+     #endif
+@@ -164,7 +164,7 @@ static void
+ cb_caps_set (GObject *obj, GParamSpec *pspec, BansheePlayer *p)
+ {
+     GstStructure * s = NULL;
+-    GstCaps * caps = gst_pad_get_negotiated_caps (GST_PAD (obj));
++    GstCaps * caps = gst_pad_get_current_caps (GST_PAD (obj));
+ 
+     if (G_UNLIKELY (!caps)) {
+         return;
+@@ -219,7 +219,7 @@ _bp_parse_stream_info (BansheePlayer *player)
+     }
+ 
+     if (G_LIKELY (vpad)) {
+-        GstCaps *caps = gst_pad_get_negotiated_caps (vpad);
++        GstCaps *caps = gst_pad_get_current_caps (vpad);
+         if (G_LIKELY (caps)) {
+             cb_caps_set (G_OBJECT (vpad), NULL, player);
+             gst_caps_unref (caps);
+@@ -249,21 +249,18 @@ _bp_video_pipeline_setup (BansheePlayer *player, GstBus *bus)
+ 
+     player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_GDK_WINDOW;
+     
+-    videosink = gst_element_factory_make ("gconfvideosink", "videosink");
++    videosink = gst_element_factory_make ("autovideosink", "videosink");
+     if (videosink == NULL) {
+-        videosink = gst_element_factory_make ("autovideosink", "videosink");
+-        if (videosink == NULL) {
+-            player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED;
+-            videosink = gst_element_factory_make ("fakesink", "videosink");
+-            if (videosink != NULL) {
+-                g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL);
+-            }
++        player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED;
++        videosink = gst_element_factory_make ("fakesink", "videosink");
++        if (videosink != NULL) {
++            g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL);
+         }
+     }
+     
+     g_object_set (G_OBJECT (player->playbin), "video-sink", videosink, NULL);
+     
+-    gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player);
++    gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player, NULL);
+     g_signal_connect (bus, "sync-message::element", G_CALLBACK (bp_video_bus_element_sync_message), player);
+         
+     if (GST_IS_BIN (videosink)) {
+@@ -349,21 +346,21 @@ bp_video_window_expose (BansheePlayer *player, GdkWindow *window, gboolean direc
+ {
+     g_return_if_fail (IS_BANSHEE_PLAYER (player));
+     
+-    if (direct && player->xoverlay != NULL && GST_IS_X_OVERLAY (player->xoverlay)) {
+-        gst_x_overlay_expose (player->xoverlay);
++    if (direct && player->video_overlay != NULL && GST_IS_VIDEO_OVERLAY (player->video_overlay)) {
++        gst_video_overlay_expose (player->video_overlay);
+         return;
+     }
+ 
+-    if (player->xoverlay == NULL && !bp_video_find_xoverlay (player)) {
++    if (player->video_overlay == NULL && !bp_video_find_video_overlay (player)) {
+         return;
+     }
+     
+-    gst_object_ref (player->xoverlay);
++    gst_object_ref (player->video_overlay);
+ 
+-    gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid);
+-    gst_x_overlay_expose (player->xoverlay);
++    gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid);
++    gst_video_overlay_expose (player->video_overlay);
+ 
+-    gst_object_unref (player->xoverlay);
++    gst_object_unref (player->video_overlay);
+ }
+ 
+ // MUST be called from the GTK main thread; calling it in OnRealized will do the right thing.
+@@ -379,7 +376,7 @@ bp_video_window_realize (BansheePlayer *player, GdkWindow *window)
+ //    //Explicitly create the native window.  GDK_WINDOW_XWINDOW will call this
+ //    //function anyway, but this way we can raise a more useful message should it fail.
+ //    if (!gdk_window_ensure_native (window)) {
+-//        banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstXOverlay!");
++//        banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstVideoOverlay!");
+ //    }
+ //#endif
+ 
+diff --git a/libbanshee/banshee-player-vis.c b/libbanshee/banshee-player-vis.c
+index 5787c87..7e7dc78 100644
+--- a/libbanshee/banshee-player-vis.c
++++ b/libbanshee/banshee-player-vis.c
+@@ -27,17 +27,17 @@
+ //
+ 
+ #include <math.h>
++#include <gst/audio/audio.h>
+ 
+ #include "banshee-player-vis.h"
+ 
+ #define SLICE_SIZE 735
+ 
+ static GstStaticCaps vis_data_sink_caps = GST_STATIC_CAPS (
+-    "audio/x-raw-float, "
++    "audio/x-raw, "
++    "format = (string) " GST_AUDIO_NE(F32) ", "
+     "rate = (int) 44100, "
+-    "channels = (int) 2, "
+-    "endianness = (int) BYTE_ORDER, "
+-    "width = (int) 32"
++    "channels = (int) 2"
+ );
+ 
+ // ---------------------------------------------------------------------------
+@@ -48,6 +48,7 @@ static void
+ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer userdata)
+ {
+     BansheePlayer *player = (BansheePlayer*)userdata;
++    GstCaps *caps;
+     GstStructure *structure;
+     gint channels, wanted_size;
+     gfloat *data;
+@@ -69,14 +70,16 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u
+         player->vis_thawing = FALSE;
+     }
+     
+-    structure = gst_caps_get_structure (gst_buffer_get_caps (buffer), 0);
++    caps = gst_pad_get_current_caps (pad);
++    structure = gst_caps_get_structure (caps, 0);
+     gst_structure_get_int (structure, "channels", &channels);
++    gst_caps_unref (caps);
+     
+     wanted_size = channels * SLICE_SIZE * sizeof (gfloat);
+ 
+-    gst_adapter_push (player->vis_buffer, gst_buffer_copy (buffer));
++    gst_adapter_push (player->vis_buffer, gst_buffer_ref (buffer));
+     
+-    while ((data = (gfloat *)gst_adapter_peek (player->vis_buffer, wanted_size)) != NULL) {
++    while ((data = (gfloat *)gst_adapter_map (player->vis_buffer, wanted_size)) != NULL) {
+         gfloat *deinterlaced = g_malloc (wanted_size);
+         gfloat *specbuf = g_new (gfloat, SLICE_SIZE * 2);
+ 
+@@ -124,6 +127,7 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u
+         g_free (deinterlaced);
+         g_free (specbuf);
+ 
++        gst_adapter_unmap (player->vis_buffer);
+         gst_adapter_flush (player->vis_buffer, wanted_size);
+     }
+ }
+@@ -132,65 +136,28 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u
+ // Internal Functions
+ // ---------------------------------------------------------------------------
+ 
+-static void
+-_bp_vis_pipeline_block_callback (GstPad *pad, gboolean blocked, gpointer data)
++static GstPadProbeReturn
++_bp_vis_pipeline_event_probe (GstPad *pad, GstPadProbeInfo *info, gpointer data)
+ {
+     BansheePlayer *player = (BansheePlayer *) data;
++    GstEvent *event;
+ 
+-    if (!blocked) {
+-        // Set thawing mode (discards buffers that are too old from the queue).
+-        player->vis_thawing = TRUE;
+-    }
+-}
+-
+-static void
+-_bp_vis_pipeline_set_blocked (BansheePlayer *player, gboolean blocked)
+-{
+-    GstPad *queue_sink;
+-
+-    if (player->vis_resampler == NULL)
+-        return;
+-
+-    queue_sink = gst_element_get_static_pad (player->vis_resampler, "src");
+-
+-    gst_pad_set_blocked_async (queue_sink, blocked, _bp_vis_pipeline_block_callback, (gpointer) player);
+-
+-    gst_object_unref (GST_OBJECT (queue_sink));
+-}
+-
+-static gboolean
+-_bp_vis_pipeline_event_probe (GstPad *pad, GstEvent *event, gpointer data)
+-{
+-    BansheePlayer *player = (BansheePlayer *) data;
++    if ((info->type & GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM) == 0)
++        return GST_PAD_PROBE_PASS;
+ 
++    event = GST_EVENT (info->data);
+     switch (GST_EVENT_TYPE (event)) {
+         case GST_EVENT_FLUSH_START:
+         case GST_EVENT_FLUSH_STOP:
+         case GST_EVENT_SEEK:
+-        case GST_EVENT_NEWSEGMENT:
++        case GST_EVENT_SEGMENT:
+         case GST_EVENT_CUSTOM_DOWNSTREAM:
+             player->vis_thawing = TRUE;
+ 
+         default: break;
+     }
+ 
+-    if (player->vis_enabled)
+-        return TRUE;
+-
+-    switch (GST_EVENT_TYPE (event)) {
+-    case GST_EVENT_EOS:
+-    case GST_EVENT_CUSTOM_DOWNSTREAM_OOB:
+-        _bp_vis_pipeline_set_blocked (player, FALSE);
+-        break;
+-    case GST_EVENT_CUSTOM_DOWNSTREAM:
+-    case GST_EVENT_NEWSEGMENT:
+-        _bp_vis_pipeline_set_blocked (player, TRUE);
+-        break;
+-
+-    default: break;
+-    }
+-
+-    return TRUE;
++    return GST_PAD_PROBE_PASS;
+ }
+ 
+ void
+@@ -212,9 +179,8 @@ _bp_vis_pipeline_setup (BansheePlayer *player)
+     // Core elements, if something fails here, it's the end of the world
+     audiosinkqueue = gst_element_factory_make ("queue", "vis-queue");
+ 
+-    pad = gst_element_get_static_pad (audiosinkqueue, "sink");
+-    gst_pad_add_event_probe (pad, G_CALLBACK (_bp_vis_pipeline_event_probe), player);
+-    gst_object_unref (GST_OBJECT (pad));
++    player->vis_event_probe_pad = gst_element_get_static_pad (audiosinkqueue, "sink");
++    player->vis_event_probe_id = gst_pad_add_probe (player->vis_event_probe_pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM, _bp_vis_pipeline_event_probe, player, NULL);
+ 
+     resampler = gst_element_factory_make ("audioresample", "vis-resample");
+     converter = gst_element_factory_make ("audioconvert", "vis-convert");
+@@ -255,7 +221,7 @@ _bp_vis_pipeline_setup (BansheePlayer *player)
+                       converter, fakesink, NULL);
+     
+     pad = gst_element_get_static_pad (audiosinkqueue, "sink");
+-    teepad = gst_element_get_request_pad (player->audiotee, "src%d");
++    teepad = gst_element_get_request_pad (player->audiotee, "src_%u");
+     gst_pad_link (teepad, pad);
+     gst_object_unref (GST_OBJECT (teepad));
+     gst_object_unref (GST_OBJECT (pad));
+@@ -270,14 +236,17 @@ _bp_vis_pipeline_setup (BansheePlayer *player)
+     player->vis_resampler = resampler;
+     player->vis_thawing = FALSE;
+     player->vis_enabled = FALSE;
+-
+-    // Disable the pipeline till we hear otherwise from managed land.
+-    _bp_vis_pipeline_set_blocked (player, TRUE);
+ }
+ 
+ void
+ _bp_vis_pipeline_destroy (BansheePlayer *player)
+ {
++    if (player->vis_event_probe_pad) {
++        gst_pad_remove_probe (player->vis_event_probe_pad, player->vis_event_probe_id);
++        gst_object_unref (GST_OBJECT (player->vis_event_probe_pad));
++        player->vis_event_probe_pad = NULL;
++    }
++
+     if (player->vis_buffer != NULL) {
+         gst_object_unref (player->vis_buffer);
+         player->vis_buffer = NULL;
+@@ -315,6 +284,5 @@ bp_set_vis_data_callback (BansheePlayer *player, BansheePlayerVisDataCallback cb
+ 
+     player->vis_data_cb = cb;
+ 
+-    _bp_vis_pipeline_set_blocked (player, cb == NULL);
+     player->vis_enabled = cb != NULL;
+ }
+diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c
+index c655a72..b8f98b8 100644
+--- a/libbanshee/banshee-player.c
++++ b/libbanshee/banshee-player.c
+@@ -250,12 +250,11 @@ bp_set_position (BansheePlayer *player, guint64 time_ms)
+ P_INVOKE guint64
+ bp_get_position (BansheePlayer *player)
+ {
+-    static GstFormat format = GST_FORMAT_TIME;
+     gint64 position;
+ 
+     g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0);
+ 
+-    if (player->playbin != NULL && gst_element_query_position (player->playbin, &format, &position)) {
++    if (player->playbin != NULL && gst_element_query_position (player->playbin, GST_FORMAT_TIME, &position)) {
+         return position / GST_MSECOND;
+     }
+     
+@@ -265,12 +264,11 @@ bp_get_position (BansheePlayer *player)
+ P_INVOKE guint64
+ bp_get_duration (BansheePlayer *player)
+ {
+-    static GstFormat format = GST_FORMAT_TIME;
+     gint64 duration;
+ 
+     g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0);
+ 
+-    if (player->playbin != NULL && gst_element_query_duration (player->playbin, &format, &duration)) {
++    if (player->playbin != NULL && gst_element_query_duration (player->playbin, GST_FORMAT_TIME, &duration)) {
+         return duration / GST_MSECOND;
+     }
+     
+@@ -446,7 +444,6 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
+     g_return_if_fail (IS_BANSHEE_PLAYER (player));
+     gint64 pos = -1;
+     GstState state;
+-    GstFormat format = GST_FORMAT_BYTES;
+     gboolean paused = FALSE;
+ 
+     // Gstreamer playbin do not support to set suburi during playback
+@@ -454,7 +451,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
+     gst_element_get_state (player->playbin, &state, NULL, 0);
+     paused = (state == GST_STATE_PAUSED);
+     if (state >= GST_STATE_PAUSED) {
+-        gst_element_query_position (player->playbin, &format, &pos);
++        gst_element_query_position (player->playbin, GST_FORMAT_BYTES, &pos);
+         gst_element_set_state (player->playbin, GST_STATE_READY);
+         // Force to wait asynch operation
+         gst_element_get_state (player->playbin, &state, NULL, -1);
+@@ -467,7 +464,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
+     gst_element_get_state (player->playbin, &state, NULL, -1);
+ 
+     if (pos != -1) {
+-        gst_element_seek_simple (player->playbin, format, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos);
++        gst_element_seek_simple (player->playbin, GST_FORMAT_BYTES, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos);
+     }
+ }
+ 
+diff --git a/libbanshee/banshee-ripper.c b/libbanshee/banshee-ripper.c
+index e0e8c85..b3f8fed 100644
+--- a/libbanshee/banshee-ripper.c
++++ b/libbanshee/banshee-ripper.c
+@@ -85,7 +85,6 @@ br_raise_error (BansheeRipper *ripper, const gchar *error, const gchar *debug)
+ static gboolean
+ br_iterate_timeout (BansheeRipper *ripper)
+ {
+-    GstFormat format = GST_FORMAT_TIME;
+     GstState state;
+     gint64 position;
+     
+@@ -96,7 +95,7 @@ br_iterate_timeout (BansheeRipper *ripper)
+         return TRUE;
+     }
+ 
+-    if (!gst_element_query_position (ripper->cddasrc, &format, &position)) {
++    if (!gst_element_query_position (ripper->cddasrc, GST_FORMAT_TIME, &position)) {
+         return TRUE;
+     }
+     
+@@ -142,8 +141,9 @@ br_encoder_probe_mime_type (GstBin *bin)
+         GstIterator *pad_iter = gst_element_iterate_src_pads (element);
+         
+         BANSHEE_GST_ITERATOR_ITERATE (pad_iter, GstPad *, pad, TRUE, {
+-            GstStructure *str = GST_PAD_CAPS (pad) != NULL
+-                ? gst_caps_get_structure (GST_PAD_CAPS (pad), 0)
++            GstCaps *caps = gst_pad_get_current_caps (pad);
++            GstStructure *str = caps != NULL
++                ? gst_caps_get_structure (caps, 0)
+                 : NULL;
+ 
+             if (str != NULL) {
+@@ -171,11 +171,8 @@ br_encoder_probe_mime_type (GstBin *bin)
+                     preferred_mimetype = mimetype;    
+                 }
+             }
+-            
+-            gst_object_unref (pad);
++            gst_caps_unref (caps);
+         });
+-        
+-        gst_object_unref (element);
+     });
+ 
+     return preferred_mimetype;
+@@ -271,7 +268,7 @@ br_pipeline_construct (BansheeRipper *ripper)
+         return FALSE;
+     }
+ 
+-    ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc");
++    ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc", NULL);
+     if (ripper->cddasrc == NULL) {
+         br_raise_error (ripper, _("Could not initialize element from cdda URI"), NULL);
+         return FALSE;
+@@ -405,7 +402,6 @@ br_rip_track (BansheeRipper *ripper, gint track_number, gchar *output_path,
+             
+             // We'll warn the user in the UI if we can't tag the encoded audio files
+             *tagging_supported = TRUE;
+-            gst_object_unref (element);
+         }
+     });
+     
+diff --git a/libbanshee/banshee-tagger.c b/libbanshee/banshee-tagger.c
+index ca15e8f..762dfa9 100644
+--- a/libbanshee/banshee-tagger.c
++++ b/libbanshee/banshee-tagger.c
+@@ -69,7 +69,7 @@ bt_tag_list_foreach (const GstTagList *list, const gchar *tag, gpointer userdata
+ GstTagList *
+ bt_tag_list_new ()
+ {
+-    return gst_tag_list_new ();
++    return gst_tag_list_new_empty ();
+ }
+ 
+ void
+diff --git a/libbanshee/banshee-transcoder.c b/libbanshee/banshee-transcoder.c
+index 10fc35c..0e241f0 100644
+--- a/libbanshee/banshee-transcoder.c
++++ b/libbanshee/banshee-transcoder.c
+@@ -64,14 +64,13 @@ gst_transcoder_raise_error(GstTranscoder *transcoder, const gchar *error, const
+ static gboolean
+ gst_transcoder_iterate_timeout(GstTranscoder *transcoder)
+ {
+-    GstFormat format = GST_FORMAT_TIME;
+     gint64 position;
+     gint64 duration;
+ 
+     g_return_val_if_fail(transcoder != NULL, FALSE);
+ 
+-    if(!gst_element_query_duration(transcoder->pipeline, &format, &duration) ||
+-        !gst_element_query_position(transcoder->sink_bin, &format, &position)) {
++    if(!gst_element_query_duration(transcoder->pipeline, GST_FORMAT_TIME, &duration) ||
++        !gst_element_query_position(transcoder->sink_bin, GST_FORMAT_TIME, &position)) {
+         return TRUE;
+     }
+ 
+@@ -196,14 +195,14 @@ gst_transcoder_new_decoded_pad(GstElement *decodebin, GstPad *pad,
+ 
+     g_return_if_fail(transcoder != NULL);
+ 
+-    audiopad = gst_element_get_pad(transcoder->sink_bin, "sink");
++    audiopad = gst_element_get_static_pad(transcoder->sink_bin, "sink");
+     
+     if(GST_PAD_IS_LINKED(audiopad)) {
+         g_object_unref(audiopad);
+         return;
+     }
+ 
+-    caps = gst_pad_get_caps(pad);
++    caps = gst_pad_query_caps(pad, NULL);
+     str = gst_caps_get_structure(caps, 0);
+     
+     if(!g_strrstr(gst_structure_get_name(str), "audio")) {
+@@ -235,19 +234,19 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder,
+     
+     transcoder->pipeline = gst_pipeline_new("pipeline");
+ 
+-    source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source");
++    source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source", NULL);
+     if(source_elem == NULL) {
+         gst_transcoder_raise_error(transcoder, _("Could not create source element"), NULL);
+         return FALSE;
+     }
+ 
+-    decoder_elem = gst_element_factory_make("decodebin2", "decodebin2");
++    decoder_elem = gst_element_factory_make("decodebin", "decodebin");
+     if(decoder_elem == NULL) {
+-        gst_transcoder_raise_error(transcoder, _("Could not create decodebin2 plugin"), NULL);
++        gst_transcoder_raise_error(transcoder, _("Could not create decodebin plugin"), NULL);
+         return FALSE;
+     }
+     
+-    sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink");
++    sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink", NULL);
+     if(sink_elem == NULL) {
+         gst_transcoder_raise_error(transcoder, _("Could not create sink element"), NULL);
+         return FALSE;
+@@ -277,7 +276,7 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder,
+          return FALSE;
+     }
+ 
+-    encoder_pad = gst_element_get_pad(conv_elem, "sink");
++    encoder_pad = gst_element_get_static_pad(conv_elem, "sink");
+     if(encoder_pad == NULL) {
+         gst_transcoder_raise_error(transcoder, _("Could not get sink pad from encoder"), NULL);
+         return FALSE;
+-- 
+1.7.10.4
\ No newline at end of file
diff --git a/extra/baobab/PKGBUILD b/extra/baobab/PKGBUILD
index 973d005ac..7c9ae5a38 100644
--- a/extra/baobab/PKGBUILD
+++ b/extra/baobab/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 161979 2012-06-17 22:51:02Z ibiru $
+# $Id: PKGBUILD 171029 2012-11-15 14:16:00Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
+
 pkgname=baobab
-pkgver=3.4.1
-pkgrel=2
+pkgver=3.6.3
+pkgrel=1
 pkgdesc="A graphical directory tree analyzer"
 arch=(i686 x86_64 mips64el)
 url="http://gnome.org"
 license=('GPL2')
-depends=('dconf' 'gtk3' 'gsettings-desktop-schemas' 'libgtop')
-makedepends=('intltool' 'itstool')
+depends=('dconf' 'gtk3' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('intltool' 'itstool' 'vala' 'gobject-introspection')
 groups=('gnome-extra')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0c9743caf8cdc6dd69d694453cd57816c1ca0514cf51111022846088021949f7')
+sha256sums=('24ec516b12da234f1bd7bff3ccb2be9a46dff0b1fb0fa6cd79ff50549a295eb1')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -23,6 +24,9 @@ build() {
 package() {
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
+
+  # https://bugs.archlinux.org/task/31861
+  sed -i '/MimeType/d' "$pkgdir/usr/share/applications/baobab.desktop"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/baobab/baobab.install b/extra/baobab/baobab.install
index 847019792..5a3c24041 100644
--- a/extra/baobab/baobab.install
+++ b/extra/baobab/baobab.install
@@ -1,6 +1,7 @@
 post_install() {
     glib-compile-schemas /usr/share/glib-2.0/schemas
     gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/extra/bigloo/PKGBUILD b/extra/bigloo/PKGBUILD
index 93ad1c52d..6d6075c7b 100644
--- a/extra/bigloo/PKGBUILD
+++ b/extra/bigloo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162148 2012-06-22 11:52:24Z juergen $
+# $Id: PKGBUILD 171315 2012-11-17 05:25:07Z eric $
 # Maintainer: Jürgen Hötzel <juergen@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=bigloo
-_pkgver=3.8c
+_pkgver=3.9a
 pkgver=${_pkgver/-/_}
 pkgrel=1
 pkgdesc="Fast scheme compiler"
@@ -12,12 +12,12 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www-sop.inria.fr/mimosa/fp/Bigloo/"
 license=('GPL' 'LGPL')
 depends=()
-makedepends=('java-environment' 'emacs' 'zip' 'openssl' 'sqlite' 'alsa-lib' 'flac' 'avahi')
-optdepends=('emacs' 'java-environment' 'zip' 'openssl' 'sqlite' 'alsa-lib' 'flac' 'avahi')
+makedepends=('java-environment' 'emacs' 'zip' 'sqlite' 'alsa-lib' 'flac' 'avahi')
+optdepends=('emacs' 'java-environment' 'zip' 'sqlite' 'alsa-lib' 'flac' 'avahi')
 options=('!makeflags')
 install=bigloo.install
 source=(ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${pkgname}${_pkgver}.tar.gz)
-md5sums=('ceea21b14c8f7270be5223dce713ec6d')
+md5sums=('7091f6f54cb5f63768a8152085d1bd02')
 
 build() {
   cd "${srcdir}/${pkgname}${_pkgver}"
diff --git a/extra/bin86/PKGBUILD b/extra/bin86/PKGBUILD
index a5dbd1c25..a398fd4df 100644
--- a/extra/bin86/PKGBUILD
+++ b/extra/bin86/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 142339 2011-11-08 16:07:12Z dreisner $
+# $Id: PKGBUILD 169577 2012-10-23 19:27:38Z eric $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=bin86
-pkgver=0.16.18
-pkgrel=3
+pkgver=0.16.19
+pkgrel=1
 pkgdesc="A complete 8086 assembler and loader"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.debath.co.uk/"
 depends=('glibc')
-source=("http://www.debath.co.uk/dev86//$pkgname-$pkgver.tar.gz"
+source=("http://www.debath.co.uk/dev86/$pkgname-$pkgver.tar.gz"
         bin86-0.16.17-x86_64-1.patch)
-md5sums=('914068fb649b93642d1cf21857b75699'
+md5sums=('0a20d79765a6855ce7c8c2d02b23a0f0'
          '92bdce7b0655cd2e9f83c83fc56d128e')
 
 build() {
diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
index b1c13c445..600b1a6fd 100644
--- a/extra/bind/PKGBUILD
+++ b/extra/bind/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 168392 2012-10-09 22:16:55Z bisson $
+# $Id: PKGBUILD 171500 2012-11-18 07:59:37Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
@@ -6,7 +6,7 @@
 pkgname=bind
 _pkgver=9.9.2
 pkgver=${_pkgver//-/.}
-pkgrel=1
+pkgrel=2
 pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
 url='http://www.isc.org/software/bind/'
 license=('custom:ISC')
@@ -16,6 +16,7 @@ depends=('openssl' 'krb5' 'libxml2')
 source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
         'root.hint::http://www.internic.net/zones/named.root'
         'remove-tools.patch'
+        'tmpfiles.d'
         'named'
         'named.conf'
         'named.conf.d'
@@ -26,11 +27,12 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
 sha1sums=('eb9fa7b497d67ce61a120cb96c302381bc385324'
           'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
           '14264affa71bcfe7703d0fb7c3556c4c47efaa8b'
-          '46232e9db243c6c05e170a1781d7a7f413be5d03'
-          '5ca7a5f2a132548a090a045a2df3acea6b35d9eb'
+          'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
+          '47f9ac4f6f70bc9167c1cf7859a298531197ad20'
+          'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726'
           '7848edbfb9a848843f57c11c02b0289eefd42d00'
           '7de92fff4b90c4821b3b133a05affd186fb93951'
-          '9ffb5c3f72390a517aeae557e32349d5d278cb63'
+          '3fe1f0b5c1a51dc1db9ebe5e173d18c52c97169b'
           '76a0d4cd1b913db177a5a375bebc47e5956866ec'
           '53be0f1437ebe595240d8dbdd819939582b97fb9')
 
@@ -71,6 +73,7 @@ package() {
 	install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind
 
 	install -D -m755 ../named "${pkgdir}"/etc/rc.d/named
+	install -D -m644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/named.conf
 	install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named
 	install -D -m644 ../named.service "${pkgdir}"/usr/lib/systemd/system/named.service
 	install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named
diff --git a/extra/bind/named b/extra/bind/named
index 7907f9983..65dd0fe82 100755
--- a/extra/bind/named
+++ b/extra/bind/named
@@ -4,10 +4,7 @@
 . /etc/rc.d/functions
 . /etc/conf.d/named
 
-[[ -d /var/run/named ]] || mkdir -p /var/run/named
-chown named:named /var/run/named
-
-PIDFILE=/var/run/named/named.pid
+PIDFILE=/run/named/named.pid
 PID=$(cat $PIDFILE 2>/dev/null)
 readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; }
 
diff --git a/extra/bind/named.conf b/extra/bind/named.conf
index 38fb12cbe..4aaf19a49 100644
--- a/extra/bind/named.conf
+++ b/extra/bind/named.conf
@@ -4,7 +4,7 @@
 
 options {
 	directory "/var/named";
-	pid-file "/var/run/named/named.pid";
+	pid-file "/run/named/named.pid";
 	auth-nxdomain yes;
 	datasize default;
 // Uncomment these to enable IPv6 connections support
diff --git a/extra/bind/named.logrotate b/extra/bind/named.logrotate
index ef1a2d032..5f9a47693 100644
--- a/extra/bind/named.logrotate
+++ b/extra/bind/named.logrotate
@@ -1,6 +1,6 @@
 /var/log/named.log {
    missingok
    postrotate
-      /bin/kill -HUP `cat /var/run/named/named.pid 2>/dev/null` 2>/dev/null || true
+      /bin/kill -HUP `cat /run/named/named.pid 2>/dev/null` 2>/dev/null || true
    endscript
 }
diff --git a/extra/bind/tmpfiles.d b/extra/bind/tmpfiles.d
new file mode 100644
index 000000000..1cfc82d08
--- /dev/null
+++ b/extra/bind/tmpfiles.d
@@ -0,0 +1 @@
+d /run/named 0750 named named -
diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index d0f3a6348..42b60ffaf 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169422 2012-10-20 20:58:46Z dreisner $
+# $Id: PKGBUILD 170572 2012-11-09 00:21:44Z eric $
 
 # Contributor: FUBAR <mrfubar@gmail.com>
 # Contributor: simo <simo@archlinux.org>
@@ -9,15 +9,14 @@
 
 pkgname=bitlbee
 pkgver=3.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 url='http://www.bitlbee.org/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('openssl' 'glib2')
-makedepends=('asciidoc' 'libotr')
-optdepends=('skype4py: to use skyped'
-            'libotr: for OTR encryption support'
+makedepends=('asciidoc' 'libotr3')
+optdepends=('libotr3: for OTR encryption support'
             'xinetd: to run bitlbee through xinetd')
 source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
         'xinetd'
@@ -32,27 +31,31 @@ backup=('etc/bitlbee/bitlbee.conf'
         'etc/xinetd.d/bitlbee')
 install=bitlbee.install
 
-build() { 
-	cd "$pkgname-$pkgver"
+build() {
+  cd "$pkgname-$pkgver"
 
-	./configure \
-		--prefix=/usr \
-		--etcdir=/etc/bitlbee \
-		--pidfile=/run/bitlbee/bitlbee.pid \
-		--ipcsocket=/run/bitlbee/bitlbee.sock \
-		--systemdsystemunitdir=/usr/lib/systemd/system \
-		--ssl=openssl \
-		--strip=0 \
-		--otr=plugin
+  ./configure \
+    --prefix=/usr \
+    --etcdir=/etc/bitlbee \
+    --pidfile=/run/bitlbee/bitlbee.pid \
+    --ipcsocket=/run/bitlbee/bitlbee.sock \
+    --systemdsystemunitdir=/usr/lib/systemd/system \
+    --ssl=openssl \
+    --strip=0 \
+    --otr=plugin
 
-	make
+  # hacky: build against libotr3
+  sed -i 's,^OTRFLAGS=.*,OTRFLAGS=-lotr3,' Makefile.settings
+  sed -i 's,#include.*libotr,&3,' otr.h
+
+  make
 }
 
 package() {
-	make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev}
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev}
 
-	install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
-	install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee"
-	install -Dm755 "$srcdir/rc.d" "$pkgdir/etc/rc.d/bitlbee"
-	install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
+  install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
+  install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee"
+  install -Dm755 "$srcdir/rc.d" "$pkgdir/etc/rc.d/bitlbee"
+  install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
 }
diff --git a/extra/bmp-wma/PKGBUILD b/extra/bmp-wma/PKGBUILD
index 55449d66f..a8b78b1c5 100644
--- a/extra/bmp-wma/PKGBUILD
+++ b/extra/bmp-wma/PKGBUILD
@@ -20,7 +20,7 @@ md5sums=('8dcf3fcdb10e8e2e386f70745812412b'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np0 -i "${srcdir}/bmp-wma-gcc4.patch"
-  if [ "${CARCH}" = "x86_64" ]; then
+  if [ "${CARCH}" != "i686" ]; then
     export CFLAGS="${CFLAGS} -fPIC"
   fi
   ./configure --prefix=/usr --disable-static
diff --git a/extra/bmp/PKGBUILD b/extra/bmp/PKGBUILD
index ca1f9132f..d7d716df4 100644
--- a/extra/bmp/PKGBUILD
+++ b/extra/bmp/PKGBUILD
@@ -23,7 +23,7 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p0 -i ../${pkgver}-visualization.patch 
   patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch 
-  LIBS+="-lm" ./configure --prefix=/usr --mandir=/usr/share/man 
+  LIBS+="-lgmodule-2.0 -lm" ./configure --prefix=/usr --mandir=/usr/share/man 
   make 
 }
 
diff --git a/extra/boo/PKGBUILD b/extra/boo/PKGBUILD
index e1f818002..27ae5ff7e 100644
--- a/extra/boo/PKGBUILD
+++ b/extra/boo/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=boo
 pkgver=0.9.4.9
 pkgrel=2
 pkgdesc="A wrist friendly language for the CLI"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://boo.codehaus.org/"
 license=('GPL')
 depends=('sh' 'mono' 'shared-mime-info')
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index 76ecd2a33..a032792f9 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163962 2012-07-23 02:59:56Z allan $
+# $Id: PKGBUILD 171511 2012-11-18 10:27:36Z andyrtr $
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Kritoke <kritoke@gamebox.net>
@@ -8,7 +8,7 @@ pkgbase=boost
 pkgname=('boost-libs' 'boost')
 pkgver=1.50.0
 _boostver=${pkgver//./_}
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.boost.org/"
 makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
@@ -22,7 +22,7 @@ build() {
   # set python path for bjam
   cd "${srcdir}/${pkgbase}_${_boostver}/tools"
   echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam
-  echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam
+  echo "using python : 3.3 : /usr/bin/python3 : /usr/include/python3.3m : /usr/lib ;" >> build/v2/user-config.jam
   echo "using mpi ;" >> build/v2/user-config.jam
 
   cd "${srcdir}"/${pkgbase}_${_boostver}
@@ -77,7 +77,7 @@ build() {
 package_boost() {
     pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
     depends=("boost-libs=${pkgver}")
-    optdepends=('python: for python bindings'
+    optdepends=('python3: for python bindings'
                 'python2: for python2 bindings'
 		'boost-build: to use boost jam for building your project.')
 
diff --git a/extra/botan/PKGBUILD b/extra/botan/PKGBUILD
index 6c5d4ddec..58be3787e 100644
--- a/extra/botan/PKGBUILD
+++ b/extra/botan/PKGBUILD
@@ -20,6 +20,7 @@ build() {
   cd "${srcdir}/Botan-${pkgver}"
   sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' configure.py
   ./configure.py --prefix=/usr
+  sed -i 's/-mabi=64//' Makefile # not needed and incorrect on N32
   make 
 }
 
diff --git a/extra/brasero/PKGBUILD b/extra/brasero/PKGBUILD
index e1778fb37..244fcc7b5 100644
--- a/extra/brasero/PKGBUILD
+++ b/extra/brasero/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 156713 2012-04-23 09:03:43Z ibiru $
+# $Id: PKGBUILD 170846 2012-11-12 15:20:28Z heftig $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=brasero
-pkgver=3.4.1
+pkgver=3.6.1
 pkgrel=1
 pkgdesc="A disc burning application for Gnome"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org/projects/brasero"
 license=('GPL')
 options=('!libtool' '!emptydirs')
-depends=('gtk3' 'gstreamer0.10-base-plugins' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info'  'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql')
-makedepends=('gtk-doc' 'intltool' 'libburn' 'libisofs' 'nautilus' 'gobject-introspection' 'gconf')
+depends=('gtk3' 'gst-plugins-base' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info'  'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql')
+makedepends=('gtk-doc' 'intltool' 'libburn' 'libisofs' 'nautilus' 'gobject-introspection' 'gconf' 'itstool' 'docbook-xsl')
 optdepends=('libburn: alternative back-end'
             'libisofs: libburn back-end'
             'dvdauthor: video project'
@@ -21,7 +21,7 @@ optdepends=('libburn: alternative back-end'
 replaces=('nautilus-cd-burner')
 install=brasero.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e4fcd5dca1c7b0a930a43ae59953fa96db3f6beef41ceedb2f0ef8636e26a7a6')
+sha256sums=('d293eb28dc45af3535f09cf91aa6ccc523f3f3d8b7ad3339b5e79b4acc19b932')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD
index 83702c08c..08ab767ba 100644
--- a/extra/brltty/PKGBUILD
+++ b/extra/brltty/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 167366 2012-10-01 15:08:16Z tomegun $
+# $Id: PKGBUILD 172193 2012-12-02 04:25:56Z stephane $
 # Maintainer:
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=brltty
-pkgver=4.3
-pkgrel=6
+pkgver=4.4
+pkgrel=1
 pkgdesc="Braille display driver for Linux/Unix"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mielke.cc/brltty"
 license=('GPL' 'LGPL')
-depends=('libxaw' 'at-spi2-core' 'gpm' 'icu' 'python2' 'tcl' 'atk' 'libxtst' 'pyrex')
+depends=('libxaw' 'at-spi2-core' 'gpm' 'icu' 'tcl' 'atk' 'pyrex')
 makedepends=('bluez')
 optdepends=('bluez: bluetooth support')
 backup=(etc/brltty.conf etc/conf.d/brltty.conf)
@@ -19,8 +19,11 @@ install=brltty.install
 source=(http://mielke.cc/$pkgname/releases/$pkgname-$pkgver.tar.gz
         'brltty'
         'brltty.conf'
-	'brltty.service')
-
+	     'brltty.service')
+md5sums=('8ebe96efe679f5f6ccff08928fec5b26'
+         '831ebaf0c56091702929c68805d20c4f'
+         'a8ab8b3dd059e96e1734bc9cdcf844fc'
+         '7acecd700b9f94d76fe4a6ad56cb0448')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr \
@@ -30,7 +33,6 @@ build() {
     --with-screen-driver=a2 \
     --enable-gpm \
     --disable-java-bindings \
-    --disable-caml-bindings \
     PYTHON=/usr/bin/python2
 
   make
@@ -44,7 +46,3 @@ package() {
   install -D -m644 Documents/brltty.conf "$pkgdir/etc/brltty.conf"
   install -D -m644 "$srcdir/brltty.service" "$pkgdir/usr/lib/systemd/system/brltty.service"
 }
-md5sums=('5ada573f88df32b6150db3b9a620e20b'
-         '831ebaf0c56091702929c68805d20c4f'
-         'a8ab8b3dd059e96e1734bc9cdcf844fc'
-         '7acecd700b9f94d76fe4a6ad56cb0448')
diff --git a/extra/burp/PKGBUILD b/extra/burp/PKGBUILD
index e8e1954b6..17caf175e 100644
--- a/extra/burp/PKGBUILD
+++ b/extra/burp/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 162259 2012-06-24 15:44:41Z dreisner $
+# $Id: PKGBUILD 170189 2012-11-04 15:22:01Z dreisner $
 # Maintainer: Dave Reisner <d@falconindy.com>
 
 pkgname=burp
-pkgver=1.6.9
+pkgver=2
 pkgrel=1
 pkgdesc="A simple AUR uploader"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,8 +10,9 @@ url="http://github.com/falconindy/burp"
 license=('GPL')
 depends=('glibc' 'curl')
 makedepends=('perl')
-source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('3ae883cf6283e860f613668619b8d3ce')
+source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+md5sums=('390436816f38d43b3ffb1079add4fa8e'
+         '2b16c8187c299d249446b251fe762aed')
 
 build() {
   make -C "$pkgname-$pkgver"
diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD
index c7ae4340b..b2e52439e 100644
--- a/extra/bzflag/PKGBUILD
+++ b/extra/bzflag/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 168598 2012-10-13 11:46:40Z andyrtr $
+# $Id: PKGBUILD 169739 2012-10-27 23:41:24Z eric $
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=bzflag
 pkgver=2.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Multiplayer 3D tank battle game'
 url='http://bzflag.org/'
 license=('LGPL')
 options=('!libtool')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('curl' 'glew' 'glu' 'sdl')
+makedepends=('mesa') # glu requires <GL/gl.h>
 source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2")
 sha1sums=('36c67c0734a1318b34b39ed0da49606e05ebd291')
 
diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD
index 9c0d19771..040c9363f 100644
--- a/extra/cabal-install/PKGBUILD
+++ b/extra/cabal-install/PKGBUILD
@@ -3,24 +3,20 @@
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=cabal-install
-pkgver=1.16.0
-pkgrel=2
+pkgver=1.16.0.2
+pkgrel=1
 pkgdesc="The command-line interface for Cabal and Hackage."
 url="http://hackage.haskell.org/package/cabal-install"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('haskell-http=4000.2.4-1' 'haskell-zlib=0.5.3.3-5' 'haskell-mtl=2.1.2-1' 'haskell-network=2.3.1.0-1' 'haskell-random=1.0.1.1-3')
 depends=('ghc' 'gmp' 'zlib')
-source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz"
-        '0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch')
-md5sums=('da046116eee7664158411fa9e2cf6b14'
-         'd4705a398588efe6dbbcf6f4c3185a7d')
+source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz")
+md5sums=('18e07d5b431d19d94cc5279a5e6fbfee')
 
 build() {
   cd cabal-install-${pkgver}
 
-  patch -Np1 -i ${srcdir}/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch
-
   runhaskell Setup configure \
     --enable-shared \
     --enable-split-objs \
diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD
index b83e58225..433dbf83b 100644
--- a/extra/cairo/PKGBUILD
+++ b/extra/cairo/PKGBUILD
@@ -1,46 +1,26 @@
-# $Id: PKGBUILD 167546 2012-10-02 15:03:57Z foutrelis $
+# $Id: PKGBUILD 170782 2012-11-11 10:23:13Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Brice Carpentier <brice@daknet.org>
 
 pkgname=cairo
-#_gitdate=20120426
-#_gitver=957a9cc619965178a8927d114fe852034fc2385c
-pkgver=1.12.2
-pkgrel=3
+pkgver=1.12.8
+pkgrel=2
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL' 'MPL')
 url="http://cairographics.org/"
-depends=('libpng' 'libxrender' 'fontconfig' 'pixman' 'glib2' 'sh')
+depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'sh')
 makedepends=('librsvg' 'poppler-glib' 'libspectre' 'gtk-doc') # 'libdrm')
+[ "$CARCH" != "mips64el" ] && makedepends+=('valgrind')
 optdepends=('xcb-util: for XCB backend') # really needed?
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
 options=('!libtool')
-source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz
-        #$pkgname-$pkgver.tar.gz::http://cgit.freedesktop.org/cairo/snapshot/cairo-${_gitver}.tar.gz 
-        cairo-1.10.0-buggy_gradients.patch
-        cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch
-        cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch
-        #git_fixes.patch 
-)
-md5sums=('87649eb75789739d517c743e94879e51'
-         '9b323790dab003e228c6955633cb888e'
-         '75ec73746cfaefcbed0e9b2a9f76bf00'
-         '56f64466fd70ead732b00691464144f2')
+source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz)
+sha1sums=('56a10bf3b804367c97734d655c23a9f652d5c297')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  #cd ${srcdir}/${pkgname}-${_gitver}
-  patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch
-  # https://bugs.freedesktop.org/show_bug.cgi?id=50852
-  patch -Np1 -i ${srcdir}/cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch
-  # https://bugs.freedesktop.org/show_bug.cgi?id=51443
-  patch -Np1 -i ${srcdir}/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch
-  # status is 2012-04-26 last commit: image: Fix typo in _blit_spans()
-  #patch -Np1 -i ${srcdir}/git_fixes.patch
-  autoreconf -vfi
-  #./autogen.sh --prefix=/usr \
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
@@ -53,13 +33,11 @@ build() {
 }
 
 #check() {
-#  #cd "$srcdir/$pkgname-$pkgver"
-#  cd $srcdir/$pkgname-${_gitver}
-#  make -k check || /bin/true # 165 Passed, 316 Failed [3 crashed, 10 expected], 23 Skipped
+#  cd "$srcdir/$pkgname-$pkgver"
+#  make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped
 #}
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  #cd $srcdir/$pkgname-${_gitver}
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/cairo/git_fixes.diff b/extra/cairo/git_fixes.diff
new file mode 100644
index 000000000..3fc7ff659
--- /dev/null
+++ b/extra/cairo/git_fixes.diff
@@ -0,0 +1,934 @@
+From e43f53bf7f3d371116f31f22ab9754b08b5abe7f Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon, 22 Oct 2012 12:47:11 +0000
+Subject: version: Post release bump to 1.12.7
+
+---
+diff --git a/cairo-version.h b/cairo-version.h
+index dc89a19..c685909 100644
+--- a/cairo-version.h
++++ b/cairo-version.h
+@@ -3,6 +3,6 @@
+ 
+ #define CAIRO_VERSION_MAJOR 1
+ #define CAIRO_VERSION_MINOR 12
+-#define CAIRO_VERSION_MICRO 6
++#define CAIRO_VERSION_MICRO 7
+ 
+ #endif
+--
+cgit v0.9.0.2-2-gbebe
+From 00feb8ce530a472abbde445b52d9ae8c99ec97f0 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri, 26 Oct 2012 09:51:31 +0000
+Subject: xlib/shm: Sanity check that the server handles XSendEvent with ShmCompletion
+
+Uli Schlachter suggested it would be wiser to complement our blacklist
+of known broken X/libXext with an explicit roundtrip to check for a
+BadValue error return when we try to use XSendEvent.
+
+Suggested-by: Uli Schlachter <psychon@znc.in>
+Reported-by: Martin Husemann <martin@duskware.de>
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c
+index ec0d334..17594b1 100644
+--- a/src/cairo-xlib-surface-shm.c
++++ b/src/cairo-xlib-surface-shm.c
+@@ -1128,8 +1128,60 @@ _cairo_xlib_shm_surface_is_idle (cairo_surface_t *surface)
+     (((major) * 10000000) + ((minor) * 100000) + ((patch) * 1000) + snap)
+ 
+ static cairo_bool_t
+-xorg_has_buggy_send_shm_completion_event(Display *dpy)
++has_broken_send_shm_event (cairo_xlib_display_t *display,
++			   cairo_xlib_shm_display_t *shm)
+ {
++    Display *dpy = display->display;
++    int (*old_handler) (Display *display, XErrorEvent *event);
++    XShmCompletionEvent ev;
++    XShmSegmentInfo info;
++
++    info.shmid = shmget (IPC_PRIVATE, 0x1000, IPC_CREAT | 0600);
++    if (info.shmid == -1)
++	return TRUE;
++
++    info.readOnly = FALSE;
++    info.shmaddr = shmat (info.shmid, NULL, 0);
++    if (info.shmaddr == (char *) -1) {
++	shmctl (info.shmid, IPC_RMID, NULL);
++	return TRUE;
++    }
++
++    ev.type = shm->event;
++    ev.drawable = shm->window;
++    ev.major_code = shm->opcode;
++    ev.minor_code = X_ShmPutImage;
++
++    ev.shmseg = info.shmid;
++    ev.offset = 0;
++
++    assert (CAIRO_MUTEX_IS_LOCKED (_cairo_xlib_display_mutex));
++    _x_error_occurred = FALSE;
++
++    XLockDisplay (dpy);
++    XSync (dpy, False);
++    old_handler = XSetErrorHandler (_check_error_handler);
++
++    XShmAttach (dpy, &info);
++    XSendEvent (dpy, ev.drawable, False, 0, (XEvent *)&ev);
++    XShmDetach (dpy, &info);
++
++    XSync (dpy, False);
++    XSetErrorHandler (old_handler);
++    XUnlockDisplay (dpy);
++
++    shmctl (info.shmid, IPC_RMID, NULL);
++    shmdt (info.shmaddr);
++
++    return _x_error_occurred;
++}
++
++static cairo_bool_t
++xorg_has_buggy_send_shm_completion_event(cairo_xlib_display_t *display,
++					 cairo_xlib_shm_display_t *shm)
++{
++    Display *dpy = display->display;
++
+     /* As libXext sets the SEND_EVENT bit in the ShmCompletionEvent,
+      * the Xserver may crash if it does not take care when processing
+      * the event type. For instance versions of Xorg prior to 1.11.1
+@@ -1141,8 +1193,12 @@ xorg_has_buggy_send_shm_completion_event(Display *dpy)
+      *
+      * Remove the SendEvent bit (0x80) before doing range checks on event type.
+      */
+-    return (strstr (ServerVendor (dpy), "X.Org") != NULL &&
+-	    VendorRelease (dpy) < XORG_VERSION_ENCODE(1,11,0,1));
++    if (strstr (ServerVendor (dpy), "X.Org") != NULL &&
++	VendorRelease (dpy) < XORG_VERSION_ENCODE(1,11,0,1))
++	return TRUE;
++
++    /* For everyone else check that no error is generated */
++    return has_broken_send_shm_event (display, shm);
+ }
+ 
+ void
+@@ -1162,6 +1218,15 @@ _cairo_xlib_display_init_shm (cairo_xlib_display_t *display)
+     if (unlikely (shm == NULL))
+ 	return;
+ 
++    codes = XInitExtension (display->display, SHMNAME);
++    if (codes == NULL) {
++	free (shm);
++	return;
++    }
++
++    shm->opcode = codes ->major_opcode;
++    shm->event = codes->first_event;
++
+     if (unlikely (_pqueue_init (&shm->info))) {
+ 	free (shm);
+ 	return;
+@@ -1177,16 +1242,12 @@ _cairo_xlib_display_init_shm (cairo_xlib_display_t *display)
+ 				 DefaultVisual (display->display, scr),
+ 				 CWOverrideRedirect, &attr);
+ 
+-    if (xorg_has_buggy_send_shm_completion_event(display->display))
++    if (xorg_has_buggy_send_shm_completion_event(display, shm))
+ 	has_pixmap = 0;
+ 
+     shm->has_pixmaps = has_pixmap ? MIN_PIXMAP_SIZE : 0;
+     cairo_list_init (&shm->pool);
+ 
+-    codes = XInitExtension (display->display, SHMNAME);
+-    shm->opcode = codes ->major_opcode;
+-    shm->event = codes->first_event;
+-
+     cairo_list_init (&shm->surfaces);
+ 
+     display->shm = shm;
+--
+cgit v0.9.0.2-2-gbebe
+From fdd2082f923012a1354be7086d03f78fb166695b Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri, 26 Oct 2012 09:51:31 +0000
+Subject: xlib: Check for both X.org and Xorg ServerVendors
+
+Martin Husemann reported that on his NetBSD machine the vendor was being
+reported as "The Xorg Foundation", a non-conformist separatist split of
+the Peoples' Liberation Army^W^W^W "The X.Org Foundation". Simply check
+for both during initialisation.
+
+Reported-by: Martin Husemann <martin@duskware.de>
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/cairo-xlib-display.c b/src/cairo-xlib-display.c
+index 67c0673..04c89b2 100644
+--- a/src/cairo-xlib-display.c
++++ b/src/cairo-xlib-display.c
+@@ -315,7 +315,7 @@ _cairo_xlib_device_create (Display *dpy)
+      *    safest to just blacklist all old-versioning-scheme X servers,
+      *    (just using VendorRelease < 70000000), as buggy_repeat=TRUE.
+      */
+-    if (strstr (ServerVendor (dpy), "X.Org") != NULL) {
++    if (_cairo_xlib_vendor_is_xorg (dpy)) {
+ 	if (VendorRelease (dpy) >= 60700000) {
+ 	    if (VendorRelease (dpy) < 70000000)
+ 		display->buggy_repeat = TRUE;
+diff --git a/src/cairo-xlib-private.h b/src/cairo-xlib-private.h
+index d2bd588..c328302 100644
+--- a/src/cairo-xlib-private.h
++++ b/src/cairo-xlib-private.h
+@@ -216,6 +216,13 @@ struct _cairo_xlib_proxy {
+     cairo_surface_t *owner;
+ };
+ 
++inline static cairo_bool_t
++_cairo_xlib_vendor_is_xorg (Display *dpy)
++{
++    const char *const vendor = ServerVendor (dpy);
++    return strstr (vendor, "X.Org") || strstr (vendor, "Xorg");
++}
++
+ cairo_private cairo_status_t
+ _cairo_xlib_surface_get_gc (cairo_xlib_display_t *display,
+                             cairo_xlib_surface_t *surface,
+diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c
+index 17594b1..89f51a9 100644
+--- a/src/cairo-xlib-surface-shm.c
++++ b/src/cairo-xlib-surface-shm.c
+@@ -1193,7 +1193,7 @@ xorg_has_buggy_send_shm_completion_event(cairo_xlib_display_t *display,
+      *
+      * Remove the SendEvent bit (0x80) before doing range checks on event type.
+      */
+-    if (strstr (ServerVendor (dpy), "X.Org") != NULL &&
++    if (_cairo_xlib_vendor_is_xorg (dpy) &&
+ 	VendorRelease (dpy) < XORG_VERSION_ENCODE(1,11,0,1))
+ 	return TRUE;
+ 
+--
+cgit v0.9.0.2-2-gbebe
+From d57e652f08f5ff7c334d01bc071962e6a131928f Mon Sep 17 00:00:00 2001
+From: Adrian Johnson <ajohnson@redneon.com>
+Date: Fri, 26 Oct 2012 12:30:01 +0000
+Subject: type1-subset: parse all operators
+
+The PDF at bug 56265 contained a Type 1 font that used the "div"
+operator to compute the glyph width. As the "div" operator was
+not handled by the charstring parser this resulted in an incorrect
+glyph width in the PDF output.
+
+Fix this by upgrading the charstring parsing to handle all Type 1
+operators.
+---
+diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
+index 1bdb12b..c7f613a 100644
+--- a/src/cairo-type1-subset.c
++++ b/src/cairo-type1-subset.c
+@@ -137,13 +137,10 @@ typedef struct _cairo_type1_font_subset {
+     int hex_column;
+ 
+     struct {
+-	int stack[TYPE1_STACKSIZE], sp, top_value;
++	double stack[TYPE1_STACKSIZE];
++	int sp;
+     } build_stack;
+ 
+-    struct {
+-	int other_subr_args[TYPE1_STACKSIZE], num_other_subr_args, cur_other_subr_arg;
+-    } ps_stack;
+-
+ 
+ } cairo_type1_font_subset_t;
+ 
+@@ -742,15 +739,33 @@ use_standard_encoding_glyph (cairo_type1_font_subset_t *font, int index)
+     return CAIRO_INT_STATUS_UNSUPPORTED;
+ }
+ 
+-#define TYPE1_CHARSTRING_COMMAND_ESCAPE		0x0c
+-#define TYPE1_CHARSTRING_COMMAND_SEAC		0x0c06
+-#define TYPE1_CHARSTRING_COMMAND_SBW		0x0c07
+-#define TYPE1_CHARSTRING_COMMAND_HSBW		0x0d
+-#define TYPE1_CHARSTRING_COMMAND_CALLSUBR	0x0a
+-#define TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR  0x0c10
+-#define TYPE1_CHARSTRING_COMMAND_POP	        0x0c11
+-
+ 
++#define TYPE1_CHARSTRING_COMMAND_HSTEM		 0x01
++#define TYPE1_CHARSTRING_COMMAND_VSTEM		 0x03
++#define TYPE1_CHARSTRING_COMMAND_VMOVETO	 0x04
++#define TYPE1_CHARSTRING_COMMAND_RLINETO	 0x05
++#define TYPE1_CHARSTRING_COMMAND_HLINETO	 0x06
++#define TYPE1_CHARSTRING_COMMAND_VLINETO	 0x07
++#define TYPE1_CHARSTRING_COMMAND_RRCURVETO	 0x08
++#define TYPE1_CHARSTRING_COMMAND_CLOSEPATH	 0x09
++#define TYPE1_CHARSTRING_COMMAND_CALLSUBR	 0x0a
++#define TYPE1_CHARSTRING_COMMAND_RETURN		 0x0b
++#define TYPE1_CHARSTRING_COMMAND_ESCAPE		 0x0c
++#define TYPE1_CHARSTRING_COMMAND_HSBW		 0x0d
++#define TYPE1_CHARSTRING_COMMAND_ENDCHAR	 0x0e
++#define TYPE1_CHARSTRING_COMMAND_RMOVETO	 0x15
++#define TYPE1_CHARSTRING_COMMAND_HMOVETO	 0x16
++#define TYPE1_CHARSTRING_COMMAND_VHCURVETO	 0x1e
++#define TYPE1_CHARSTRING_COMMAND_HVCURVETO	 0x1f
++#define TYPE1_CHARSTRING_COMMAND_DOTSECTION	 0x0c00
++#define TYPE1_CHARSTRING_COMMAND_VSTEM3		 0x0c01
++#define TYPE1_CHARSTRING_COMMAND_HSTEM3		 0x0c02
++#define TYPE1_CHARSTRING_COMMAND_SEAC		 0x0c06
++#define TYPE1_CHARSTRING_COMMAND_SBW		 0x0c07
++#define TYPE1_CHARSTRING_COMMAND_DIV		 0x0c0c
++#define TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR   0x0c10
++#define TYPE1_CHARSTRING_COMMAND_POP	         0x0c11
++#define TYPE1_CHARSTRING_COMMAND_SETCURRENTPOINT 0x0c21
+ 
+ /* Get glyph width and look for seac operatorParse charstring */
+ static cairo_status_t
+@@ -765,7 +780,6 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
+     const unsigned char *p;
+     cairo_bool_t last_op_was_integer;
+     int command;
+-    int subr_num, i;
+ 
+     charstring = malloc (encrypted_charstring_length);
+     if (unlikely (charstring == NULL))
+@@ -785,37 +799,60 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
+         if (*p < 32) {
+ 	    command = *p++;
+ 	    switch (command) {
+-	    case TYPE1_CHARSTRING_COMMAND_HSBW:
+-		if (! last_op_was_integer)
+-		    return CAIRO_INT_STATUS_UNSUPPORTED;
+-
+-		font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em;
++	    case TYPE1_CHARSTRING_COMMAND_HSTEM:
++	    case TYPE1_CHARSTRING_COMMAND_VSTEM:
++	    case TYPE1_CHARSTRING_COMMAND_VMOVETO:
++	    case TYPE1_CHARSTRING_COMMAND_RLINETO:
++	    case TYPE1_CHARSTRING_COMMAND_HLINETO:
++	    case TYPE1_CHARSTRING_COMMAND_VLINETO:
++	    case TYPE1_CHARSTRING_COMMAND_RRCURVETO:
++	    case TYPE1_CHARSTRING_COMMAND_CLOSEPATH:
++	    case TYPE1_CHARSTRING_COMMAND_RMOVETO:
++	    case TYPE1_CHARSTRING_COMMAND_HMOVETO:
++	    case TYPE1_CHARSTRING_COMMAND_VHCURVETO:
++	    case TYPE1_CHARSTRING_COMMAND_HVCURVETO:
++	    case TYPE1_CHARSTRING_COMMAND_RETURN:
++	    case TYPE1_CHARSTRING_COMMAND_ENDCHAR:
++	    default:
+ 		font->build_stack.sp = 0;
+-		last_op_was_integer = FALSE;
+ 		break;
+ 
+ 	    case TYPE1_CHARSTRING_COMMAND_CALLSUBR:
+-		if (font->subset_subrs  &&
+-		    last_op_was_integer &&
+-		    font->build_stack.top_value >= 0    &&
+-		    font->build_stack.top_value < font->num_subrs)
+-		{
+-		    subr_num = font->build_stack.top_value;
+-		    font->build_stack.sp--;
+-		    font->subrs[subr_num].used = TRUE;
+-		    last_op_was_integer = FALSE;
+-		    status = cairo_type1_font_subset_parse_charstring (font,
+-								       glyph,
+-								       font->subrs[subr_num].subr_string,
+-								       font->subrs[subr_num].subr_length);
+-		} else {
+-		    font->subset_subrs = FALSE;
++		if (font->subset_subrs && font->build_stack.sp > 0) {
++		    int subr_num = font->build_stack.stack[--font->build_stack.sp];
++		    if (subr_num >= 0 && subr_num < font->num_subrs) {
++			font->subrs[subr_num].used = TRUE;
++			status = cairo_type1_font_subset_parse_charstring (
++			                                   font,
++							   glyph,
++							   font->subrs[subr_num].subr_string,
++							   font->subrs[subr_num].subr_length);
++			break;
++		    }
+ 		}
++		font->subset_subrs = FALSE;
++		break;
++
++	    case TYPE1_CHARSTRING_COMMAND_HSBW:
++		if (font->build_stack.sp < 2)
++		    return CAIRO_INT_STATUS_UNSUPPORTED;
++
++		font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em;
++		font->build_stack.sp = 0;
+ 		break;
+ 
+ 	    case TYPE1_CHARSTRING_COMMAND_ESCAPE:
+ 		command = command << 8 | *p++;
+ 		switch (command) {
++		case TYPE1_CHARSTRING_COMMAND_DOTSECTION:
++		case TYPE1_CHARSTRING_COMMAND_VSTEM3:
++		case TYPE1_CHARSTRING_COMMAND_HSTEM3:
++		case TYPE1_CHARSTRING_COMMAND_SETCURRENTPOINT:
++		case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR:
++		default:
++		    font->build_stack.sp = 0;
++		    break;
++
+ 		case TYPE1_CHARSTRING_COMMAND_SEAC:
+ 		    /* The seac command takes five integer arguments.  The
+ 		     * last two are glyph indices into the PS standard
+@@ -823,6 +860,9 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
+ 		     * glyph is composed from.  All we need to do is to
+ 		     * make sure those glyphs are present in the subset
+ 		     * under their standard names. */
++		    if (font->build_stack.sp < 5)
++			return CAIRO_INT_STATUS_UNSUPPORTED;
++
+ 		    status = use_standard_encoding_glyph (font, font->build_stack.stack[3]);
+ 		    if (unlikely (status))
+ 			return status;
+@@ -832,55 +872,49 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
+ 			return status;
+ 
+ 		    font->build_stack.sp = 0;
+-		    last_op_was_integer = FALSE;
+ 		    break;
+ 
+ 		case TYPE1_CHARSTRING_COMMAND_SBW:
+-		    if (! last_op_was_integer)
++		    if (font->build_stack.sp < 4)
+ 			return CAIRO_INT_STATUS_UNSUPPORTED;
+ 
+ 		    font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em;
+ 		    font->build_stack.sp = 0;
+-		    last_op_was_integer = FALSE;
+-		    break;
+-
+-		case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR:
+-		    for (i = 0; i < font->build_stack.sp; i++)
+-			font->ps_stack.other_subr_args[i] = font->build_stack.stack[i];
+-		    font->ps_stack.num_other_subr_args = font->build_stack.sp;
+-		    font->ps_stack.cur_other_subr_arg = 0;
+-		    font->build_stack.sp = 0;
+-		    last_op_was_integer = FALSE;
+ 		    break;
+ 
+-		case TYPE1_CHARSTRING_COMMAND_POP:
+-		    if (font->ps_stack.num_other_subr_args > font->ps_stack.cur_other_subr_arg) {
+-			font->build_stack.top_value = font->ps_stack.other_subr_args[font->ps_stack.cur_other_subr_arg++];
+-			last_op_was_integer = TRUE;
++		case TYPE1_CHARSTRING_COMMAND_DIV:
++		    if (font->build_stack.sp < 2) {
++			return CAIRO_INT_STATUS_UNSUPPORTED;
+ 		    } else {
+-			font->subset_subrs = FALSE;
++			double num1 = font->build_stack.stack[font->build_stack.sp - 2];
++			double num2 = font->build_stack.stack[font->build_stack.sp - 1];
++			font->build_stack.sp--;
++			if (num2 == 0.0)
++			    return CAIRO_INT_STATUS_UNSUPPORTED;
++
++			font->build_stack.stack[font->build_stack.sp - 1] = num1/num2;
+ 		    }
+ 		    break;
+ 
+-		default:
+-		    font->build_stack.sp = 0;
+-		    last_op_was_integer = FALSE;
++		case TYPE1_CHARSTRING_COMMAND_POP:
++		    if (font->build_stack.sp < TYPE1_STACKSIZE) {
++			/* use negative number to prevent it being used as a subr_num */
++			font->build_stack.stack[font->build_stack.sp++] = -1.0;
++		    }
+ 		    break;
+ 		}
+ 		break;
+-
+-	    default:
+-		font->build_stack.sp = 0;
+-		last_op_was_integer = FALSE;
+-		break;
+ 	    }
+-        } else {
++	} else {
+             /* integer argument */
+-	    p = cairo_type1_font_subset_decode_integer (p, &font->build_stack.top_value);
+-	    last_op_was_integer = TRUE;
+-	    if (font->build_stack.sp < TYPE1_STACKSIZE)
+-		font->build_stack.stack[font->build_stack.sp++] = font->build_stack.top_value;
+-        }
++	    if (font->build_stack.sp < TYPE1_STACKSIZE) {
++		int val;
++		p = cairo_type1_font_subset_decode_integer (p, &val);
++		font->build_stack.stack[font->build_stack.sp++] = val;
++	    } else {
++		return CAIRO_INT_STATUS_UNSUPPORTED;
++	    }
++	}
+     }
+ 
+     free (charstring);
+@@ -1321,7 +1355,6 @@ skip_subrs:
+     for (j = 0; j < font->num_glyphs; j++) {
+ 	glyph = font->subset_index_to_glyphs[j];
+ 	font->build_stack.sp = 0;
+-	font->ps_stack.num_other_subr_args = 0;
+ 	status = cairo_type1_font_subset_parse_charstring (font,
+ 							   glyph,
+ 							   font->glyphs[glyph].encrypted_charstring,
+--
+cgit v0.9.0.2-2-gbebe
+From f18199fcfb3b052c198041fc05156ae3d9e6aee7 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun, 28 Oct 2012 10:04:12 +0000
+Subject: xlib/shm: Check for XShm headers
+
+Not all version of libXext ship the same set of headers, so play safe
+and check during configure that we have the headers we depend upon in
+the code.
+
+Reported-by: Sebastian Haas <sehaas@gmail.com>
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/configure.ac b/configure.ac
+index 7adbeb1..021ec8e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -105,6 +105,10 @@ CAIRO_ENABLE_SURFACE_BACKEND(xlib, Xlib, auto, [
+ 		  AC_MSG_RESULT(no),
+ 		  AC_MSG_RESULT(assuming no))
+       fi
++
++      AC_CHECK_HEADERS([X11/extensions/XShm.h X11/extensions/shmproto.h], [], [],
++		       [#include <X11/Xlibint.h>
++			#include <X11/Xproto.h>])
+ ])
+ 
+ CAIRO_ENABLE_SURFACE_BACKEND(xlib_xrender, Xlib Xrender, auto, [
+diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c
+index 89f51a9..a3d4385 100644
+--- a/src/cairo-xlib-surface-shm.c
++++ b/src/cairo-xlib-surface-shm.c
+@@ -41,12 +41,105 @@
+ 
+ #include "cairo-xlib-private.h"
+ #include "cairo-xlib-surface-private.h"
+-#include "cairo-image-surface-private.h"
+-#include "cairo-mempool-private.h"
++
++#if !HAVE_X11_EXTENSIONS_XSHM_H || !HAVE_X11_EXTENSIONS_SHMPROTO_H
++void _cairo_xlib_display_init_shm (cairo_xlib_display_t *display) {}
++
++cairo_surface_t *
++_cairo_xlib_surface_get_shm (cairo_xlib_surface_t *surface,
++			     cairo_bool_t overwrite)
++{
++    return NULL;
++}
++
++cairo_int_status_t
++_cairo_xlib_surface_put_shm (cairo_xlib_surface_t *surface)
++{
++    ASSERT_NOT_REACHED;
++    return CAIRO_INT_STATUS_SUCCESS;
++}
++
++cairo_surface_t *
++_cairo_xlib_surface_create_shm (cairo_xlib_surface_t *other,
++				pixman_format_code_t format,
++				int width, int height)
++{
++    return NULL;
++}
++
++cairo_surface_t *
++_cairo_xlib_surface_create_shm__image (cairo_xlib_surface_t *surface,
++				       pixman_format_code_t format,
++				       int width, int height)
++{
++    return NULL;
++}
++
++cairo_surface_t *
++_cairo_xlib_surface_create_similar_shm (void *other,
++					cairo_format_t format,
++					int width, int height)
++{
++    return cairo_image_surface_create (format, width, height);
++}
++
++void
++_cairo_xlib_shm_surface_mark_active (cairo_surface_t *_shm)
++{
++    ASSERT_NOT_REACHED;
++}
++
++void
++_cairo_xlib_shm_surface_get_ximage (cairo_surface_t *surface,
++				    XImage *ximage)
++{
++    ASSERT_NOT_REACHED;
++}
++
++void *
++_cairo_xlib_shm_surface_get_obdata (cairo_surface_t *surface)
++{
++    ASSERT_NOT_REACHED;
++    return NULL;
++}
++
++Pixmap
++_cairo_xlib_shm_surface_get_pixmap (cairo_surface_t *surface)
++{
++    ASSERT_NOT_REACHED;
++    return 0;
++}
++
++XRenderPictFormat *
++_cairo_xlib_shm_surface_get_xrender_format (cairo_surface_t *surface)
++{
++    ASSERT_NOT_REACHED;
++    return NULL;
++}
++
++cairo_bool_t
++_cairo_xlib_shm_surface_is_active (cairo_surface_t *surface)
++{
++    ASSERT_NOT_REACHED;
++    return FALSE;
++}
++
++cairo_bool_t
++_cairo_xlib_shm_surface_is_idle (cairo_surface_t *surface)
++{
++    ASSERT_NOT_REACHED;
++    return TRUE;
++}
++
++void _cairo_xlib_display_fini_shm (cairo_xlib_display_t *display) {}
++
++#else
+ 
+ #include "cairo-damage-private.h"
+ #include "cairo-default-context-private.h"
++#include "cairo-image-surface-private.h"
+ #include "cairo-list-inline.h"
++#include "cairo-mempool-private.h"
+ 
+ #include <X11/Xlibint.h>
+ #include <X11/Xproto.h>
+@@ -1281,5 +1374,5 @@ _cairo_xlib_display_fini_shm (cairo_xlib_display_t *display)
+     free (shm);
+     display->shm = NULL;
+ }
+-
++#endif
+ #endif
+--
+cgit v0.9.0.2-2-gbebe
+From 0e2458697848cf8c89c9d57fa9b64f0ea7bd0877 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun, 28 Oct 2012 10:08:39 +0000
+Subject: xlib/shm: Use shmstr.h instead of shmproto.h if available
+
+Before it was known as shmproto.h, the wire protocol definition was to
+be found in shmstr.h, so if we don't have the current version of libXext
+try to use the older includes.
+
+Reported-by: Sebastian Haas <sehaas@gmail.com>
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/configure.ac b/configure.ac
+index 021ec8e..f523284 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -106,7 +106,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(xlib, Xlib, auto, [
+ 		  AC_MSG_RESULT(assuming no))
+       fi
+ 
+-      AC_CHECK_HEADERS([X11/extensions/XShm.h X11/extensions/shmproto.h], [], [],
++      AC_CHECK_HEADERS([X11/extensions/XShm.h X11/extensions/shmproto.h X11/extensions/shmstr.h], [], [],
+ 		       [#include <X11/Xlibint.h>
+ 			#include <X11/Xproto.h>])
+ ])
+diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c
+index a3d4385..44e6284 100644
+--- a/src/cairo-xlib-surface-shm.c
++++ b/src/cairo-xlib-surface-shm.c
+@@ -42,7 +42,7 @@
+ #include "cairo-xlib-private.h"
+ #include "cairo-xlib-surface-private.h"
+ 
+-#if !HAVE_X11_EXTENSIONS_XSHM_H || !HAVE_X11_EXTENSIONS_SHMPROTO_H
++#if !HAVE_X11_EXTENSIONS_XSHM_H || !(HAVE_X11_EXTENSIONS_SHMPROTO_H || HAVE_X11_EXTENSIONS_SHMSTR_H)
+ void _cairo_xlib_display_init_shm (cairo_xlib_display_t *display) {}
+ 
+ cairo_surface_t *
+@@ -144,7 +144,11 @@ void _cairo_xlib_display_fini_shm (cairo_xlib_display_t *display) {}
+ #include <X11/Xlibint.h>
+ #include <X11/Xproto.h>
+ #include <X11/extensions/XShm.h>
++#if HAVE_X11_EXTENSIONS_SHMPROTO_H
+ #include <X11/extensions/shmproto.h>
++#elif HAVE_X11_EXTENSIONS_SHMSTR_H
++#include <X11/extensions/shmstr.h>
++#endif
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+ 
+--
+cgit v0.9.0.2-2-gbebe
+From 5a6e1d680a5bf1c4091e74f999abd611abd92334 Mon Sep 17 00:00:00 2001
+From: Adrian Johnson <ajohnson@redneon.com>
+Date: Sun, 28 Oct 2012 10:28:52 +0000
+Subject: type1-subset: restore correct callothersub behavior
+
+that was removed in d57e652f. Without this subsetting of subroutines
+won't work for some fonts.
+---
+diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
+index c7f613a..786055a 100644
+--- a/src/cairo-type1-subset.c
++++ b/src/cairo-type1-subset.c
+@@ -141,6 +141,11 @@ typedef struct _cairo_type1_font_subset {
+ 	int sp;
+     } build_stack;
+ 
++    struct {
++	int stack[TYPE1_STACKSIZE];
++	int sp;
++    } ps_stack;
++
+ 
+ } cairo_type1_font_subset_t;
+ 
+@@ -767,7 +772,9 @@ use_standard_encoding_glyph (cairo_type1_font_subset_t *font, int index)
+ #define TYPE1_CHARSTRING_COMMAND_POP	         0x0c11
+ #define TYPE1_CHARSTRING_COMMAND_SETCURRENTPOINT 0x0c21
+ 
+-/* Get glyph width and look for seac operatorParse charstring */
++/* Parse the charstring, including recursing into subroutines. Find
++ * the glyph width, subroutines called, and glyphs required by the
++ * SEAC operator. */
+ static cairo_status_t
+ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
+ 					  int                        glyph,
+@@ -814,6 +821,7 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
+ 	    case TYPE1_CHARSTRING_COMMAND_RETURN:
+ 	    case TYPE1_CHARSTRING_COMMAND_ENDCHAR:
+ 	    default:
++		/* stack clearing operator */
+ 		font->build_stack.sp = 0;
+ 		break;
+ 
+@@ -848,8 +856,8 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
+ 		case TYPE1_CHARSTRING_COMMAND_VSTEM3:
+ 		case TYPE1_CHARSTRING_COMMAND_HSTEM3:
+ 		case TYPE1_CHARSTRING_COMMAND_SETCURRENTPOINT:
+-		case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR:
+ 		default:
++		    /* stack clearing operator */
+ 		    font->build_stack.sp = 0;
+ 		    break;
+ 
+@@ -896,11 +904,25 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
+ 		    }
+ 		    break;
+ 
++		case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR:
++		    if (font->build_stack.sp < 1)
++			return CAIRO_INT_STATUS_UNSUPPORTED;
++
++		    font->build_stack.sp--;
++		    font->ps_stack.sp = 0;
++		    while (font->build_stack.sp)
++			font->ps_stack.stack[font->ps_stack.sp++] = font->build_stack.stack[--font->build_stack.sp];
++
++                    break;
++
+ 		case TYPE1_CHARSTRING_COMMAND_POP:
+-		    if (font->build_stack.sp < TYPE1_STACKSIZE) {
+-			/* use negative number to prevent it being used as a subr_num */
+-			font->build_stack.stack[font->build_stack.sp++] = -1.0;
+-		    }
++		    if (font->ps_stack.sp < 1)
++			return CAIRO_INT_STATUS_UNSUPPORTED;
++
++		    /* T1 spec states that if the interpreter does not
++		     * support executing the callothersub, the results
++		     * must be taken from the callothersub arguments. */
++		    font->build_stack.stack[font->build_stack.sp++] = font->ps_stack.stack[--font->ps_stack.sp];
+ 		    break;
+ 		}
+ 		break;
+@@ -1355,6 +1377,7 @@ skip_subrs:
+     for (j = 0; j < font->num_glyphs; j++) {
+ 	glyph = font->subset_index_to_glyphs[j];
+ 	font->build_stack.sp = 0;
++	font->ps_stack.sp = 0;
+ 	status = cairo_type1_font_subset_parse_charstring (font,
+ 							   glyph,
+ 							   font->glyphs[glyph].encrypted_charstring,
+--
+cgit v0.9.0.2-2-gbebe
+From 0c800dc3f64ee030df1cd0a6a1dcd6df71502dea Mon Sep 17 00:00:00 2001
+From: Adrian Johnson <ajohnson@redneon.com>
+Date: Tue, 30 Oct 2012 08:53:30 +0000
+Subject: type1-subset: ensure subroutine numnber is an integer
+
+---
+diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
+index 786055a..dff4a95 100644
+--- a/src/cairo-type1-subset.c
++++ b/src/cairo-type1-subset.c
+@@ -827,15 +827,18 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
+ 
+ 	    case TYPE1_CHARSTRING_COMMAND_CALLSUBR:
+ 		if (font->subset_subrs && font->build_stack.sp > 0) {
+-		    int subr_num = font->build_stack.stack[--font->build_stack.sp];
+-		    if (subr_num >= 0 && subr_num < font->num_subrs) {
+-			font->subrs[subr_num].used = TRUE;
+-			status = cairo_type1_font_subset_parse_charstring (
+-			                                   font,
+-							   glyph,
+-							   font->subrs[subr_num].subr_string,
+-							   font->subrs[subr_num].subr_length);
+-			break;
++		    double int_val;
++		    if (modf(font->build_stack.stack[--font->build_stack.sp], &int_val) == 0.0) {
++			int subr_num = int_val;
++			if (subr_num >= 0 && subr_num < font->num_subrs) {
++			    font->subrs[subr_num].used = TRUE;
++			    status = cairo_type1_font_subset_parse_charstring (
++				font,
++				glyph,
++				font->subrs[subr_num].subr_string,
++				font->subrs[subr_num].subr_length);
++			    break;
++			}
+ 		    }
+ 		}
+ 		font->subset_subrs = FALSE;
+--
+cgit v0.9.0.2-2-gbebe
+From 65176b7380f0d633da514be1febe16f17b99d876 Mon Sep 17 00:00:00 2001
+From: Kevin Tardif <kiyoka@gmail.com>
+Date: Tue, 30 Oct 2012 04:27:27 +0000
+Subject: type1-subset, cff-subset: Plugged 2 memory leaks
+
+- _cairo_type1_font_subset_fini doesn't free font->cleartext
+- _cairo_cff_font_create can exit without freeing font->font_name and/or
+  font->data; _cairo_cff_font_load_opentype_cff is called to allocate
+  font_name, then _cairo_cff_font_load_cff is called to allocate
+  font->data, then _cairo_cff_font_load_cff's return status is checked
+  and if it failed, it jumps to fail1. This can cause font_name to leak
+  since the fail1 target only frees the font variable. In addition,
+  _cairo_cff_font_load_cff can fail -after- allocating data, and then
+  data won't be freed either.
+
+Bug 56566
+---
+diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c
+index e3040fc..bd8d5b5 100644
+--- a/src/cairo-cff-subset.c
++++ b/src/cairo-cff-subset.c
+@@ -2787,7 +2787,7 @@ _cairo_cff_font_create (cairo_scaled_font_subset_t  *scaled_font_subset,
+     if (backend->is_synthetic && backend->is_synthetic (scaled_font_subset->scaled_font))
+ 	return CAIRO_INT_STATUS_UNSUPPORTED;
+ 
+-    font = malloc (sizeof (cairo_cff_font_t));
++    font = calloc (1, sizeof (cairo_cff_font_t));
+     if (unlikely (font == NULL))
+         return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+ 
+@@ -2862,11 +2862,11 @@ fail4:
+ fail3:
+     free (font->subset_font_name);
+ fail2:
+-    free (font->data);
+-    free (font->font_name);
+     free (font->ps_name);
+     _cairo_array_fini (&font->output);
+ fail1:
++    free (font->data);
++    free (font->font_name);
+     free (font);
+ 
+     return status;
+diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
+index dff4a95..2ec56f1 100644
+--- a/src/cairo-type1-subset.c
++++ b/src/cairo-type1-subset.c
+@@ -1670,6 +1670,8 @@ _cairo_type1_font_subset_fini (cairo_type1_font_subset_t *font)
+ 
+     free (font->subset_index_to_glyphs);
+ 
++    free (font->cleartext);
++
+     return status;
+ }
+ 
+--
+cgit v0.9.0.2-2-gbebe
+From 66625cb46c985321c46b79d2163a4d676d6700ba Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue, 30 Oct 2012 12:40:41 +0000
+Subject: xlib: Apply the image offsets to the destination rather the source
+
+So that we can specify the entire source surface as the region to copy
+and not introduce clipping errors.
+
+Fixes regression from
+commit c068691ff57c2f6cd750a54db17393c0e132cb00
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date:   Fri Aug 17 21:33:54 2012 +0100
+
+    xlib/shm: Use an impromptu upload ShmSegment
+
+Reported-by: John Lindgren <john.lindgren@aol.com>
+Reported-by: Kalev Lember <kalevlember@gmail.com>
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56547
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/cairo-xlib-render-compositor.c b/src/cairo-xlib-render-compositor.c
+index e325382..74c43e9 100644
+--- a/src/cairo-xlib-render-compositor.c
++++ b/src/cairo-xlib-render-compositor.c
+@@ -179,22 +179,19 @@ copy_image_boxes (void *_dst,
+ 		int x2 = _cairo_fixed_integer_part (chunk->base[i].p2.x);
+ 		int y2 = _cairo_fixed_integer_part (chunk->base[i].p2.y);
+ 
+-		rects[j].x = x1;
+-		rects[j].y = y1;
+-		rects[j].width  = x2 - x1;
+-		rects[j].height = y2 - y1;
+-		j++;
++		if (x2 > x1 && y2 > y1) {
++		    rects[j].x = x1;
++		    rects[j].y = y1;
++		    rects[j].width  = x2 - x1;
++		    rects[j].height = y2 - y1;
++		    j++;
++		}
+ 	    }
+ 	}
+-	assert (j == boxes->num_boxes);
+ 
+ 	XSetClipRectangles (dst->dpy, gc, 0, 0, rects, j, Unsorted);
+-
+ 	XCopyArea (dst->dpy, src, dst->drawable, gc,
+-		   dx, dy,
+-		   image->width,  image->height,
+-		   0,      0);
+-
++		   0, 0, image->width, image->height, -dx, -dy);
+ 	XSetClipMask (dst->dpy, gc, None);
+ 
+ 	if (rects != stack_rects)
+@@ -337,7 +334,8 @@ draw_image_boxes (void *_dst,
+ 
+ 	    if (_cairo_xlib_shm_surface_get_pixmap (&image->base)) {
+ 		status = copy_image_boxes (dst, image, boxes, dx, dy);
+-		goto out;
++		if (status != CAIRO_INT_STATUS_UNSUPPORTED)
++		    goto out;
+ 	    }
+ 	}
+     }
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 73b65af15..7c3d541d5 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169384 2012-10-20 09:31:33Z andyrtr $
+# $Id: PKGBUILD 171683 2012-11-21 11:19:58Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
@@ -17,18 +17,18 @@ pkgname=('calligra-filters'
          'calligra-handbook'
          'calligra-braindump'
          'calligra-flow')
-pkgver=2.5.3
-pkgrel=5
-arch=('i686' 'x86_64')
+pkgver=2.5.4
+pkgrel=1
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
 makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
-             'lcms2' 'libmysqlclient' 'libpqxx' 'freetds' 'xbase' 'libwpg'
+             'lcms2' 'libmysqlclient' 'freetds' 'xbase' 'libwpg'
              'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw'
              'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('83e2679b7ecb923b953ace06db7ca4c2')
+md5sums=('54f4677a9b00eec5951fa2386ba271a1')
 
 build() {
   mkdir build
@@ -57,12 +57,10 @@ package_calligra-libs() {
   depends=('kdepimlibs' 'lcms2')
   conflicts=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
              'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces'
-             'calligra-libs' 'calligra-pics' 'calligra-servicetypes'
-             'calligra-templates')
+             'calligra-pics' 'calligra-servicetypes' 'calligra-templates')
   replaces=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
              'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces'
-             'calligra-libs' 'calligra-pics' 'calligra-servicetypes'
-             'calligra-templates')
+             'calligra-pics' 'calligra-servicetypes' 'calligra-templates')
 
   for d in interfaces libs pics servicetypes templates; do
     cd "${srcdir}"/build/${d}
@@ -109,7 +107,6 @@ package_calligra-kexi() {
   pkgdesc="Develop desktop database applications"
   depends=('calligra-libs' 'glew' 'fftw')
   optdepends=('libmysqlclient: MySQL driver'
-              'libpqxx: PostgreSQL driver'
               'freetds: Sybase & MS SQL driver'
               'xbase: XBase driver'
               'calligra-sheets: Spreadsheet-to-Kexi-table import plugin'
diff --git a/extra/caribou/PKGBUILD b/extra/caribou/PKGBUILD
index a00df2c22..4a79b0f63 100644
--- a/extra/caribou/PKGBUILD
+++ b/extra/caribou/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 166581 2012-09-12 17:27:00Z jgc $
+# $Id: PKGBUILD 170864 2012-11-12 20:12:13Z heftig $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Adam Hani Schakaki <krzd@krzd.net>
 
 pkgname=caribou
-pkgver=0.4.4
+pkgver=0.4.4.2
 pkgrel=1
 pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Caribou"
 license=('LGPL')
-depends=('at-spi2-atk' 'pyatspi' 'dbus-python' 'python2-gobject' 'gtk3' 'libxklavier' 'libgee' 'clutter' 'dconf')
+depends=('at-spi2-atk' 'pyatspi' 'python2-gobject' 'gtk3' 'libxklavier' 'libgee' 'clutter' 'dconf')
 makedepends=('intltool' 'docbook-xsl')
 install=caribou.install
 options=(!libtool !emptydirs)
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz)
-sha256sums=('823c53afec88d43f06ddce63e0d1aac79d783f498502a0617d8be0cffc6a7de2')
+sha256sums=('22fba681b3e6041494ac4fa41b8286957bade0cc6158c110fe8f3c980af6913d')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/caribou/fix-crash.patch b/extra/caribou/fix-crash.patch
new file mode 100644
index 000000000..98e5baab9
--- /dev/null
+++ b/extra/caribou/fix-crash.patch
@@ -0,0 +1,25 @@
+From a8fb1d8fba1e9557a3370edd62501f0a866c6774 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno@unixuser.org>
+Date: Fri, 02 Nov 2012 06:19:47 +0000
+Subject: Fix border-image slice values in antler's gtk CSS
+
+According to CSS spec, border-image slice values are not denoted
+with length units.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=687409
+---
+diff --git a/data/antler/style.css b/data/antler/style.css
+index 0e830dc..7553cf6 100644
+--- a/data/antler/style.css
++++ b/data/antler/style.css
+@@ -12,7 +12,7 @@
+ .antler-keyboard-button {
+   border-width: 0px;
+   border-radius: 2px;
+-  border-image: url("dark-key-border.svg") 2px 2px 2px 2px repeat stretch;
++  border-image: url("dark-key-border.svg") 2 2 2 2 repeat stretch;
+   font: Sans 14px;
+   background-image: -gtk-gradient (linear,
+ 				     left top,
+--
+cgit v0.9.0.2
diff --git a/extra/catdoc/PKGBUILD b/extra/catdoc/PKGBUILD
deleted file mode 100644
index e4399c1be..000000000
--- a/extra/catdoc/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $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.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/"
-license=('GPL')
-depends=('glibc')
-optdepends=('tk: for using wordview')
-options=('!makeflags')
-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
-}
-
-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/ccrtp/PKGBUILD b/extra/ccrtp/PKGBUILD
index 5901e29ed..273657f28 100644
--- a/extra/ccrtp/PKGBUILD
+++ b/extra/ccrtp/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=ccrtp
 pkgver=2.0.3
 pkgrel=2
 pkgdesc="An implementation of RTP, the real-time transport protocol from the IETF"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/ccrtp/"
 license=('GPL' 'custom')
 depends=('ucommon' 'libgcrypt')
diff --git a/extra/cd-discid/PKGBUILD b/extra/cd-discid/PKGBUILD
index fda35ff68..8814b9ac1 100644
--- a/extra/cd-discid/PKGBUILD
+++ b/extra/cd-discid/PKGBUILD
@@ -21,5 +21,5 @@ build() {
 
 package() {
   cd "${srcdir}"/$pkgname-$pkgver
-  make DESTDIR="${pkgdir}" INSTALL=/bin/install install
+  make DESTDIR="${pkgdir}" INSTALL=/usr/bin/install install
 }
diff --git a/extra/celt/PKGBUILD b/extra/celt/PKGBUILD
new file mode 100644
index 000000000..3eec5da5a
--- /dev/null
+++ b/extra/celt/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Lauri Niskanen <ape@ape3000.com>
+# Contributor: Ray Rashif <schivmeister@gmail.com>
+
+pkgname=celt
+pkgver=0.11.1
+pkgrel=4
+pkgdesc='Low-latency audio communication codec'
+arch=('i686' 'x86_64' 'mips64el')
+url='http://www.celt-codec.org'
+license=('BSD')
+depends=('libogg')
+options=('!libtool')
+source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('94fe4acd241da8702c295bcd13a555e6')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure \
+    --prefix=/usr \
+    --enable-custom-modes
+
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+
+  install -D -m644 COPYING \
+    ${pkgdir}/usr/share/licenses/${pkgname}/BSD
+}
diff --git a/extra/check/PKGBUILD b/extra/check/PKGBUILD
new file mode 100644
index 000000000..6014fbee3
--- /dev/null
+++ b/extra/check/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 171322 2012-11-17 08:55:42Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Jeremy Cowgar <jeremy@cowgar.com>
+
+pkgname=check
+pkgver=0.9.9
+pkgrel=1
+pkgdesc="A unit testing framework for C"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://check.sourceforge.net/"
+license=('LGPL')
+options=('!libtool')
+install=$pkgname.install
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('f3702f2fcfc19ce3f62dca66c241a168')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # get rid of the package's info directory,
+  # install-info adds entries for us at install-time
+  rm "$pkgdir/usr/share/info/dir"
+}
diff --git a/extra/check/check.install b/extra/check/check.install
new file mode 100644
index 000000000..c4092e298
--- /dev/null
+++ b/extra/check/check.install
@@ -0,0 +1,20 @@
+_infodir=/usr/share/info
+_filelist=(check.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${_filelist[@]}; do
+    install-info $_infodir/$file $_infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${_filelist[@]}; do
+    install-info --delete $_infodir/$file $_infodir/dir 2> /dev/null
+  done
+}
diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD
index bcc99ded7..e3bb815d1 100644
--- a/extra/cheese/PKGBUILD
+++ b/extra/cheese/PKGBUILD
@@ -1,25 +1,23 @@
-# $Id: PKGBUILD 159049 2012-05-15 11:05:32Z heftig $
+# $Id: PKGBUILD 170886 2012-11-12 22:06:48Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cheese
-pkgver=3.4.2
+pkgver=3.6.2
 pkgrel=1
 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
-depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins'
-         'gstreamer0.10-good-plugins' 'gstreamer0.10-bad' 'clutter-gst' 'clutter-gtk' 'mx' 'libgee'
-         'gnome-video-effects' 'hicolor-icon-theme' 'dconf' 'cogl')
-makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool'
-             'nautilus-sendto')
-optdepends=('nautilus-sendto: Send images')
+depends=('gtk3' 'gstreamer' 'gst-plugins-bad' 'gst-plugins-base' 'gst-plugins-good' 'clutter-gst' 'clutter-gtk' 'libcanberra' 'libgee' 'gnome-video-effects' 'librsvg' 'gnome-desktop')
+makedepends=('pkgconfig' 'intltool' 'gobject-introspection' 'itstool' 'vala' 'nautilus-sendto')
+optdepends=('nautilus-sendto: Send snapshots'
+            'frei0r-plugins: More camera effects')
 groups=('gnome-extra')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org/projects/cheese/"
 install=cheese.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('730083e1fb7da1fc8c38978cbb957ff2128d6f132132b3863bd60c0963a120e0')
+sha256sums=('745262a0db7d0dbe973497a4f36dd4d85b8a42426d8f431e4b6898351ad6459e')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/chromaprint/PKGBUILD b/extra/chromaprint/PKGBUILD
new file mode 100644
index 000000000..6a6b563bb
--- /dev/null
+++ b/extra/chromaprint/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 170160 2012-11-03 19:43:21Z heftig $
+# Contributor: Wieland Hoffmann <the_mineo@web.de>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname=chromaprint
+pkgver=0.7
+pkgrel=1
+pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source'
+url='http://acoustid.org/chromaprint/'
+arch=('i686' 'x86_64' 'mips64el')
+license=('LGPL')
+depends=('ffmpeg')
+makedepends=('cmake')
+source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('6a961585e82d26d357eb792216becc0864ddcdb2')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_EXAMPLES=ON .
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD
index 0814a9b6d..34cc4f141 100644
--- a/extra/cifs-utils/PKGBUILD
+++ b/extra/cifs-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 164812 2012-08-06 16:16:22Z tpowa $
+# $Id: PKGBUILD 169599 2012-10-24 07:18:13Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=cifs-utils
-pkgver=5.6
-pkgrel=2
+pkgver=5.7
+pkgrel=1
 pkgdesc="CIFS filesystem user-space tools"
 arch=(i686 x86_64 'mips64el')
 url="http://wiki.samba.org/index.php/LinuxCIFS_utils"
@@ -24,4 +24,4 @@ package() {
   # set mount.cifs uid, to enable none root mounting form fstab
   chmod +s $pkgdir/usr/bin/mount.cifs
 }
-md5sums=('89c94ff512e375b92899b79622604c39')
+md5sums=('4215f12be8663f65d2c21dbbbafbc7f8')
diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD
index a096dea79..017aa6688 100644
--- a/extra/cinepaint/PKGBUILD
+++ b/extra/cinepaint/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 168510 2012-10-13 05:14:52Z allan $
+# $Id: PKGBUILD 169741 2012-10-27 23:41:34Z eric $
 # Maintainer: tobias [tobias.archlinux.org]
 # Contributor: tobias [tobias.justdreams.de]
 
 pkgname=cinepaint
 pkgver=1.3
-pkgrel=4
+pkgrel=5
 pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL' 'GPL' 'MIT')
diff --git a/extra/claws-mail-extra-plugins/PKGBUILD b/extra/claws-mail-extra-plugins/PKGBUILD
index aa7dfdd95..11027bc4f 100644
--- a/extra/claws-mail-extra-plugins/PKGBUILD
+++ b/extra/claws-mail-extra-plugins/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 162657 2012-06-27 15:37:05Z andyrtr $
+# $Id: PKGBUILD 171015 2012-11-14 20:36:10Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Mildred <mildred593 at online dot fr>
 
 pkgname=claws-mail-extra-plugins
-pkgver=3.8.1
+pkgver=3.9.0
 pkgrel=1
 pkgdesc="Extra plugins for claws-mail"
 url="http://www.claws-mail.org/plugins.php?branch=EXT"
 license=('GPL3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('claws-mail>=3.8.1')
+depends=('claws-mail>=3.9.0')
 makedepends=('make' 'bc' 'perl>=5.16.0' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7'
              'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.6.1'
              'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata'
@@ -36,16 +36,13 @@ conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin'
 replaces=('sylpheed-claws-extra-plugins')
 options=('!libtool' '!strip')
 source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2)
-md5sums=('04528ff6c8a7a38d392c4f2afb1bb0d2')
+md5sums=('e82431243a6643bcc5520df78908240c')
 
 build() {
   cd "$srcdir/claws-mail-extra-plugins-$pkgver"
 
   # fix for python2
   export PYTHON="/usr/bin/python2"
-
-  # fix gdata plugin build
-  sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.4/configure
  
   for dir in */; do
     [[ $dir != geolocation_plugin-* ]] && (
diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD
index 0868ebbbc..6bffb13df 100644
--- a/extra/claws-mail/PKGBUILD
+++ b/extra/claws-mail/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168547 2012-10-13 11:00:14Z andyrtr $
+# $Id: PKGBUILD 171014 2012-11-14 20:36:08Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=claws-mail
-pkgver=3.8.1
-pkgrel=3
+pkgver=3.9.0
+pkgrel=1
 pkgdesc="A GTK+ based e-mail client."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
@@ -20,17 +20,12 @@ replaces=('sylpheed-claws')
 provides=('claws')
 options=(!libtool)
 install=claws-mail.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2
-        gnutls313.diff)
-md5sums=('d388929fb1c8f04d4bcb2139faaf9e70'
-         '21bdc9d324f9424e0071bb73be169977')
+source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('4c5ac7b21f0ed17d0f6404124c2229a4')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  # fix a bug in gnutls cert check triggered since gnutls 3.1.3 update
-  patch -Np1 -i ${srcdir}/gnutls313.diff
-   
   sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
 
   ./configure --prefix=/usr --disable-static \
diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD
index aaa4b29d5..ce41e576f 100644
--- a/extra/clutter-gst/PKGBUILD
+++ b/extra/clutter-gst/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 162364 2012-06-25 23:16:17Z ibiru $
+# $Id: PKGBUILD 169856 2012-10-30 22:24:31Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=clutter-gst
-pkgver=1.6.0
+pkgver=1.9.92
 pkgrel=1
 pkgdesc="GStreamer bindings for clutter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.clutter-project.org/"
 license=('LGPL')
-depends=('clutter' 'gstreamer0.10-base' 'libxdamage')
+depends=('clutter' 'gst-plugins-base-libs' 'libxdamage')
 makedepends=('gobject-introspection')
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('abc879cdd562f1640a825131405f4327a427bfe65b805ebc25d0c78909c8c622')
+sha256sums=('5c09dce218f711a44bd4d741e2dd10ffc47e7fcd7b0cf514ca0e92b825c76c45')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/clutter-gtk/PKGBUILD b/extra/clutter-gtk/PKGBUILD
index 918cc4171..c885bf834 100644
--- a/extra/clutter-gtk/PKGBUILD
+++ b/extra/clutter-gtk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156726 2012-04-23 09:04:07Z ibiru $
+# $Id: PKGBUILD 169855 2012-10-30 22:24:27Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=clutter-gtk
-pkgver=1.2.0
+pkgver=1.4.0
 pkgrel=1
 pkgdesc="GTK clutter widget"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('LGPL')
 depends=('clutter' 'gtk3')
 makedepends=('gobject-introspection')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8be5deb0fa2f318e5f5e888b8ace3371c516464472a48f25c8b42ccc298af59a')
+sha256sums=('d51c4bb6a6ad0a337976766383f97a1c905a37bd77b3dbf484a7314130d97b6e')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD
index a364e8db5..7e89f51bc 100644
--- a/extra/clutter/PKGBUILD
+++ b/extra/clutter/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 160599 2012-06-02 20:26:43Z ibiru $
+# $Id: PKGBUILD 169854 2012-10-30 22:24:23Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=clutter
-pkgver=1.10.6
+pkgver=1.12.2
 pkgrel=1
 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ license=('LGPL')
 depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi')
 makedepends=('gobject-introspection' 'mesa')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1599432d5ea79b0260cdea72803784d3b94ee14de2722ad29eefbe75975630f2')
+sha256sums=('27a8c4495099ea33de39c2d9a911a2c9e00ffa4dcc8f94fafedbcc752c0ddf13')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 3c39c107e..08946e8b8 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 165140 2012-08-11 16:15:35Z andrea $
+# $Id: PKGBUILD 172096 2012-11-28 07:27:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=cmake
-pkgver=2.8.9
+pkgver=2.8.10.2
 pkgrel=1
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cmake.org/"
 license=('custom')
 depends=('curl' 'libarchive' 'shared-mime-info')
-makedepends=('qt')
+makedepends=('qt' 'emacs')
 optdepends=('qt: cmake-gui')
 install="${pkgname}.install"
 source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('801f4c87f8b604f727df5bf1f05a59e7')
+md5sums=('097278785da7182ec0aea8769d06860c')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
   ./bootstrap --prefix=/usr \
     --mandir=/share/man \
@@ -29,13 +29,17 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
-  vimpath="$pkgdir/usr/share/vim/vimfiles"
-  install -Dm644 Docs/cmake-indent.vim ${vimpath}/indent/cmake-indent.vim
-  install -Dm644 Docs/cmake-syntax.vim ${vimpath}/syntax/cmake-syntax.vim
-  install -Dm644 Docs/cmake-mode.el ${pkgdir}/usr/share/emacs/site-lisp/cmake-mode.el
+  vimpath="${pkgdir}/usr/share/vim/vimfiles"
+  install -Dm644 Docs/cmake-indent.vim "${vimpath}"/indent/cmake-indent.vim
+  install -Dm644 Docs/cmake-syntax.vim "${vimpath}"/syntax/cmake-syntax.vim
 
-  install -Dm644 Copyright.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 Docs/cmake-mode.el \
+    "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el
+  emacs -batch -f batch-byte-compile "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el
+
+  install -Dm644 Copyright.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/extra/cmatrix/PKGBUILD b/extra/cmatrix/PKGBUILD
deleted file mode 100644
index 9dc5bf5df..000000000
--- a/extra/cmatrix/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 137613 2011-09-10 04:45:43Z eric $
-# Maintainer:
-
-pkgname=cmatrix
-pkgver=1.2a
-pkgrel=6.1
-pkgdesc="Let you see the matrix code in your console"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.asty.org/cmatrix/"
-license=('GPL')
-depends=('ncurses' 'fontconfig')
-install=cmatrix.install
-source=(http://www.asty.org/cmatrix/dist/$pkgname-$pkgver.tar.gz)
-md5sums=('ebfb5733104a258173a9ccf2669968a1')
-sha1sums=('ca078c10322a47e327f07a44c9a42b52eab5ad93')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  
-  install -Dm644 mtx.pcf "$pkgdir/usr/share/fonts/misc/mtx.pcf"
-  install -Dm644 matrix.fnt "$pkgdir/usr/share/kbd/consolefonts/matrix.fnt"
-  install -Dm644 matrix.psf.gz "$pkgdir/usr/share/kbd/consolefonts/matrix.psf.gz"
-}
diff --git a/extra/cmatrix/cmatrix.install b/extra/cmatrix/cmatrix.install
deleted file mode 100644
index c46fe4469..000000000
--- a/extra/cmatrix/cmatrix.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_install() {
-  fc-cache
-}
diff --git a/extra/colord-gtk/PKGBUILD b/extra/colord-gtk/PKGBUILD
new file mode 100644
index 000000000..0cca84791
--- /dev/null
+++ b/extra/colord-gtk/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 169858 2012-10-30 22:24:38Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=colord-gtk
+pkgver=0.1.23
+pkgrel=1
+pkgdesc="GTK integration for libcolord"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.freedesktop.org/software/colord"
+license=('GPL2')
+depends=('lcms2' 'gtk3' 'colord')
+makedepends=('intltool' 'gobject-introspection' 'vala' 'gtk-doc')
+source=($url/releases/$pkgname-$pkgver.tar.xz)
+options=('!libtool')
+sha1sums=('71fd56b34ba91ddf76c1ac394c2a31fa5e24770c')
+
+build() {
+  cd "$pkgname-$pkgver"
+  
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc --libexecdir=/usr/lib/colord \
+    --localstatedir=/var --disable-static
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD
index 7fc6c1250..229c69358 100644
--- a/extra/colord/PKGBUILD
+++ b/extra/colord/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 161614 2012-06-12 13:49:01Z heftig $
+# $Id: PKGBUILD 171432 2012-11-17 14:39:23Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=colord
-pkgver=0.1.21
-pkgrel=2
-pkgdesc="Color daemon"
+pkgver=0.1.24
+pkgrel=3
+pkgdesc="System daemon for managing color devices"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/software/colord"
 license=('GPL2')
-depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite' 'udev')
+depends=('lcms2' 'libgusb' 'polkit' 'shared-color-profiles' 'sqlite' 'udev')
 makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x')
 source=($url/releases/$pkgname-$pkgver.tar.xz)
 options=('!libtool')
-sha1sums=('dbf981beec70e81c45cf46b150f426fc1eb56c24')
+sha1sums=('52089b72d79cd4358a86b7e646c42d23157bbcf9')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -24,7 +24,8 @@ build() {
   ./configure --prefix=/usr \
     --sysconfdir=/etc --libexecdir=/usr/lib/colord \
     --localstatedir=/var --disable-static \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --enable-vala
   make
 }
 
diff --git a/extra/consolekit/PKGBUILD b/extra/consolekit/PKGBUILD
deleted file mode 100644
index 46c534fc9..000000000
--- a/extra/consolekit/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 160357 2012-06-01 12:58:20Z dreisner $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: onestep_ua <onestep@ukr.net>
-
-pkgname=consolekit
-pkgver=0.4.6
-pkgrel=4.1
-pkgdesc="A framework for defining and tracking users, login sessions, and seats"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.freedesktop.org/wiki/Software/ConsoleKit"
-license=('GPL')
-depends=('polkit' 'zlib' 'libx11' 'dbus-glib')
-makedepends=('pkgconfig' 'xmlto' 'docbook-xsl')
-options=(!libtool)
-#source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-$pkgver.tar.bz2
-# this has not been released yet, so this is a snapshot
-source=(ftp://ftp.archlinux.org/other/${pkgname}/ConsoleKit-${pkgver}.tar.bz2
-        pam-foreground-compat.ck consolekit.logrotate consolekit.tmpfiles.conf)
-md5sums=('810990b607e338f06a6396c92b8a4a06'
-         'a8a4de71d9b0549b8143e5f6c2a36fc7'
-         '6fefa451d9fe2fc6d6269629d3529793'
-         '8c5a8059db515d40fae1379daf084094')
-
-build() {
-  cd "$srcdir/ConsoleKit-$pkgver"
-  ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib/ConsoleKit \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system \
-      --enable-pam-module \
-      --with-pam-module-dir=/usr/lib/security \
-      --enable-docbook-docs \
-      --enable-udev-acl
-  make
-}
-
-package() {
-  cd "$srcdir/ConsoleKit-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -m755 "$srcdir/pam-foreground-compat.ck" "$pkgdir/usr/lib/ConsoleKit/run-session.d/"
-
-  # install the logrotate config
-  install -D -m644 "$srcdir/consolekit.logrotate" "$pkgdir/etc/logrotate.d/consolekit"
-
-  install -D -m644 "$srcdir/consolekit.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/consolekit.conf"
-
-  rm -rf "${pkgdir}/var/run"
-}
diff --git a/extra/consolekit/consolekit.logrotate b/extra/consolekit/consolekit.logrotate
deleted file mode 100644
index 7c5346ef8..000000000
--- a/extra/consolekit/consolekit.logrotate
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/ConsoleKit/history {
-    missingok
-    notifempty
-    delaycompress
-}
diff --git a/extra/consolekit/consolekit.tmpfiles.conf b/extra/consolekit/consolekit.tmpfiles.conf
deleted file mode 100644
index 4ec125110..000000000
--- a/extra/consolekit/consolekit.tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/ConsoleKit 0755 - - -
diff --git a/extra/consolekit/pam-foreground-compat.ck b/extra/consolekit/pam-foreground-compat.ck
deleted file mode 100644
index 7f6b122d5..000000000
--- a/extra/consolekit/pam-foreground-compat.ck
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-TAGDIR=/var/run/console
-
-[ -n "$CK_SESSION_USER_UID" ] || exit 1
-
-TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`"
-
-if [ "$1" = "session_added" ]; then
-    mkdir -p "$TAGDIR"
-    echo "$CK_SESSION_ID" >> "$TAGFILE"
-fi
-
-if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then
-    sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE"
-    [ -s "$TAGFILE" ] || rm -f "$TAGFILE"
-fi
diff --git a/extra/cpufrequtils/PKGBUILD b/extra/cpufrequtils/PKGBUILD
deleted file mode 100644
index 5b0e00772..000000000
--- a/extra/cpufrequtils/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 149475 2012-02-08 09:53:00Z pierre $
-# Maintainer: kevin <kevin@archlinux.org>
-# Contributor: phrakture <aaronmgriffin+gmail+com>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-
-pkgname=cpufrequtils
-pkgver=008
-pkgrel=2.1
-pkgdesc="Userspace tools for the kernel cpufreq subsystem"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"
-license=('GPL')
-depends=('sysfsutils')
-backup=('etc/conf.d/cpufreq')
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'cpufreq.rcd'
-        'cpufreq.confd'
-        cpufrequtils-mips.patch)
-options=('!libtool' '!makeflags')
-md5sums=('c59b71c044d463896f3247e8dd83dd7e'
-         '7f2b5085df44d2df3e7c2d0b9f6dab08'
-         'baae1f2abffc6bef2bd32a8dd8263c09'
-         'edbe311e6813f3b395a08b7f174065c1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  [ "$CARCH" = "mips64el" ] && patch -Np0 -i ${srcdir}/cpufrequtils-mips.patch
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make INSTALL="/bin/install -c" mandir=/usr/share/man DESTDIR="${pkgdir}" install
-
-  install -D -m755 ${srcdir}/cpufreq.rcd "${pkgdir}/etc/rc.d/cpufreq"
-  install -D -m644 ${srcdir}/cpufreq.confd "${pkgdir}/etc/conf.d/cpufreq"
-}
diff --git a/extra/cpufrequtils/cpufreq.confd b/extra/cpufrequtils/cpufreq.confd
deleted file mode 100644
index 218909748..000000000
--- a/extra/cpufrequtils/cpufreq.confd
+++ /dev/null
@@ -1,14 +0,0 @@
-#configuration for cpufreq control
-
-# valid governors:
-#  ondemand, performance, powersave,
-#  conservative, userspace
-#governor="ondemand"
-
-# limit frequency range (optional)
-# valid suffixes: Hz, kHz (default), MHz, GHz, THz
-#min_freq="2.25GHz"
-#max_freq="3GHz"
-
-# use freq to set up the exact cpu frequency using it with userspace governor
-#freq=
diff --git a/extra/cpufrequtils/cpufreq.rcd b/extra/cpufrequtils/cpufreq.rcd
deleted file mode 100644
index 9bc19b117..000000000
--- a/extra/cpufrequtils/cpufreq.rcd
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/cpufreq ] && . /etc/conf.d/cpufreq
-
-case "$1" in
-  start)
-    stat_busy "Setting cpufreq governing rules"
-
-	params=""
-	if [ -n "$governor" ]; then
-		mod="cpufreq_$governor"
-		params="-g $governor"
-		grep -qw "$governor" /sys/devices/system/cpu/cpu*/cpufreq/scaling_available_governors || modprobe -q $mod
-		if [ $? -eq 0 ]; then
-			if [ "$min_freq" != "" ]; then
-				params="$params -d $min_freq"
-			fi
-			if [ "$max_freq" != "" ]; then
-				params="$params -u $max_freq"
-			fi
-		else
-			stat_busy "    Cannot load governor module '$governor'"
-			stat_fail
-			exit
-		fi
-	fi
-
-	if [ "$params" != "" ]; then
-		CPUS=$(sed -ne 's/^processor.* \([0-9]\+\)$/\1/p' /proc/cpuinfo)
-		stat_append ", cpu"
-		for cpu in $CPUS; do
-			stat_append " $cpu"
-			cpufreq-set -c $cpu $params
-			if [ "$freq" != "" ]; then
-				cpufreq-set -c $cpu -f $freq
-			fi
-		done
-		stat_done
-	else
-		stat_busy "    Invalid configuration in /etc/conf.d/cpufreq"
-		stat_fail
-	fi
-	;;
-  stop)
-	# nothing to do
-	;;
-  restart)
-	$0 start
-	;;
-  set)
-	# TODO: make callable... "cpufreq set 800MHz"
-	;;
-  *)
-	echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/cpufrequtils/cpufrequtils-mips.patch b/extra/cpufrequtils/cpufrequtils-mips.patch
deleted file mode 100644
index cba8ab48b..000000000
--- a/extra/cpufrequtils/cpufrequtils-mips.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- utils/aperf.c.orig	2010-07-18 01:38:02.000000000 +0800
-+++ utils/aperf.c	2010-07-18 01:38:39.000000000 +0800
-@@ -68,11 +68,15 @@
- 
- static int cpu_has_effective_freq()
- {
-+#if defined(__i386__) || defined(__x86_64__)
- 	/* largest base level */
- 	if (cpuid_eax(0) < 6)
- 		return 0;
- 
- 	return cpuid_ecx(6) & 0x1;
-+#else
-+	return 0;
-+#endif
- }
- 
- /*
diff --git a/extra/cups-pk-helper/PKGBUILD b/extra/cups-pk-helper/PKGBUILD
index 405874d97..b07530b05 100644
--- a/extra/cups-pk-helper/PKGBUILD
+++ b/extra/cups-pk-helper/PKGBUILD
@@ -1,7 +1,7 @@
-#$Id: PKGBUILD 156732 2012-04-23 09:04:15Z ibiru $
+#$Id: PKGBUILD 169617 2012-10-24 17:03:25Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=cups-pk-helper
-pkgver=0.2.2
+pkgver=0.2.4
 pkgrel=1
 pkgdesc="A helper that makes system-config-printer use PolicyKit"
 arch=(i686 x86_64 'mips64el')
@@ -10,17 +10,17 @@ license=('GPL')
 depends=(polkit libcups)
 makedepends=(intltool)
 source=(http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.xz)
-sha256sums=('56a10efbc0f37db39a940d99d549c7f37fa95f1af4745b30b79c240b0f37cfd7')
+sha256sums=('d187dc994ff64621aa090d114170b292daa11122481d8b8adb7613b32ca4e3c3')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/lib/cups-pk-helper
   make
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/dansguardian/PKGBUILD b/extra/dansguardian/PKGBUILD
deleted file mode 100644
index 685d936fa..000000000
--- a/extra/dansguardian/PKGBUILD
+++ /dev/null
@@ -1,155 +0,0 @@
-# $Id: PKGBUILD 161292 2012-06-08 23:30:21Z dreisner $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Manolis Tzanidakis
-
-pkgname=dansguardian
-pkgver=2.10.1.1
-pkgrel=4
-pkgdesc="Squid plugin for web content filtering."
-url="http://dansguardian.org"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
-depends=('squid' 'pcre' 'zlib')
-install=${pkgname}.install
-source=(http://dansguardian.org/downloads/2/Stable/${pkgname}-${pkgver}.tar.gz
-        dansguardian
-        dg2.10.1.1-missing.stdio.patch)
-md5sums=('0987a1c9bfbdf398118386f10279611a'
-         'a65a2cb6309670ad8978f1544907d290'
-         '3444718c00cc17337cba711ceaa1c0e5')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np0 -i ${srcdir}/dg2.10.1.1-missing.stdio.patch
-  ./configure --prefix="/usr" --with-proxyuser=proxy --with-proxygroup=proxy \
-              --sysconfdir=/etc --localstatedir=/var --enable-email
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -D data/scripts/dansguardian ${pkgdir}/etc/logrotate.d/dansguardian
-  install -D -m755 ${srcdir}/dansguardian ${pkgdir}/etc/rc.d/dansguardian
-  rmdir "$pkgdir/var/run"
-}
-
-backup=(etc/dansguardian/dansguardian.conf 
-etc/dansguardian/dansguardianf1.conf
-etc/dansguardian/downloadmanagers/default.conf
-etc/dansguardian/downloadmanagers/fancy.conf
-etc/dansguardian/authplugins/proxy-digest.conf
-etc/dansguardian/authplugins/proxy-basic.conf
-etc/dansguardian/authplugins/ident.conf
-etc/dansguardian/authplugins/ip.conf
-etc/dansguardian/lists/weightedphraselist 
-etc/dansguardian/lists/contentregexplist
-etc/dansguardian/lists/exceptionfileurllist
-etc/dansguardian/lists/exceptionextensionlist
-etc/dansguardian/lists/bannedextensionlist
-etc/dansguardian/lists/exceptionmimetypelist
-etc/dansguardian/lists/blacklists/ads/urls
-etc/dansguardian/lists/blacklists/ads/domains
-etc/dansguardian/lists/exceptionregexpurllist
-etc/dansguardian/lists/authplugins/ipgroups
-etc/dansguardian/lists/bannedregexpheaderlist
-etc/dansguardian/lists/phraselists/rta/banned
-etc/dansguardian/lists/phraselists/sport/weighted
-etc/dansguardian/lists/phraselists/proxies/weighted
-etc/dansguardian/lists/phraselists/safelabel/banned
-etc/dansguardian/lists/phraselists/peer2peer/weighted
-etc/dansguardian/lists/phraselists/drugadvocacy/weighted
-etc/dansguardian/lists/phraselists/googlesearches/banned
-etc/dansguardian/lists/phraselists/conspiracy/weighted
-etc/dansguardian/lists/phraselists/secretsocieties/weighted
-etc/dansguardian/lists/phraselists/idtheft/weighted
-etc/dansguardian/lists/phraselists/illegaldrugs/banned
-etc/dansguardian/lists/phraselists/illegaldrugs/weighted_portuguese
-etc/dansguardian/lists/phraselists/illegaldrugs/weighted
-etc/dansguardian/lists/phraselists/violence/weighted_portuguese
-etc/dansguardian/lists/phraselists/violence/weighted
-etc/dansguardian/lists/phraselists/domainsforsale/weighted
-etc/dansguardian/lists/phraselists/music/weighted
-etc/dansguardian/lists/phraselists/upstreamfilter/weighted
-etc/dansguardian/lists/phraselists/games/weighted
-etc/dansguardian/lists/phraselists/weapons/weighted_portuguese
-etc/dansguardian/lists/phraselists/weapons/weighted
-etc/dansguardian/lists/phraselists/legaldrugs/weighted
-etc/dansguardian/lists/phraselists/gore/weighted_portuguese
-etc/dansguardian/lists/phraselists/gore/weighted
-etc/dansguardian/lists/phraselists/warezhacking/weighted
-etc/dansguardian/lists/phraselists/pornography/weighted_chinese
-etc/dansguardian/lists/phraselists/pornography/weighted_malay
-etc/dansguardian/lists/phraselists/pornography/weighted_german
-etc/dansguardian/lists/phraselists/pornography/weighted_dutch
-etc/dansguardian/lists/phraselists/pornography/banned_portuguese
-etc/dansguardian/lists/phraselists/pornography/weighted_french
-etc/dansguardian/lists/phraselists/pornography/weighted_polish
-etc/dansguardian/lists/phraselists/pornography/banned
-etc/dansguardian/lists/phraselists/pornography/weighted_danish
-etc/dansguardian/lists/phraselists/pornography/weighted_japanese
-etc/dansguardian/lists/phraselists/pornography/weighted_portuguese
-etc/dansguardian/lists/phraselists/pornography/weighted_russian
-etc/dansguardian/lists/phraselists/pornography/weighted_italian
-etc/dansguardian/lists/phraselists/pornography/weighted_swedish
-etc/dansguardian/lists/phraselists/pornography/weighted
-etc/dansguardian/lists/phraselists/pornography/weighted_norwegian
-etc/dansguardian/lists/phraselists/pornography/weighted_spanish
-etc/dansguardian/lists/phraselists/personals/weighted_portuguese
-etc/dansguardian/lists/phraselists/personals/weighted
-etc/dansguardian/lists/phraselists/nudism/weighted
-etc/dansguardian/lists/phraselists/malware/weighted
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general_polish
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general_swedish
-etc/dansguardian/lists/phraselists/goodphrases/exception_email
-etc/dansguardian/lists/phraselists/goodphrases/exception
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general_danish
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general_malay
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general_dutch
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general_portuguese
-etc/dansguardian/lists/phraselists/goodphrases/weighted_news
-etc/dansguardian/lists/phraselists/translation/weighted
-etc/dansguardian/lists/phraselists/chat/weighted_italian
-etc/dansguardian/lists/phraselists/chat/weighted
-etc/dansguardian/lists/phraselists/news/weighted
-etc/dansguardian/lists/phraselists/badwords/weighted_german
-etc/dansguardian/lists/phraselists/badwords/weighted_dutch
-etc/dansguardian/lists/phraselists/badwords/weighted_french
-etc/dansguardian/lists/phraselists/badwords/weighted_portuguese
-etc/dansguardian/lists/phraselists/badwords/weighted_spanish
-etc/dansguardian/lists/phraselists/webmail/weighted
-etc/dansguardian/lists/phraselists/travel/weighted
-etc/dansguardian/lists/phraselists/gambling/banned_portuguese
-etc/dansguardian/lists/phraselists/gambling/banned
-etc/dansguardian/lists/phraselists/gambling/weighted_portuguese
-etc/dansguardian/lists/phraselists/gambling/weighted
-etc/dansguardian/lists/phraselists/forums/weighted
-etc/dansguardian/lists/phraselists/intolerance/banned_portuguese
-etc/dansguardian/lists/phraselists/intolerance/weighted_portuguese
-etc/dansguardian/lists/phraselists/intolerance/weighted
-etc/dansguardian/lists/logsitelist
-etc/dansguardian/lists/logregexpurllist
-etc/dansguardian/lists/greysitelist
-etc/dansguardian/lists/filtergroupslist
-etc/dansguardian/lists/downloadmanagers/managedmimetypelist
-etc/dansguardian/lists/downloadmanagers/managedextensionlist
-etc/dansguardian/lists/exceptionfilesitelist
-etc/dansguardian/lists/bannedmimetypelist
-etc/dansguardian/lists/pics
-etc/dansguardian/lists/exceptionurllist
-etc/dansguardian/lists/logurllist
-etc/dansguardian/lists/exceptionphraselist
-etc/dansguardian/lists/bannedurllist
-etc/dansguardian/lists/headerregexplist
-etc/dansguardian/lists/bannediplist
-etc/dansguardian/lists/exceptionsitelist
-etc/dansguardian/lists/bannedphraselist
-etc/dansguardian/lists/exceptioniplist
-etc/dansguardian/lists/bannedregexpurllist
-etc/dansguardian/lists/bannedsitelist
-etc/dansguardian/lists/urlregexplist
-etc/dansguardian/lists/greyurllist)
-
-# vim: ts=2 sw=2 et ft=sh
diff --git a/extra/dansguardian/dansguardian b/extra/dansguardian/dansguardian
deleted file mode 100644
index c537da8bd..000000000
--- a/extra/dansguardian/dansguardian
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/dansguardian`
-case "$1" in
-  start)
-    stat_busy "Starting DansGuardian"
-    [ -z "$PID" ] && /usr/sbin/dansguardian
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon dansguardian
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DansGuardian"
-    [ ! -z "$PID" ]  && /usr/sbin/dansguardian -q &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon dansguardian
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/dansguardian/dansguardian.install b/extra/dansguardian/dansguardian.install
deleted file mode 100644
index 05a72ad80..000000000
--- a/extra/dansguardian/dansguardian.install
+++ /dev/null
@@ -1,8 +0,0 @@
-post_install() {
-  echo "--------------------------------------------------"
-  echo "NOTE: DansGuardian is NOT free for commercial use."
-  echo "      See http://dansguardian.org for details on"
-  echo "      setup, configuration, and licensing."
-  echo "--------------------------------------------------"
-  chown -R proxy.proxy var/log/dansguardian 
-}
diff --git a/extra/dansguardian/dg2.10.1.1-missing.stdio.patch b/extra/dansguardian/dg2.10.1.1-missing.stdio.patch
deleted file mode 100644
index b92aef008..000000000
--- a/extra/dansguardian/dg2.10.1.1-missing.stdio.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/downloadmanagers/fancy.cpp.orig	2009-09-13 18:37:56.000000000 -0400
-+++ src/downloadmanagers/fancy.cpp	2009-09-13 18:38:14.000000000 -0400
-@@ -32,6 +32,7 @@
- #include <unistd.h>
- #include <iostream>
- #include <math.h>
-+#include <cstdio>
- 
- 
- // GLOBALS
diff --git a/extra/datefudge/PKGBUILD b/extra/datefudge/PKGBUILD
new file mode 100644
index 000000000..37cc1644a
--- /dev/null
+++ b/extra/datefudge/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 170796 2012-11-11 16:17:27Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Dan Serban (dserban01 => gmail)
+
+pkgname=datefudge
+pkgver=1.17
+pkgrel=1
+pkgdesc="A program (and preload library) to fake system date"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://packages.qa.debian.org/d/datefudge.html"
+license=('GPL2')
+depends=('sh')
+source=(http://ftp.de.debian.org/debian/pool/main/d/$pkgname/${pkgname}_${pkgver}.tar.gz)
+md5sums=('d306e183ea3fdbde088ebd523f6387c5')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  #./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make test
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/extra/dbus-c++/PKGBUILD b/extra/dbus-c++/PKGBUILD
index d79922ec5..70df15dba 100644
--- a/extra/dbus-c++/PKGBUILD
+++ b/extra/dbus-c++/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.9.0
 pkgrel=4
 pkgdesc="A C++ API for D-BUS"
 url="http://sourceforge.net/projects/dbus-cplusplus/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('dbus>=1.2.0' 'glib2')
 makedepends=('autoconf' 'automake' 'libtool')
diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD
index 42ae10313..576dc22b9 100644
--- a/extra/dconf/PKGBUILD
+++ b/extra/dconf/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 161615 2012-06-12 13:50:01Z heftig $
+# $Id: PKGBUILD 170097 2012-11-01 16:50:36Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=dconf
-pkgver=0.12.1
-pkgrel=2
+pkgver=0.14.1
+pkgrel=1
 pkgdesc="A low-level configuration system."
 arch=(i686 x86_64 'mips64el')
 url="http://live.gnome.org/dconf"
 license=('LGPL2.1')
 depends=('glib2' 'gtk-update-icon-cache')
-makedepends=('vala' 'gtk3')
+makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl')
 optdepends=('gtk3: for dconf-editor')
 install=dconf.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3cd32b78d88ed7be90dace5d45e2cf8a6abdb253d43dbfa5ef52103b329dc214')
+sha256sums=('59c58c5eafa0ebd616287d078f4441d5342870a44634445d324e88fc0287f0b8')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/devhelp/PKGBUILD b/extra/devhelp/PKGBUILD
index dabafa4f7..992d38e9b 100644
--- a/extra/devhelp/PKGBUILD
+++ b/extra/devhelp/PKGBUILD
@@ -1,26 +1,27 @@
-# $Id: PKGBUILD 156736 2012-04-23 09:04:20Z ibiru $
+# $Id: PKGBUILD 170977 2012-11-14 07:19:21Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 
 pkgname=devhelp
-pkgver=3.4.1
+pkgver=3.6.1
 pkgrel=1
 pkgdesc="API documentation browser for GNOME"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://live.gnome.org/devhelp/"
-depends=('gconf' 'libwebkit3' 'hicolor-icon-theme')
+depends=('gconf' 'webkitgtk3' 'hicolor-icon-theme')
 makedepends=('pkgconfig' 'intltool' 'python2')
 options=('!libtool' '!emptydirs')
 install=devhelp.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3d1148d45d6fac5bb9a4fdf223f19ffa5774aa56df6bbf5b6e86363d8f55552c')
+sha256sums=('71c6933422bf876745fc10276a2b2ee0f8c4c4ddfe034b3f6380507725fd4e63')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
+      --localstatedir=/var --disable-static \
+      --with-webkit2
   make
 }
 
diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD
index fbcdc06b6..849c303cb 100644
--- a/extra/dhcp/PKGBUILD
+++ b/extra/dhcp/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 168635 2012-10-13 17:04:17Z thomas $
+# $Id: PKGBUILD 170145 2012-11-03 17:35:36Z heftig $
 # Maintainer: Daniel Isenmann <daniel @archlinux.org>
 
 pkgbase=dhcp
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.4.1
-_pkgver=4.2.4-P1
+pkgver=4.2.4.2
+_pkgver=4.2.4-P2
 
-pkgrel=3
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp"
@@ -17,8 +17,8 @@ source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz
         dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service
         dhcp-4.1.1-missing-ipv6-not-fatal.patch
         dhclient-script-pathFixes.patch)
-md5sums=('0ca7181024651f6323951d5498c8020b'
-         '0dfe000dd88555ea06b282ae5e574d5f'
+md5sums=('fe36056f2d274fa4b82a5422f192e65f'
+         '1f20126efd33c34d52a4148db780921f'
          'c49b1497837ba56c54e401a66e1bab9b'
          '12c2f3ae47ed23eb698eb7f1bfd80f20'
          '8f357e46e1efcbb746f38737a3f977a2'
@@ -37,10 +37,10 @@ build() {
   patch -Np0 -i "${srcdir}/dhcp-4.1.1-missing-ipv6-not-fatal.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
-      --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases \
-      --with-cli-lease-file=/var/state/dhclient/dhclient.leases \
-      --with-cli6-lease-file=/var/state/dhclient/dhclient6.leases
+      --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
+      --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
+      --with-cli-lease-file=/var/lib/dhclient/dhclient.leases \
+      --with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases
 
   make
 
@@ -59,12 +59,10 @@ package_dhcp(){
   install -D -m755 "${srcdir}/dhcp4" "${pkgdir}/etc/rc.d/dhcp4"
   install -D -m755 "${srcdir}/dhcp6" "${pkgdir}/etc/rc.d/dhcp6"
   install -D -m644 "${srcdir}/dhcp" "${pkgdir}/etc/conf.d/${pkgbase}"
-  install -d "${pkgdir}/var/state/dhcp"
+  install -d "${pkgdir}/var/lib/dhcp"
 
   install -D -m644 "${srcdir}/dhcpd4.service" "${pkgdir}/usr/lib/systemd/system/dhcpd4.service"
   install -D -m644 "${srcdir}/dhcpd6.service" "${pkgdir}/usr/lib/systemd/system/dhcpd6.service"
-  ln -s dhcpd4.service "${pkgdir}/usr/lib/systemd/system/dhcp4.service"
-  ln -s dhcpd6.service "${pkgdir}/usr/lib/systemd/system/dhcp6.service"
 
   # Remove dhclient
   make -C client DESTDIR="${pkgdir}" uninstall
@@ -83,7 +81,7 @@ package_dhclient(){
   # move dhclient.conf to dhclient.conf.example
   mv "${pkgdir}"/etc/dhclient.conf{,.example}
   
-  install -d "${pkgdir}/var/state/dhclient"
+  install -d "${pkgdir}/var/lib/dhclient"
 
   # install dhclient linux script
   install -m755 -D client/scripts/linux "${pkgdir}/sbin/dhclient-script"
diff --git a/extra/dhcp/dhcp.install b/extra/dhcp/dhcp.install
index 5302be4b5..2bcd9ea82 100644
--- a/extra/dhcp/dhcp.install
+++ b/extra/dhcp/dhcp.install
@@ -1,18 +1,14 @@
-# arg 1:  the new package version
 post_install() {
-  [ -f var/state/dhcp/dhcpd.leases ] || : >var/state/dhcp/dhcpd.leases
-  [ -f var/state/dhcp/dhcpd6.leases ] || : >var/state/dhcp/dhcpd6.leases
-  #echo "If dhcpd doesn't start, ensure the ipv6 kernel module is loaded."
-
-  echo
-  echo "==> The dhcp server has now two rc.d scripts."
-  echo "==> Use '/etc/rc.d/dhcp6' to use IPv6 dhcp server or"
-  echo "==> '/etc/rc.d/dhcp4' to use IPv4 dhcp server."
-  echo "==> Make sure that you change your DAEMONS array in '/etc/rc.conf'!"
+  [[ -f var/lib/dhcp/dhcpd.leases ]] || : >var/lib/dhcp/dhcpd.leases
+  [[ -f var/lib/dhcp/dhcpd6.leases ]] || : >var/lib/dhcp/dhcpd6.leases
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
-  post_install $1
+  if (( $(vercmp $2 4.2.4.2) < 0 )); then
+    echo ">>> Lease directory moved from /var/state/dhcp"
+    echo "    to /var/lib/dhcp. Move your old lease files"
+    echo "    if you want to keep using them."
+  fi
+
+  post_install
 }
diff --git a/extra/di/PKGBUILD b/extra/di/PKGBUILD
index 37cd0d056..c5670859f 100644
--- a/extra/di/PKGBUILD
+++ b/extra/di/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 143044 2011-11-21 22:39:45Z eric $
+# $Id: PKGBUILD 171054 2012-11-15 23:33:28Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=di
-pkgver=4.31
-pkgrel=1.1
+pkgver=4.33
+pkgrel=1
 pkgdesc="A disk information utility, displaying everything (and more) that your df command does"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gentoo.com/di/"
 license=('ZLIB')
 depends=('glibc')
 source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('2a7212e03286b68ebb4783ae8937999145165c79')
+sha1sums=('c6f754c3a93845deef7255682fbecd1882a3ddf2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|error|//error|' C/di.h
+  sed -i '11i\#include <string.h>' C/di.h
   make
 }
 
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index 9287e0474..ee9bcd613 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165883 2012-09-02 19:21:35Z ronald $
+# $Id: PKGBUILD 172158 2012-11-30 10:06:04Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,14 +6,14 @@
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
 pkgver=2.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.digikam.org/"
 makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
-             'cmake' 'automoc4' 'doxygen')
+             'cmake' 'automoc4' 'doxygen' 'mesa')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('df4b879a95f4ccac4480c5161d66fb05d6fbefcd')
 
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index 8e4465713..312226912 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 166907 2012-09-21 14:30:04Z andyrtr $
+# $Id: PKGBUILD 172165 2012-11-30 14:16:13Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
 # Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
 
 pkgname=dovecot
-pkgver=2.1.10
+pkgver=2.1.12
 pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64' 'mips64el')
@@ -22,8 +22,8 @@ install=$pkgname.install
 source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig}
         dovecot.sh
         dovecot.tmpfilesd)
-md5sums=('a5a4b3c444cf37e2c6bb6df3af87e18e'
-         '9327f77a0090e7d389cf9f3b35ae7c04'
+md5sums=('b575dfb5db954132f41e7c390e7e11ff'
+         '86abccd4ac989be71a33ff856b25057a'
          '587159e84e2da6f83d70b3c706ba87cc'
          '342a28251d40f983c98c0d1f1bf3d07d')
 
@@ -32,6 +32,9 @@ build() {
 
   # fix build with recent clucene (FC)
   sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in
+  
+  # fix path in helper script
+  sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh
 
   # configure with openssl, mysql, and postgresql support
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
@@ -43,7 +46,8 @@ build() {
 	--with-mysql \
 	--with-pgsql \
 	--with-sqlite \
-	--with-ssl=openssl --with-ssldir=/etc/dovecot/ssl \
+	--with-ssl=openssl \
+	--with-ssldir=/etc/ssl \
 	--with-gssapi \
 	--with-ldap=plugin \
 	--with-zlib --with-bzlib \
diff --git a/extra/dvdauthor/PKGBUILD b/extra/dvdauthor/PKGBUILD
index 31fab8f19..2fd805cdb 100644
--- a/extra/dvdauthor/PKGBUILD
+++ b/extra/dvdauthor/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165483 2012-08-20 17:27:32Z giovanni $
+# $Id: PKGBUILD 169742 2012-10-27 23:41:37Z eric $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Travis Willard <travisw@wmpub.ca> 
 # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
@@ -6,7 +6,7 @@
 
 pkgname=dvdauthor
 pkgver=0.7.1
-pkgrel=1.1
+pkgrel=2
 pkgdesc="DVD authoring tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dvdauthor.sourceforge.net/"
diff --git a/extra/dvdrtools/PKGBUILD b/extra/dvdrtools/PKGBUILD
deleted file mode 100644
index 138c94157..000000000
--- a/extra/dvdrtools/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 137611 2011-09-10 04:22:54Z eric $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=dvdrtools
-pkgver=0.3.1
-pkgrel=3
-pkgdesc="A fork of cdrtools, with the primary goal of supporting writable DVD drives"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://savannah.nongnu.org/projects/dvdrtools/"
-license=('GPL')
-depends=('file' 'bash')
-makedepends=('transcode')
-optdepends=('transcode: video/DVD ripper and encoder for the terminal/console')
-conflicts=('cdrkit')
-source=(ftp://ftp.archlinux.org/other/dvdrtools/$pkgname-$pkgver.tar.gz)
-md5sums=('5707b7e877b853e258cd738938833006')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/extra/e_dbus/PKGBUILD b/extra/e_dbus/PKGBUILD
new file mode 100644
index 000000000..229e7d732
--- /dev/null
+++ b/extra/e_dbus/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id: PKGBUILD 171993 2012-11-25 21:21:29Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
+
+pkgname=e_dbus
+pkgver=1.7.2
+pkgrel=1
+pkgdesc="D-Bus integration with Ecore"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.enlightenment.org"
+license=('BSD')
+depends=('ecore' 'dbus-core')
+options=('!libtool' '!emptydirs')
+source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
+sha1sums=('119af7ddeabf65e294c998ba27a7486027a5e67c')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
+  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
+  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+
+  ./configure \
+    --prefix=/usr \
+    --disable-static \
+    --disable-ebluez \
+    --disable-econnman0_7x \
+    --disable-ehal \
+    --enable-enotify \
+    --disable-eofono \
+    --enable-eukit \
+    --disable-edbus-test \
+    --disable-edbus-test-client \
+    --disable-edbus-bluez-test \
+    --disable-edbus-connman0_7x-test \
+    --disable-edbus-ofono-test \
+    --disable-edbus-async-test \
+    --disable-edbus-performance-test \
+    --disable-doc
+  make
+}
+
+package(){
+  cd $srcdir/$pkgname-$pkgver
+
+  make DESTDIR=$pkgdir install
+
+  # install license files
+  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
+        $pkgdir/usr/share/licenses/$pkgname/COPYING
+}
diff --git a/extra/easytag/PKGBUILD b/extra/easytag/PKGBUILD
index e1468ef72..bbd047d81 100644
--- a/extra/easytag/PKGBUILD
+++ b/extra/easytag/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 159952 2012-05-27 10:21:37Z tomegun $
+# $Id: PKGBUILD 171355 2012-11-17 09:20:41Z eric $
 # Maintainer:
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
@@ -6,23 +6,25 @@
 
 pkgname=easytag
 pkgver=2.1.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Utility for viewing, editing and writing ID3 tags of your MP3 files"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://easytag.sourceforge.net/'
-depends=('id3lib' 'libid3tag' 'gtk2' 'libvorbis' 'flac' 'speex' 'wavpack' 'desktop-file-utils')
+depends=('id3lib' 'libid3tag' 'gtk2' 'libvorbis' 'flac' 'speex' 'wavpack' 'libmp4v2' 'desktop-file-utils')
 install=${pkgname}.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('9df3e800d80e754670642f2ba5e03539')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" easytag-2.1.7-new_libmp4v2.patch)
+md5sums=('9df3e800d80e754670642f2ba5e03539'
+         '0d01887de463585d944777b638a28c85')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i "${srcdir}/easytag-2.1.7-new_libmp4v2.patch"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/easytag/easytag-2.1.7-new_libmp4v2.patch b/extra/easytag/easytag-2.1.7-new_libmp4v2.patch
new file mode 100644
index 000000000..4a6c315c2
--- /dev/null
+++ b/extra/easytag/easytag-2.1.7-new_libmp4v2.patch
@@ -0,0 +1,535 @@
+Compability with libmp4v2.so.2 (upstream revision r479)
+
+http://bugs.gentoo.org/409281
+
+--- src/mp4_header.c
++++ src/mp4_header.c
+@@ -204,7 +204,7 @@
+     /* Get size of file */
+     ETFileInfo->size = Get_File_Size(filename);
+ 
+-    if ((file = MP4Read(filename, 0)) == MP4_INVALID_FILE_HANDLE )
++    if ((file = MP4Read(filename)) == MP4_INVALID_FILE_HANDLE )
+     {
+         gchar *filename_utf8 = filename_to_display(filename);
+         //g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
+@@ -218,7 +218,7 @@
+     {
+         gchar *filename_utf8 = filename_to_display(filename);
+         Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,("Contains no audio track"));
+-        MP4Close(file);
++        MP4Close(file, 0);
+         g_free(filename_utf8);
+         return FALSE;
+     }
+@@ -243,7 +243,7 @@
+     ETFileInfo->mode = MP4GetTrackAudioChannels(file, trackId);
+     ETFileInfo->duration = MP4ConvertFromTrackDuration(file, trackId, MP4GetTrackDuration(file, trackId), MP4_SECS_TIME_SCALE);
+ 
+-    MP4Close(file);
++    MP4Close(file, 0);
+     return TRUE;
+ }
+ 
+--- src/mp4_tag.c
++++ src/mp4_tag.c
+@@ -80,15 +80,9 @@
+ {
+     FILE   *file;
+     MP4FileHandle mp4file = NULL;
+-    uint16_t track, track_total;
+-    uint16_t disk, disktotal;
+-    u_int8_t *coverArt;
+-    u_int32_t coverSize;
+     Picture *prev_pic = NULL;
+-#ifdef NEWMP4
+     gint pic_num;
+-#endif
+-    
++
+     if (!filename || !FileTag)
+         return FALSE;
+ 
+@@ -102,7 +96,7 @@
+     fclose(file); // We close it cause mp4 opens/closes file itself
+ 
+     /* Get data from tag */
+-    mp4file = MP4Read(filename, 0);
++    mp4file = MP4Read(filename);
+     if (mp4file == MP4_INVALID_FILE_HANDLE)
+     {
+         gchar *filename_utf8 = filename_to_display(filename);
+@@ -111,109 +105,134 @@
+         return FALSE;
+     }
+ 
++    const MP4Tags* tags = MP4TagsAlloc();
++    MP4TagsFetch(tags, mp4file);
++
+     /* TODO Add error detection */
+ 
+     /*********
+      * Title *
+      *********/
+-    MP4GetMetadataName(mp4file, &FileTag->title);
++    if (tags->name)
++    {
++        FileTag->title = Try_To_Validate_Utf8_String(tags->name);
++    }
+ 
+     /**********
+      * Artist *
+      **********/
+-    MP4GetMetadataArtist(mp4file, &FileTag->artist);
++    if (tags->artist)
++    {
++        FileTag->artist = Try_To_Validate_Utf8_String(tags->artist);
++    }
++
++    /****************
++     * Album Artist *
++     ****************/
++    if (tags->albumArtist)
++    {
++        FileTag->album_artist = Try_To_Validate_Utf8_String(tags->albumArtist);
++    }
+ 
+     /*********
+      * Album *
+      *********/
+-    MP4GetMetadataAlbum(mp4file, &FileTag->album);
++    if (tags->album)
++    {
++        FileTag->album = Try_To_Validate_Utf8_String(tags->album);
++    }
+ 
+     /**********************
+      * Disk / Total Disks *
+      **********************/
+-    if (MP4GetMetadataDisk(mp4file, &disk, &disktotal))
++    if (tags->disk)
+     {
+-        if (disk != 0 && disktotal != 0)
+-            FileTag->disc_number = g_strdup_printf("%d/%d",(gint)disk,(gint)disktotal);
+-        else if (disk != 0)
+-            FileTag->disc_number = g_strdup_printf("%d",(gint)disk);
+-        else if (disktotal != 0)
+-            FileTag->disc_number = g_strdup_printf("/%d",(gint)disktotal);
+-        //if (disktotal != 0)
+-        //    FileTag->disk_number_total = g_strdup_printf("%d",(gint)disktotal);
++        if (tags->disk->index != 0 && tags->disk->total != 0)
++            FileTag->disc_number = g_strdup_printf("%d/%d",(gint)tags->disk->index,(gint)tags->disk->total);
++        else if (tags->disk->index != 0)
++            FileTag->disc_number = g_strdup_printf("%d",(gint)tags->disk->index);
++        else if (tags->disk->total != 0)
++            FileTag->disc_number = g_strdup_printf("/%d",(gint)tags->disk->total);
+     }
+ 
+     /********
+      * Year *
+      ********/
+-    MP4GetMetadataYear(mp4file, &FileTag->year);
++    if (tags->releaseDate)
++    {
++        FileTag->year = Try_To_Validate_Utf8_String(tags->releaseDate);
++    }
+ 
+     /*************************
+      * Track and Total Track *
+      *************************/
+-    if (MP4GetMetadataTrack(mp4file, &track, &track_total))
++    if (tags->track)
+     {
+-        if (track != 0)
+-            FileTag->track = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,(gint)track); // Just to have numbers like this : '01', '05', '12', ...
+-        if (track_total != 0)
+-            FileTag->track_total = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,(gint)track_total); // Just to have numbers like this : '01', '05', '12', ...
++        if (tags->track->index != 0)
++            FileTag->track = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,(gint)tags->track->index); // Just to have numbers like this : '01', '05', '12', ...
++        if (tags->track->total != 0)
++            FileTag->track_total = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,(gint)tags->track->total); // Just to have numbers like this : '01', '05', '12', ...
+     }
+ 
+     /*********
+      * Genre *
+      *********/
+-    MP4GetMetadataGenre(mp4file, &FileTag->genre);
++    if (tags->genre)
++    {
++        FileTag->genre = Try_To_Validate_Utf8_String(tags->genre);
++    }
+ 
+     /***********
+      * Comment *
+      ***********/
+-    MP4GetMetadataComment(mp4file, &FileTag->comment);
++    if (tags->comments)
++    {
++        FileTag->comment = Try_To_Validate_Utf8_String(tags->comments);
++    }
+ 
+     /**********************
+      * Composer or Writer *
+      **********************/
+-    MP4GetMetadataWriter(mp4file, &FileTag->composer);
++    if (tags->composer)
++    {
++        FileTag->composer = Try_To_Validate_Utf8_String(tags->composer);
++    }
+ 
+     /*****************
+      * Encoding Tool *
+      *****************/
+-    MP4GetMetadataTool(mp4file, &FileTag->encoded_by);
+-
+-    /* Unimplemented
+-    Tempo / BPM
+-    MP4GetMetadataTempo(file, &string)
+-    */
++    if (tags->encodedBy)
++    {
++        FileTag->encoded_by = Try_To_Validate_Utf8_String(tags->encodedBy);
++    }
+ 
+     /***********
+      * Picture *
+      ***********/
+-#ifdef NEWMP4
+-    // There version can handle multiple pictures!
+-    // Version 1.6 of libmp4v2 introduces an index argument for MP4GetMetadataCoverart
+-    for (pic_num = 0; (MP4GetMetadataCoverArt( mp4file, &coverArt, &coverSize,pic_num )); pic_num++)
+-#else
+-    // There version handle only one picture!
+-    if ( MP4GetMetadataCoverArt( mp4file, &coverArt, &coverSize ) )
+-#endif
+-    {
+-        Picture *pic;
+-        
+-        pic = Picture_Allocate();
+-        if (!prev_pic)
+-            FileTag->picture = pic;
+-        else
+-            prev_pic->next = pic;
+-        prev_pic = pic;
+-
+-        pic->size = coverSize;
+-        pic->data = coverArt;
+-        pic->type = PICTURE_TYPE_FRONT_COVER;
+-        pic->description = NULL;
++    if (tags->artworkCount) {
++        const MP4TagArtwork* art = tags->artwork; /* artwork != NULL when artworkCount > 0 */
++        for (pic_num = 0; pic_num < tags->artworkCount; pic_num++, art++)
++        {
++            Picture *pic;
++
++            pic = Picture_Allocate();
++            if (!prev_pic)
++                FileTag->picture = pic;
++            else
++                prev_pic->next = pic;
++            prev_pic = pic;
++
++            pic->size = art->size;
++            pic->data = g_memdup(art->data, pic->size);
++            pic->type = PICTURE_TYPE_FRONT_COVER;
++            pic->description = NULL;
++        }
+     }
+ 
+ 
+     /* Free allocated data */
+-    MP4Close(mp4file);
++    MP4TagsFree(tags);
++    MP4Close(mp4file, 0);
+ 
+     return TRUE;
+ }
+@@ -235,6 +254,7 @@
+     FILE     *file;
+     MP4FileHandle mp4file = NULL;
+     gint error = 0;
++    gint pic_num;
+ 
+     if (!ETFile || !ETFile->FileTag)
+         return FALSE;
+@@ -252,23 +272,25 @@
+     fclose(file);
+ 
+     /* Open file for writing */
+-    mp4file = MP4Modify(filename,0,0);
++    mp4file = MP4Modify(filename, 0);
+     if (mp4file == MP4_INVALID_FILE_HANDLE)
+     {
+         Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,_("MP4 format invalid"));
+         return FALSE;
+     }
+ 
++    const MP4Tags* tags = MP4TagsAlloc();
++    MP4TagsFetch(tags, mp4file);
++
+     /*********
+      * Title *
+      *********/
+     if (FileTag->title && g_utf8_strlen(FileTag->title, -1) > 0)
+     {
+-        MP4SetMetadataName(mp4file, FileTag->title);
++        MP4TagsSetName(tags, FileTag->title);
+     }else
+     {
+-        //MP4DeleteMetadataName(mp4file); // Not available on mpeg4ip-1.2 (only in 1.3)
+-        MP4SetMetadataName(mp4file, "");
++        MP4TagsSetName(tags, "");
+     }
+ 
+     /**********
+@@ -276,11 +298,21 @@
+      **********/
+     if (FileTag->artist && g_utf8_strlen(FileTag->artist, -1) > 0)
+     {
+-        MP4SetMetadataArtist(mp4file, FileTag->artist);
++        MP4TagsSetArtist(tags, FileTag->artist);
++    }else
++    {
++        MP4TagsSetArtist(tags, "");
++    }
++
++    /****************
++     * Album Artist *
++     ****************/
++    if (FileTag->artist && g_utf8_strlen(FileTag->artist, -1) > 0)
++    {
++        MP4TagsSetAlbumArtist(tags, FileTag->album_artist);
+     }else
+     {
+-        //MP4DeleteMetadataArtist(mp4file);
+-        MP4SetMetadataArtist(mp4file, "");
++        MP4TagsSetAlbumArtist(tags, "");
+     }
+ 
+     /*********
+@@ -288,22 +320,19 @@
+      *********/
+     if (FileTag->album && g_utf8_strlen(FileTag->album, -1) > 0)
+     {
+-        MP4SetMetadataAlbum(mp4file, FileTag->album);
++        MP4TagsSetAlbum(tags, FileTag->album);
+     }else
+     {
+-        //MP4DeleteMetadataAlbum(mp4file);
+-        MP4SetMetadataAlbum(mp4file, "");
++        MP4TagsSetAlbum(tags, "");
+     }
+ 
+     /**********************
+      * Disk / Total Disks *
+      **********************/
++    MP4TagDisk td;
+     if (FileTag->disc_number && g_utf8_strlen(FileTag->disc_number, -1) > 0)
+     //|| FileTag->disc_number_total && g_utf8_strlen(FileTag->disc_number_total, -1) > 0)
+     {
+-        uint16_t disk      = 0;
+-        uint16_t disktotal = 0;
+-
+         /* At the present time, we manage only disk number like '1' or '1/2', we
+          * don't use disk number total... so here we try to decompose */
+         if (FileTag->disc_number)
+@@ -314,27 +343,24 @@
+             {
+                 // A disc_number_total was entered
+                 if ( (tmp+1) && atoi(tmp+1) )
+-                    disktotal = atoi(tmp+1);
++                    td.total = atoi(tmp+1);
+ 
+                 // Fill disc_number
+                 *tmp = '\0';
+-                disk = atoi(dn_tmp);
++                td.index = atoi(dn_tmp);
+             }else
+             {
+-                disk = atoi(FileTag->disc_number);
++                td.index = atoi(FileTag->disc_number);
++                td.total = NULL;
+             }
+             g_free(dn_tmp);
+         }
+-        /*if (FileTag->disc_number)
+-            disk = atoi(FileTag->disc_number);
+-        if (FileTag->disc_number_total)
+-            disktotal = atoi(FileTag->disc_number_total);
+-        */
+-        MP4SetMetadataDisk(mp4file, disk, disktotal);
++        MP4TagsSetDisk(tags, &td);
+     }else
+     {
+-        //MP4DeleteMetadataDisk(mp4file);
+-        MP4SetMetadataDisk(mp4file, 0, 0);
++        td.index = NULL;
++        td.total = NULL;
++        MP4TagsSetDisk(tags, &td);
+     }
+ 
+     /********
+@@ -342,30 +368,29 @@
+      ********/
+     if (FileTag->year && g_utf8_strlen(FileTag->year, -1) > 0)
+     {
+-        MP4SetMetadataYear(mp4file, FileTag->year);
++        MP4TagsSetReleaseDate(tags, FileTag->year);
+     }else
+     {
+-        //MP4DeleteMetadataYear(mp4file);
+-        MP4SetMetadataYear(mp4file, "");
++        MP4TagsSetReleaseDate(tags, "");
+     }
+ 
+     /*************************
+      * Track and Total Track *
+      *************************/
++    MP4TagTrack tt;
+     if ( (FileTag->track       && g_utf8_strlen(FileTag->track, -1) > 0)
+     ||   (FileTag->track_total && g_utf8_strlen(FileTag->track_total, -1) > 0) )
+     {
+-        uint16_t track       = 0;
+-        uint16_t track_total = 0;
+         if (FileTag->track)
+-            track = atoi(FileTag->track);
++            tt.index = atoi(FileTag->track);
+         if (FileTag->track_total)
+-            track_total = atoi(FileTag->track_total);
+-        MP4SetMetadataTrack(mp4file, track, track_total);
++            tt.total = atoi(FileTag->track_total);
++        MP4TagsSetTrack(tags, &tt);
+     }else
+     {
+-        //MP4DeleteMetadataTrack(mp4file);
+-        MP4SetMetadataTrack(mp4file, 0, 0);
++        tt.index = NULL;
++        tt.total = NULL;
++        MP4TagsSetTrack(tags, &tt);
+     }
+ 
+     /*********
+@@ -373,11 +398,10 @@
+      *********/
+     if (FileTag->genre && g_utf8_strlen(FileTag->genre, -1) > 0 )
+     {
+-        MP4SetMetadataGenre(mp4file, FileTag->genre);
++        MP4TagsSetGenre(tags, FileTag->genre);
+     }else
+     {
+-        //MP4DeleteMetadataGenre(mp4file);
+-        MP4SetMetadataGenre(mp4file, "");
++        MP4TagsSetGenre(tags, "");
+     }
+ 
+     /***********
+@@ -385,11 +409,10 @@
+      ***********/
+     if (FileTag->comment && g_utf8_strlen(FileTag->comment, -1) > 0)
+     {
+-        MP4SetMetadataComment(mp4file, FileTag->comment);
++        MP4TagsSetComments(tags, FileTag->comment);
+     }else
+     {
+-        //MP4DeleteMetadataComment(mp4file);
+-        MP4SetMetadataComment(mp4file, "");
++        MP4TagsSetComments(tags, "");
+     }
+ 
+     /**********************
+@@ -397,11 +420,10 @@
+      **********************/
+     if (FileTag->composer && g_utf8_strlen(FileTag->composer, -1) > 0)
+     {
+-        MP4SetMetadataWriter(mp4file, FileTag->composer);
++        MP4TagsSetComposer(tags, FileTag->composer);
+     }else
+     {
+-        //MP4DeleteMetadataWriter(mp4file);
+-        MP4SetMetadataWriter(mp4file, "");
++        MP4TagsSetComposer(tags, "");
+     }
+ 
+     /*****************
+@@ -409,33 +431,39 @@
+      *****************/
+     if (FileTag->encoded_by && g_utf8_strlen(FileTag->encoded_by, -1) > 0)
+     {
+-        MP4SetMetadataTool(mp4file, FileTag->encoded_by);
++        MP4TagsSetEncodedBy(tags, FileTag->encoded_by);
+     }else
+     {
+-        //MP4DeleteMetadataTool(mp4file);
+-        MP4SetMetadataTool(mp4file, "");
++        MP4TagsSetEncodedBy(tags, "");
+     }
+ 
+     /***********
+      * Picture *
+      ***********/
++    Picture *pic = FileTag->picture;
++    const gint artworkCount = tags->artworkCount;
++
++    for (pic_num = 0; pic_num < artworkCount; pic_num++)
+     {
+-        // Can handle only one picture...
+-        Picture *pic;
++        MP4TagsRemoveArtwork(tags, 0);
++    }
+ 
+-        //MP4DeleteMetadataCoverArt(mp4file);
+-        MP4SetMetadataCoverArt(mp4file, NULL, 0);
+-        for( pic = FileTag->picture; pic; pic = pic->next )
++    while (pic)
++    {
++        if (pic->data)
+         {
+-            if( pic->type == PICTURE_TYPE_FRONT_COVER )
+-            {
+-                MP4SetMetadataCoverArt(mp4file, pic->data, pic->size);
+-            }
++            MP4TagArtwork art;
++            art.data = pic->data;
++            art.size = pic->size;
++            art.type = MP4_ART_UNDEFINED; // delegate typing to libmp4v2
++            MP4TagsAddArtwork(tags, &art);
+         }
++        pic = pic->next;
+     }
+ 
+-
+-    MP4Close(mp4file);
++    MP4TagsStore(tags, mp4file);
++    MP4TagsFree(tags);
++    MP4Close(mp4file, 0);
+ 
+     if (error) return FALSE;
+     else       return TRUE;
+--- src/picture.c
++++ src/picture.c
+@@ -326,24 +326,7 @@
+     else if (MESSAGE_BOX_POSITION_MOUSE)
+         gtk_window_set_position(GTK_WINDOW(FileSelectionWindow),GTK_WIN_POS_MOUSE);
+ 
+-    // Behaviour following the tag type...
+-    switch (ETCore->ETFileDisplayed->ETFileDescription->TagType)
+-    {
+-        case MP4_TAG:
+-        {
+-            // Only one file can be selected
+-            gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(FileSelectionWindow), FALSE);
+-            break;
+-        }
+-
+-        // Other tag types
+-        default:
+-        {
+-            gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(FileSelectionWindow), TRUE);
+-            break;
+-        }
+-    }
+-
++    gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(FileSelectionWindow), TRUE);
+     gtk_dialog_set_default_response(GTK_DIALOG(FileSelectionWindow), GTK_RESPONSE_OK);
+ 
+     // Starting directory (the same of the current file)
diff --git a/extra/easytag/easytag.install b/extra/easytag/easytag.install
index 93908edac..660593cf5 100644
--- a/extra/easytag/easytag.install
+++ b/extra/easytag/easytag.install
@@ -1,5 +1,5 @@
 post_install() {
-    [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
+    update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/extra/ecore/PKGBUILD b/extra/ecore/PKGBUILD
new file mode 100644
index 000000000..5fc0d97c4
--- /dev/null
+++ b/extra/ecore/PKGBUILD
@@ -0,0 +1,94 @@
+# $Id: PKGBUILD 171984 2012-11-25 21:16:15Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
+
+pkgname=ecore
+pkgver=1.7.2
+pkgrel=1
+pkgdesc="OS abstraction layer for e17"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.enlightenment.org"
+license=('BSD')
+depends=('eina' 'evas' 'glib2' 'libxp' 'curl' 'libxss' 'libxtst'
+  'libxcomposite' 'libxrandr' 'libxinerama' 'libxcursor')
+makedepends=('subversion')
+options=('!libtool' '!emptydirs')
+source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
+sha1sums=('190f257d7c8c5a233a9e4644a02e9fd6b4898e89')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  
+  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
+  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
+  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+
+  ./configure \
+    --prefix=/usr \
+    --libexecdir=/usr/lib/ecore \
+    --with-internal-maximum-log-level=3 \
+    --disable-static \
+    --disable-ecore-timer-dump \
+    --enable-glib \
+    --enable-ecore-x-composite \
+    --enable-ecore-x-damage \
+    --enable-ecore-x-dpms \
+    --enable-ecore-x-randr \
+    --enable-ecore-x-render \
+    --enable-ecore-x-screensaver \
+    --enable-ecore-x-shape \
+    --enable-ecore-x-gesture \
+    --enable-ecore-x-sync \
+    --enable-ecore-x-xfixes \
+    --enable-ecore-x-xinerama \
+    --enable-ecore-x-xprint \
+    --enable-ecore-x-xtest \
+    --enable-ecore-x-cursor \
+    --enable-ecore-x-input \
+    --enable-ecore-x-dri \
+    --enable-epoll \
+    --enable-posix-threads \
+    --disable-debug-threads \
+    --enable-thread-safety \
+    --enable-atfile-source \
+    --enable-ecore-con \
+    --enable-curl \
+    --disable-gnutls \
+    --enable-openssl \
+    --enable-ecore-ipc \
+    --enable-ecore-file \
+    --enable-poll \
+    --enable-inotify \
+    --enable-ecore-imf \
+    --enable-ecore-imf-evas \
+    --enable-ecore-input \
+    --enable-ecore-input-evas \
+    --enable-ecore-imf-xim \
+    --disable-ecore-imf-scim \
+    --disable-ecore-imf-ibus \
+    --enable-ecore-x \
+    --disable-ecore-sdl \
+    --enable-ecore-fb \
+    --disable-ecore-directfb \
+    --enable-ecore-evas \
+    --enable-ecore-evas-software-buffer \
+    --enable-ecore-evas-software-x11 \
+    --enable-ecore-evas-opengl-x11 \
+    --enable-ecore-evas-fb \
+    --disable-ecore-evas-ews \
+    --disable-ecore-wayland \
+    --disable-tests \
+    --disable-coverage \
+    --disable-install-examples \
+    --disable-doc
+  make
+}
+
+package(){
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+
+# install license files
+  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
+        $pkgdir/usr/share/licenses/$pkgname/COPYING
+}
diff --git a/extra/edje/PKGBUILD b/extra/edje/PKGBUILD
new file mode 100644
index 000000000..5079cd2a9
--- /dev/null
+++ b/extra/edje/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 171989 2012-11-25 21:18:51Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
+
+pkgname=edje
+pkgver=1.7.2
+pkgrel=1
+pkgdesc="A graphical design and layout library based on Evas"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.enlightenment.org"
+license=('BSD')
+depends=('eina' 'ecore' 'evas' 'eio' 'lua' 'shared-mime-info' 'embryo')
+optdepends=('python2: inkscape2edc')
+install=edje.install
+options=('!libtool' '!emptydirs')
+source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
+sha1sums=('f42b5276840dc2b5cc611150ad72f1a54dae123b')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
+  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
+  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+
+  # python2 fix
+  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' utils/inkscape2edc
+
+  ./configure \
+    --prefix=/usr \
+    --disable-static \
+    --enable-ecore-imf \
+    --enable-eio \
+    --disable-sndfile \
+    --disable-remix \
+    --disable-vorbisenc \
+    --disable-alsa \
+    --disable-flac \
+    --disable-tests \
+    --disable-coverage \
+    --enable-amalgamation \
+    --disable-doc
+  make
+}
+
+package(){
+  cd $srcdir/$pkgname-$pkgver
+
+  make DESTDIR=$pkgdir install
+
+  # install license files
+  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
+        $pkgdir/usr/share/licenses/$pkgname/COPYING
+}
diff --git a/extra/edje/changeset_76449.diff b/extra/edje/changeset_76449.diff
new file mode 100644
index 000000000..1a1406b4e
--- /dev/null
+++ b/extra/edje/changeset_76449.diff
@@ -0,0 +1,46 @@
+Index: /trunk/edje/src/bin/edje_cc_out.c

+===================================================================

+--- /trunk/edje/src/bin/edje_cc_out.c	(revision 76448)

++++ /trunk/edje/src/bin/edje_cc_out.c	(revision 76449)

+@@ -1882,25 +1882,30 @@

+              for (i = 0 ; i < pc->programs.fnmatch_count ; i++)

+                {

+-                  if (!strcmp(pl->u.ep->name, pc->programs.fnmatch[i]->name))

++                  if (pl->u.ep->name && pc->programs.fnmatch[i]->name &&

++                      !strcmp(pl->u.ep->name, pc->programs.fnmatch[i]->name))

+                     data_queue_anonymous_lookup(pc, pc->programs.fnmatch[i], dest);

+                }

+              for (i = 0 ; i < pc->programs.strcmp_count ; i++)

+                {

+-                  if (!strcmp(pl->u.ep->name, pc->programs.strcmp[i]->name))

++                  if (pl->u.ep->name && pc->programs.strcmp[i]->name &&

++                      !strcmp(pl->u.ep->name, pc->programs.strcmp[i]->name))

+                     data_queue_anonymous_lookup(pc, pc->programs.strcmp[i], dest);

+                }

+              for (i = 0 ; i < pc->programs.strncmp_count ; i++)

+                {

+-                  if (!strcmp(pl->u.ep->name, pc->programs.strncmp[i]->name))

++                  if (pl->u.ep->name && pc->programs.strncmp[i]->name &&

++                      !strcmp(pl->u.ep->name, pc->programs.strncmp[i]->name))

+                     data_queue_anonymous_lookup(pc, pc->programs.strncmp[i], dest);

+                }

+              for (i = 0 ; i < pc->programs.strrncmp_count ; i++)

+                {

+-                  if (!strcmp(pl->u.ep->name, pc->programs.strrncmp[i]->name))

++                  if (pl->u.ep->name && pc->programs.strrncmp[i]->name &&

++                      !strcmp(pl->u.ep->name, pc->programs.strrncmp[i]->name))

+                     data_queue_anonymous_lookup(pc, pc->programs.strrncmp[i], dest);

+                }

+              for (i = 0 ; i < pc->programs.nocmp_count ; i++)

+                {

+-                  if (!strcmp(pl->u.ep->name, pc->programs.nocmp[i]->name))

++                  if (pl->u.ep->name && pc->programs.nocmp[i]->name &&

++                      !strcmp(pl->u.ep->name, pc->programs.nocmp[i]->name))

+                     data_queue_anonymous_lookup(pc, pc->programs.nocmp[i], dest);

+                }

+@@ -2450,4 +2455,5 @@

+ {

+    Code_Lookup *cl;

++

+    cl = mem_alloc(SZ(Code_Lookup));

+    cl->ptr = ptr;

diff --git a/extra/slv2/slv2.install b/extra/edje/edje.install
index c980ddfab..8407f4576 100644
--- a/extra/slv2/slv2.install
+++ b/extra/edje/edje.install
@@ -1,6 +1,5 @@
 post_install() {
-  echo "Updating Shared Library Links"
-  /sbin/ldconfig
+  update-mime-database usr/share/mime > /dev/null
 }
 
 post_upgrade() {
@@ -11,4 +10,7 @@ post_remove() {
   post_install
 }
 
-# vim:set ts=2 sw=2 et:
+
+
+
+
diff --git a/extra/eet/PKGBUILD b/extra/eet/PKGBUILD
new file mode 100644
index 000000000..7e0ac5946
--- /dev/null
+++ b/extra/eet/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 171981 2012-11-25 21:14:16Z ronald $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=eet
+pkgver=1.7.2
+pkgrel=1
+pkgdesc="A data storage and compression library"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.enlightenment.org"
+license=('BSD')
+depends=('libjpeg>=7' 'openssl' 'eina')
+options=(!libtool)
+source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
+sha1sums=('8e768421107e48ae55839ba0e3d36440f74e0bf6')
+
+build() {
+   cd $srcdir/$pkgname-$pkgver
+
+  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
+  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
+  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+
+  ./configure --prefix=/usr --enable-openssl --disable-gnutls \
+	--disable-build-examples \
+	--disable-doc --disable-install-examples \
+	--disable-old-eet-file-format --disable-tests \
+	--disable-static
+  make
+}
+
+package(){
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install 
+
+  # install license files
+  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
+        $pkgdir/usr/share/licenses/$pkgname/COPYING
+}
+
diff --git a/extra/eeze/PKGBUILD b/extra/eeze/PKGBUILD
new file mode 100644
index 000000000..0e47a745d
--- /dev/null
+++ b/extra/eeze/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 171987 2012-11-25 21:17:34Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
+
+pkgname=eeze
+pkgver=1.7.2
+pkgrel=1
+pkgdesc="Manipulate devices using udev and sysfs"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.enlightenment.org"
+license=('BSD')
+depends=('ecore' 'eina' 'udev')
+options=('!libtool' '!emptydirs')
+source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
+sha1sums=('6d5562116c143841485c51278064b772d79bdb27')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
+  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
+  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+
+  ./configure \
+    --prefix=/usr \
+    --disable-static \
+    --disable-tests \
+    --disable-doc
+  make
+}
+
+package(){
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+
+  # install license files
+  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
+        $pkgdir/usr/share/licenses/$pkgname/COPYING
+}
diff --git a/extra/efreet/PKGBUILD b/extra/efreet/PKGBUILD
new file mode 100644
index 000000000..96623cec2
--- /dev/null
+++ b/extra/efreet/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 171992 2012-11-25 21:20:53Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
+
+pkgname=efreet
+pkgver=1.7.2
+pkgrel=1
+pkgdesc="FreeDesktop.Org specifications for e17"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.enlightenment.org"
+license=('BSD')
+depends=('eina' 'ecore' 'e_dbus')
+options=('!libtool' '!emptydirs')
+source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
+sha1sums=('ec8c8f6504b2205c74e992f8ea911dcb746452fd')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
+  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
+  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+
+  ./configure \
+    --prefix=/usr \
+    --disable-static \
+    --disable-tests \
+    --disable-coverage \
+    --disable-doc
+
+  make
+}
+
+package(){
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+
+  # install license files
+  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
+        $pkgdir/usr/share/licenses/$pkgname/COPYING
+}
+
+
diff --git a/extra/eina/PKGBUILD b/extra/eina/PKGBUILD
new file mode 100644
index 000000000..a490cc063
--- /dev/null
+++ b/extra/eina/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 171980 2012-11-25 21:13:37Z ronald $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=eina
+pkgver=1.7.2
+pkgrel=1
+pkgdesc="A core data structure and common utility library"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.enlightenment.org"
+license=('LGPL2.1')
+depends=('glibc')
+options=('!libtool' '!emptydirs')
+source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
+sha1sums=('cb56cf9ec28d7cb42ca168d9e261c5f580986c29')
+
+build() {
+   cd $srcdir/$pkgname-$pkgver
+
+  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
+  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
+  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+
+  ./configure --prefix=/usr --enable-amalgamation \
+	--with-internal-maximum-log-level=3 \
+	--disable-static \
+	--disable-benchmark \
+	--disable-install-examples \
+	--disable-build-examples \
+	--disable-doc \
+	--disable-tests \
+	--enable-default-mempool \
+	--enable-mempool-chained-pool \
+	--enable-mempool-pass-through \
+	--disable-mempool-buddy \
+	--disable-mempool-ememoa-fixed \
+	--disable-mempool-ememoa-unknown \
+	--disable-mempool-fixed-bitmap \
+	--disable-assert \
+	--disable-ememoa 
+
+#	--disable-mempool-one-big ## this option causes a segfault in 1.7.2
+
+  make
+}
+
+package(){
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+}
diff --git a/extra/eio/PKGBUILD b/extra/eio/PKGBUILD
new file mode 100644
index 000000000..4c83f5f6d
--- /dev/null
+++ b/extra/eio/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 171985 2012-11-25 21:16:56Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
+
+pkgname=eio
+pkgver=1.7.2
+pkgrel=1
+pkgdesc="Async IO library using Ecore"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.enlightenment.org"
+license=('BSD')
+depends=('ecore')
+options=('!libtool' '!emptydirs')
+source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
+sha1sums=('ce242ab4d3ec2659e4986694e5ed99932d9faa99')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
+  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
+  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+
+  ./configure \
+    --prefix=/usr \
+    --disable-static \
+    --enable-posix-threads \
+    --disable-debug-threads \
+    --enable-inotify \
+    --disable-install-examples \
+    --disable-doc
+  make
+}
+
+package(){
+  cd $pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+
+  # install license files
+  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
+  	$pkgdir/usr/share/licenses/$pkgname/COPYING
+}
diff --git a/extra/eject/PKGBUILD b/extra/eject/PKGBUILD
deleted file mode 100644
index 093bfcf61..000000000
--- a/extra/eject/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 135944 2011-08-20 17:05:11Z tomegun $
-# Maintainer: Tom Gundersen <teg@jlkm.no>
-# Contributor: Natrio <natrio@list.ru>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=eject
-pkgver=2.1.5
-pkgrel=7.1
-pkgdesc="A program for ejecting removable media under software control."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://eject.sourceforge.net/"
-license=('GPL')
-depends=('glibc')
-source=("ftp://ftp.archlinux.org/other/eject/eject-${pkgver}.tar.bz2"
-        'eject-2.1.1-verbose.patch'
-        'eject-2.1.5-lock.patch'
-        'eject-2.1.5-spaces.patch'
-        'eject-2.1.5-umount.patch'
-        'eject-timeout.patch'
-        'eject-2.1.5-unlock.patch'
-        'eject-2.1.5-openrw.patch')
-md5sums=('5a6cab2184ae4ed21128054d931d558f'
-         '4fb81806de181d5f353a459b7f122081'
-         '7d18c14f7b1bb50149fd2b41215dc4f2'
-         '64f5c54dac064e6dbc427025d919221b'
-         '34221248a269703d3a47a8d2a6fdd2e2'
-         'f6b1b702ef9174e2fd05a56ee2de850e'
-         'f384f98fa689b087d99217a7403bf706'
-         'e74d742540e4f399d348af495bf00e85')
-
-build() {
-  cd "${srcdir}/eject"
-  patch -p1 -i "${srcdir}/eject-2.1.1-verbose.patch"
-  patch -p1 -i "${srcdir}/eject-2.1.5-lock.patch"
-  patch -p1 -i "${srcdir}/eject-2.1.5-spaces.patch"
-  patch -p1 -i "${srcdir}/eject-2.1.5-umount.patch"
-  patch -p1 -i "${srcdir}/eject-timeout.patch"
-  patch -p1 -i "${srcdir}/eject-2.1.5-unlock.patch"
-  patch -p1 -i "${srcdir}/eject-2.1.5-openrw.patch"
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man \
-              --enable-default-device=sr0
-  make
-}
-
-package() {
-  cd "${srcdir}/eject"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/eject/eject-2.1.1-verbose.patch b/extra/eject/eject-2.1.1-verbose.patch
deleted file mode 100644
index 44c05d881..000000000
--- a/extra/eject/eject-2.1.1-verbose.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/eject.c b/eject.c
-index b14d5f2..662ba54 100644
---- a/eject.c
-+++ b/eject.c
-@@ -709,7 +709,9 @@ static int EjectScsi(int fd)
- 	unsigned char sense_buffer[32];
- 
- 	if ((ioctl(fd, SG_GET_VERSION_NUM, &k) < 0) || (k < 30000)) {
--	  printf("not an sg device, or old sg driver\n");
-+	  if (v_option) {
-+		  printf(_("not an sg device, or old sg driver\n"));
-+	  }
- 	  return 0;
- 	}
- 
diff --git a/extra/eject/eject-2.1.5-lock.patch b/extra/eject/eject-2.1.5-lock.patch
deleted file mode 100644
index 25f84651e..000000000
--- a/extra/eject/eject-2.1.5-lock.patch
+++ /dev/null
@@ -1,171 +0,0 @@
- eject.1 |   13 +++++++++++--
- eject.c |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
- 2 files changed, 63 insertions(+), 4 deletions(-)
-
-diff --git a/eject.1 b/eject.1
-index 3c388c6..315dc6d 100644
---- a/eject.1
-+++ b/eject.1
-@@ -17,6 +17,8 @@ eject [\-vn] \-a on|off|1|0 [<name>]
- .br
- eject [\-vn] \-c slot [<name>]
- .br
-+eject [\-vn] \-i on|off|1|0 [<name>]
-+.br
- eject [\-vn] \-t [<name>]
- .br
- eject [\-vn] \-T [<name>]
-@@ -83,6 +85,13 @@ for a change request to work. Please also note that the first slot of
- the changer is referred to as 0, not 1.
- 
- .TP 0.5i
-+.B \-i on|1|off|0
-+This option controls locking of the hardware eject button. When
-+enabled, the drive will not be ejected when the button is pressed.
-+This is useful when you are carrying a laptop in a bag or case and
-+don't want it to eject if the button is inadvertently pressed.
-+
-+.TP 0.5i
- .B \-t
- With this option the drive is given a CD-ROM tray close command. Not
- all devices support this command.
-@@ -121,8 +130,8 @@ performed.
- .B \-r
- This option specifies that the drive should be ejected using a
- CDROM eject command.
--.TP 0.5i
- 
-+.TP 0.5i
- .B \-s
- This option specifies that the drive should be ejected using
- SCSI commands.
-@@ -145,7 +154,7 @@ also passes the \-n option to umount(1).
- .TP 0.5i
- .B \-m
- This option allows eject to work with device drivers which automatically
--mount removable media and therefore must be always mount()ed.
-+mount removable media and therefore must be always mount(1)ed.
- The option tells eject to not try to unmount the given device,
- even if it is mounted according to /etc/mtab or /proc/mounts.
- 
-diff --git a/eject.c b/eject.c
-index f7b2a2e..4175756 100644
---- a/eject.c
-+++ b/eject.c
-@@ -116,6 +116,7 @@ int d_option = 0;
- int f_option = 0;
- int h_option = 0;
- int n_option = 0;
-+int i_option = 0;
- int q_option = 0;
- int r_option = 0;
- int s_option = 0;
-@@ -129,6 +130,7 @@ int m_option = 0;
- int a_arg = 0;
- int c_arg = 0;
- int x_arg = 0;
-+int i_arg = 0;
- static char *programName; /* used in error messages */
- 
- /*
-@@ -163,6 +165,7 @@ static void usage()
- "  eject [-vn] -c <slot> [<name>]	-- switch discs on a CD-ROM changer\n"
- "  eject [-vn] -t [<name>]		-- close tray\n"
- "  eject [-vn] -T [<name>]		-- toggle tray\n"
-+"  eject [-vn] -i on|off|1|0 [<name>]	-- toggle manual eject protection on/off\n"
- "  eject [-vn] -x <speed> [<name>]	-- set CD-ROM max speed\n"
- "  eject [-vn] -X [<name>]		-- list CD-ROM available speeds\n"
- "Options:\n"
-@@ -200,7 +203,7 @@ static void usage()
- #endif
- "\n"
- "  -n --noop   -V --version\n"
--"  -p --proc   -m --no-unmount   -T --traytoggle\n"));
-+"  -p --proc   -m --no-unmount   -T --traytoggle -i --manualeject\n"));
- #endif /* GETOPTLONG */
- 	fprintf(stderr,_(
- "Parameter <name> can be a device file or a mount point.\n"
-@@ -214,7 +217,7 @@ static void usage()
- /* Handle command line options. */
- static void parse_args(int argc, char **argv, char **device)
- {
--	const char *flags = "a:c:x:dfhnqrstTXvVpm";
-+	const char *flags = "a:c:x:i:dfhnqrstTXvVpm";
- #ifdef GETOPTLONG
- 	static struct option long_options[] =
- 	{
-@@ -223,6 +226,7 @@ static void parse_args(int argc, char **argv, char **device)
- 		{"default",	no_argument,	   NULL, 'd'},
- 		{"auto",	required_argument, NULL, 'a'},
- 		{"changerslot", required_argument, NULL, 'c'},
-+		{"manualeject",	required_argument, NULL, 'i'},
- 		{"trayclose",	no_argument,	   NULL, 't'},
- 		{"traytoggle",	no_argument,	   NULL, 'T'},
- 		{"cdspeed",	required_argument, NULL, 'x'},
-@@ -297,6 +301,21 @@ static void parse_args(int argc, char **argv, char **device)
- 			  usage();
- 			  exit(0);
- 			  break;
-+		  case 'i':
-+			  i_option = 1;
-+			  if (!strcmp(optarg, "0"))
-+				  i_arg = 0;
-+			  else if (!strcmp(optarg, "off"))
-+				  i_arg = 0;
-+			  else if (!strcmp(optarg, "1"))
-+				  i_arg = 1;
-+			  else if (!strcmp(optarg, "on"))
-+				  i_arg = 1;
-+			  else {
-+				  fprintf(stderr, _("%s: invalid argument to -i option\n"), programName);
-+				  exit(1);
-+			  }
-+			  break;
- 		  case 'm':
- 			  m_option = 1;
- 			  break;
-@@ -482,6 +501,30 @@ static char *FindDevice(const char *name)
- }
- 
- 
-+/*
-+ * Stops CDROM from opening on manual eject pressing the button.
-+ * This can be useful when you carry your laptop
-+ * in your bag while it's on and no CD inserted in it's drive.
-+ * Implemented as found in Documentation/ioctl/cdrom.txt
-+ *
-+ * TODO: Maybe we should check this also:
-+ * EDRIVE_CANT_DO_THIS   Door lock function not supported.
-+ * EBUSY                 Attempt to unlock when multiple users
-+ *                       have the drive open and not CAP_SYS_ADMIN
-+ */
-+static void ManualEject(int fd, int onOff) 
-+{
-+	if (ioctl(fd, CDROM_LOCKDOOR, onOff) < 0) {
-+		perror("ioctl on CDROM_LOCKDOOR");
-+        } else {
-+            if (onOff)
-+	        printf("CD-Drive may NOT be ejected with device button\n");
-+            else
-+                printf("CD-Drive may be ejected with device button\n");
-+        }
-+}
-+
-+
- /* Set or clear auto-eject mode. */
- static void AutoEject(int fd, int onOff)
- {
-@@ -1233,6 +1276,13 @@ int main(int argc, char **argv)
- 		exit(0);
- 	}
- 
-+	/* handle -i option */
-+	if (i_option) {
-+		fd = OpenDevice(deviceName);
-+		ManualEject(fd, i_arg);
-+		exit(0);
-+	}
-+
- 	/* handle -a option */
- 	if (a_option) {
- 		if (v_option) {
diff --git a/extra/eject/eject-2.1.5-openrw.patch b/extra/eject/eject-2.1.5-openrw.patch
deleted file mode 100644
index 092bfcfda..000000000
--- a/extra/eject/eject-2.1.5-openrw.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -pur eject-1/eject.c eject/eject.c
---- eject-1/eject.c	2011-08-19 11:42:22.697388647 +0400
-+++ eject/eject.c	2011-08-19 11:57:27.636724026 +0400
-@@ -911,7 +911,12 @@ static void Unmount(const char *fullName
- /* Open a device file. */
- static int OpenDevice(const char *fullName)
- {
--	int fd = open(fullName, O_RDONLY|O_NONBLOCK);
-+	int fd = open(fullName, O_RDWR|O_NONBLOCK);
-+	if (fd == -1 && errno == EACCES) {
-+		if (v_option)
-+			printf(_("%s: unable to open `%s' for R/W, SCSI commands can be fail. Trying Read-Only\n"), programName, fullName);
-+		fd = open(fullName, O_RDONLY|O_NONBLOCK);
-+	}
- 	if (fd == -1) {
- 		fprintf(stderr, _("%s: unable to open `%s'\n"), programName, fullName);
- 		exit(1);
diff --git a/extra/eject/eject-2.1.5-spaces.patch b/extra/eject/eject-2.1.5-spaces.patch
deleted file mode 100644
index 40834d902..000000000
--- a/extra/eject/eject-2.1.5-spaces.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/eject.c b/eject.c
-index d67089c..f7b2a2e 100644
---- a/eject.c
-+++ b/eject.c
-@@ -370,6 +370,30 @@ static int FileExists(const char *name, const int try, int *found)
- 
- 
- /*
-+ * Linux mangles spaces in mount points by changing them to an octal string
-+ * of '\040'.  So lets scan the mount point and fix it up by replacing all
-+ * occurrences off '\0##' with the ASCII value of 0##.  Requires a writable
-+ * string as input as we mangle in place.  Some of this was taken from the
-+ * util-linux package.
-+ */
-+#define octalify(a) ((a) & 7)
-+#define tooctal(s) (64*octalify(s[1]) + 8*octalify(s[2]) + octalify(s[3]))
-+#define isoctal(a) (((a) & ~7) == '0')
-+static char *DeMangleMount(char *s)
-+{
-+	char *tmp = s;
-+	while ((tmp = strchr(tmp, '\\')) != NULL) {
-+		if (isoctal(tmp[1]) && isoctal(tmp[2]) && isoctal(tmp[3])) {
-+			tmp[0] = tooctal(tmp);
-+			memmove(tmp+1, tmp+4, strlen(tmp)-3);
-+		}
-+		++tmp;
-+	}
-+	return s;
-+}
-+
-+
-+/*
-  * Given name, such as foo, see if any of the following exist:
-  *
-  * foo (if foo starts with '.' or '/')
-@@ -882,6 +906,8 @@ static int MountedDevice(const char *name, char **mountName, char **deviceName)
- 		rc = sscanf(line, "%1023s %1023s", s1, s2);
- 		if (rc >= 2) {
- 			int mtabmaj, mtabmin;
-+			DeMangleMount(s1);
-+			DeMangleMount(s2);
- 			GetMajorMinor(s1, &mtabmaj, &mtabmin);
- 			if (((strcmp(s1, name) == 0) || (strcmp(s2, name) == 0)) ||
- 				((maj != -1) && (maj == mtabmaj) && (min == mtabmin))) {
-@@ -928,6 +954,8 @@ static int MountableDevice(const char *name, char **mountName, char **deviceName
- 
- 	while (fgets(line, sizeof(line), fp) != 0) {
- 		rc = sscanf(line, "%1023s %1023s", s1, s2);
-+		DeMangleMount(s1);
-+		DeMangleMount(s2);
- 		if (rc >= 2 && s1[0] != '#' && strcmp(s2, name) == 0) {
- 			FCLOSE(fp);
- 			*deviceName = strdup(s1);
-@@ -968,6 +996,8 @@ static void UnmountDevices(const char *pattern)
- 	while (fgets(line, sizeof(line), fp) != 0) {
- 		status = sscanf(line, "%1023s %1023s", s1, s2);
- 		if (status >= 2) {
-+			DeMangleMount(s1);
-+			DeMangleMount(s2);
- 			status = regexec(&preg, s1, 0, 0, 0);
- 			if (status == 0) {
- 				if (v_option)
diff --git a/extra/eject/eject-2.1.5-umount.patch b/extra/eject/eject-2.1.5-umount.patch
deleted file mode 100644
index 2c588a01d..000000000
--- a/extra/eject/eject-2.1.5-umount.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-diff --git a/eject.c b/eject.c
-index 4175756..057d2ea 100644
---- a/eject.c
-+++ b/eject.c
-@@ -42,6 +42,7 @@
- #include <string.h>
- #include <fcntl.h>
- #include <limits.h>
-+#include <dirent.h>
- 
- #ifdef GETOPTLONG
- #include <getopt.h>
-@@ -1133,6 +1134,145 @@ static char *MultiplePartitions(const char *name)
- 	return 0;
- }
- 
-+/*
-+ * Find device name in /sys/block/. Returns NULL if not
-+ * found. The returned pointer must be free()'d.
-+ */
-+static char* FindDeviceSysBlock(const char* deviceName)
-+{
-+	DIR *dir = opendir("/sys/block");
-+	struct dirent *d;
-+	const char *baseName = strrchr(deviceName, '/');
-+	char *device;
-+	int len;
-+	
-+	baseName = baseName ? baseName + 1 : deviceName;
-+	if (!dir) {
-+		fprintf(stderr, _("%s: can not open directory /sys/block/"), programName);
-+		return NULL;
-+	}
-+	while ((d = readdir(dir)) != NULL) { 
-+		if (d->d_type != DT_DIR && d->d_type != DT_LNK && d->d_type != DT_UNKNOWN)
-+			continue;
-+		len = strlen(d->d_name);
-+		if (!strncmp(baseName, d->d_name, len)) {
-+			if ((*(baseName+len) >= '0' &&
-+			     *(baseName+len) <= '9') ||
-+			     *(baseName+len) == '\0') {
-+				device = strdup(d->d_name);
-+				closedir(dir);
-+				return device;
-+			}
-+		}
-+	}
-+	closedir(dir);
-+	return NULL;
-+}
-+
-+/*
-+ * From given path gets a subsystem. Returns subsystem if any found
-+ * otherwise returns NULL. Returned value must not be free()'d
-+ */
-+static char *GetSubSystem(const char *sysfspath)
-+{
-+	static char subsystem[PATH_MAX];
-+	char link_subsystem[PATH_MAX];
-+	struct stat buf;
-+	char *pos;
-+
-+	snprintf(link_subsystem, sizeof(link_subsystem), "%s/subsystem", sysfspath);
-+
-+	if (lstat(link_subsystem, &buf) == -1)
-+		return NULL;
-+	if (!S_ISLNK(buf.st_mode))
-+		return NULL;
-+	if (readlink(link_subsystem, subsystem, sizeof(subsystem)) == -1)
-+		return NULL;
-+	if ((pos = strrchr(subsystem, '/')) == NULL)
-+		return NULL;
-+	strncpy(subsystem, pos+1, sizeof(subsystem));
-+
-+	return subsystem;
-+}
-+
-+/*
-+ * Check content of /sys/block/<dev>/removable. Returns 1 if the file 
-+ * contains '1' otherwise returns 0.
-+ */
-+static int CheckRemovable(const char* deviceName)
-+{
-+	FILE *fp;
-+	int removable = 0;
-+	char *device;
-+	char path[PATH_MAX];
-+
-+	if ((device = FindDeviceSysBlock(deviceName)) == NULL) {
-+		fprintf(stderr,
-+				_("%s: did not find a device %s in /sys/block/\n"),
-+				programName, deviceName);
-+		exit(1);
-+	}
-+	snprintf(path, sizeof(path), "/sys/block/%s/removable", device);
-+	free(device);
-+	if((fp = fopen(path, "r")) == NULL)
-+		return removable;
-+	if (fgetc(fp) == '1')
-+		removable = 1;
-+	
-+	fclose(fp);
-+	return removable;
-+}
-+
-+/* Check if a device is on hotpluggable subsystem. Returns 1 if is
-+ * otherwise returns 0.
-+ */
-+static int CheckHotpluggable(const char* deviceName)
-+{
-+	int hotpluggable = 0;
-+	char *device;
-+	char path[PATH_MAX];
-+	char *device_chain;
-+	struct stat buf;
-+	char *subsystem;
-+	char *pos;
-+
-+	if ((device = FindDeviceSysBlock(deviceName)) == NULL) {
-+		fprintf(stderr, _("%s: did not find a device %s in /sys/block/\n"),
-+				programName, deviceName);
-+		exit(1);
-+	}
-+	snprintf(path, sizeof(path), "/sys/block/%s/device", device);
-+	free(device);
-+
-+	if (lstat(path, &buf) == -1) 
-+		return hotpluggable;
-+	if (!S_ISLNK(buf.st_mode))
-+		return hotpluggable;
-+	if ((device_chain = SymLink(path)) == NULL) 
-+		return hotpluggable;
-+	while ( strncmp(device_chain, "", sizeof(device_chain) != 0)) {
-+		subsystem = GetSubSystem(device_chain);
-+		if (subsystem) {
-+			/* as hotpluggable we assume devices on these buses  */
-+			if (strncmp("usb", subsystem, sizeof("usb")) == 0 ||
-+			    strncmp("ieee1394", subsystem, sizeof("ieee1394")) == 0 ||
-+			    strncmp("pcmcia", subsystem, sizeof("pcmcia")) == 0 ||
-+			    strncmp("mmc", subsystem, sizeof("mmc")) == 0 ||
-+			    strncmp("ccw", subsystem, sizeof("ccw")) == 0) {
-+				hotpluggable = 1;
-+				break;
-+			}
-+		}
-+		/* remove one member from devicechain */
-+		pos = strrchr(device_chain, '/');
-+		if (pos) 
-+			pos[0] = '\0';
-+		else
-+			device_chain[0] = '\0';
-+	}
-+
-+	return hotpluggable;
-+}
- 
- /* handle -x option */
- static void HandleXOption(char *deviceName)
-@@ -1276,6 +1416,17 @@ int main(int argc, char **argv)
- 		exit(0);
- 	}
- 
-+	/* Check if device has removable flag*/
-+	if (v_option)
-+		printf(_("%s: checking if device \"%s\" has a removable or hotpluggable flag\n"),
-+				programName, deviceName);
-+	if (!CheckRemovable(deviceName) && !CheckHotpluggable(deviceName))
-+	{
-+		fprintf(stderr, _("%s: device \"%s\" doesn't have a removable or hotpluggable flag\n"),
-+				programName, deviceName);
-+		exit(1);		
-+	}
-+	
- 	/* handle -i option */
- 	if (i_option) {
- 		fd = OpenDevice(deviceName);
diff --git a/extra/eject/eject-2.1.5-unlock.patch b/extra/eject/eject-2.1.5-unlock.patch
deleted file mode 100644
index d554f9bdf..000000000
--- a/extra/eject/eject-2.1.5-unlock.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -pur eject-orig/eject.c eject/eject.c
---- eject-orig/eject.c	2006-02-11 04:54:38.000000000 +0300
-+++ eject/eject.c	2011-08-11 13:12:16.568112725 +0400
-@@ -527,6 +527,25 @@ static void CloseTray(int fd)
- }
- 
- /*
-+ * Unlock tray using CDROM_LOCKDOOR ioctl.
-+	* New kernels doesn't automatically unlock tray before ejecting,
-+	* and the new udev automatically locks it.
-+ */
-+static int UnlockCdrom(int fd)
-+{
-+	int status = -1;
-+
-+	if (v_option)
-+		printf(_("%s: unlocking tray using CDROM_LOCKDOOR ioctl\n"), programName);
-+
-+	status = ioctl(fd, CDROM_LOCKDOOR, 0);
-+	if (v_option && status != 0)
-+		printf(_("%s: CDROM_LOCKDOOR ioctl failed\n"), programName);
-+
-+	return (status == 0);
-+}
-+
-+/*
-  * Toggle tray.
-  *
-  * Written by Benjamin Schwenk <benjaminschwenk@yahoo.de> and
-@@ -543,6 +562,8 @@ static void ToggleTray(int fd)
- 
- #ifdef CDROMCLOSETRAY
- 
-+	UnlockCdrom(fd);
-+
- 	/* Try to open the CDROM tray and measure the time therefor
- 	 * needed.  In my experience the function needs less than 0.05
- 	 * seconds if the tray was already open, and at least 1.5 seconds
-@@ -566,7 +587,11 @@ static void ToggleTray(int fd)
- 	 * was already open. In this case, close it now. Else the tray was
- 	 * closed before. This would mean that we are done.  */
- 	if (time_elapsed < TRAY_WAS_ALREADY_OPEN_USECS)
-+	{
-+		if (v_option)
-+			printf(_("%s: CD-ROM tray was already open, closing it\n"), programName);
- 		CloseTray(fd);
-+	}
- 
- #else
-     fprintf(stderr, _("%s: CD-ROM tray toggle command not supported by this kernel\n"), programName);
-@@ -681,7 +706,7 @@ static void ListSpeedCdrom(const char *f
- static int EjectCdrom(int fd)
- {
- 	int status = -1;
--
-+	UnlockCdrom(fd);
- #if defined(CDROMEJECT)
- 	status = ioctl(fd, CDROMEJECT);
- #elif defined(CDIOCEJECT)
diff --git a/extra/eject/eject-timeout.patch b/extra/eject/eject-timeout.patch
deleted file mode 100644
index a542d2c2f..000000000
--- a/extra/eject/eject-timeout.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- eject/eject.c.orig	2006-08-07 16:35:15.000000000 +0200
-+++ eject/eject.c	2006-08-07 16:35:54.000000000 +0200
-@@ -723,7 +723,7 @@
- 	io_hdr.dxfer_len = 0;
- 	io_hdr.dxferp = inqBuff;
- 	io_hdr.sbp = sense_buffer;
--	io_hdr.timeout = 2000;
-+	io_hdr.timeout = 10000;
- 
- 	io_hdr.cmdp = allowRmBlk;
- 	status = ioctl(fd, SG_IO, (void *)&io_hdr);
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index a38b1e48a..9cebddfe4 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163704 2012-07-18 01:05:16Z ibiru $
+# $Id: PKGBUILD 172100 2012-11-28 10:32:07Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=ekiga
-pkgver=3.3.2
-pkgrel=6
+pkgver=4.0.0
+pkgrel=1
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
@@ -15,14 +15,11 @@ optdepends=('evolution-data-server: Evolution integration')
 options=(!emptydirs)
 groups=('gnome-extra')
 install=ekiga.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        gcc47.patch)
-sha256sums=('d4dd47a47696c53e6f3839eef6e0e896dd3d07babb2e68ff8fe994d67ba8807a'
-            '9e3000016e1174be5d6cc60c89abeaeb61a98eb163a38abf11f4af4f2d6363ec')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('69c544fb0f2e9cb425b9dae131b01e256ad20fd597f1faf0c28f5930b0f1d998')
 
 build() {
   cd "$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/gcc47.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-schemas-install \
       --disable-scrollkeeper --enable-dbus
diff --git a/extra/elementary/PKGBUILD b/extra/elementary/PKGBUILD
new file mode 100644
index 000000000..1cf85f9e3
--- /dev/null
+++ b/extra/elementary/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 171994 2012-11-25 21:22:05Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
+
+pkgname=elementary
+pkgver=1.7.2
+pkgrel=1
+pkgdesc="Enlightenment's widget set"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.enlightenment.org"
+license=('BSD')
+depends=('edje' 'e_dbus' 'efreet' 'ethumb' 'eio')
+options=('!libtool' '!emptydirs')
+source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
+sha1sums=('59968aee7ae83b1843a4d812140922e95a20b317')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
+  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
+  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+
+  ./configure \
+    --prefix=/usr \
+    --libexecdir=/usr/lib/elementary \
+    --with-internal-maximum-log-level=3 \
+    --disable-static \
+    --enable-quick-launch \
+    --enable-emotion \
+    --enable-ecore-x \
+    --enable-ecore-fb \
+    --disable-ecore-sdl \
+    --disable-ecore-wayland \
+    --enable-edbus \
+    --enable-efreet \
+    --disable-eweather \
+    --disable-emap \
+    --enable-ethumb \
+    --disable-debug \
+    --disable-install-examples \
+    --disable-doc
+  make
+}
+
+package(){
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+
+  # install license files
+  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
+        $pkgdir/usr/share/licenses/$pkgname/COPYING
+}
diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD
index 8ffcd12f6..9ccf17eb3 100644
--- a/extra/elfutils/PKGBUILD
+++ b/extra/elfutils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=elfutils
 pkgver=0.155
 pkgrel=1
 pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://fedorahosted.org/elfutils/"
 license=('LGPL3' 'GPL' 'GPL3')
 depends=('gcc-libs' 'zlib' 'bzip2' 'xz')
@@ -22,7 +22,6 @@ sha1sums=('1b96084cd9fe037c1c0bd2c280aaa701f913462b'
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
   CFLAGS+=" -g"  # required for test-suite success
   patch -Np1 -i ../elfutils-0.155-binutils-pr-ld-13621.patch
   ./configure --prefix=/usr --program-prefix="eu-"
@@ -31,6 +30,7 @@ build() {
 
 check() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  [ "$CARCH" = "mips64el" ] && return 0  # Known to fail, no benefit from running.
   make check
 }
 
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD
index debbd5c2b..ff24aadfb 100644
--- a/extra/emacs/PKGBUILD
+++ b/extra/emacs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165687 2012-08-29 09:08:38Z juergen $
+# $Id: PKGBUILD 171502 2012-11-18 08:01:29Z eric $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
 
 pkgname=emacs
 pkgver=24.2
-pkgrel=1
+pkgrel=3
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/emacs/emacs.html"
@@ -29,10 +29,8 @@ package() {
   # remove conflict with ctags package
   mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
   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
-  find "$pkgdir"/usr/share/emacs/$_majorver -exec chown root:root {} \;
+  find "$pkgdir"/usr/share/emacs/$pkgver -exec chown root:root {} \;
   # fix perms on /var/games
   chmod 775 "$pkgdir"/var/games
   chmod 775 "$pkgdir"/var/games/emacs
diff --git a/extra/emacs/emacs.install b/extra/emacs/emacs.install
index d84f1de14..fa9ffeeb1 100644
--- a/extra/emacs/emacs.install
+++ b/extra/emacs/emacs.install
@@ -2,7 +2,7 @@ ICON_PATH=usr/share/icons/hicolor
 INFO_DIR=usr/share/info
 
 INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
-ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake
+ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake
 forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
 org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
 speedbar tramp url vip viper widget woman)
diff --git a/extra/embryo/PKGBUILD b/extra/embryo/PKGBUILD
new file mode 100644
index 000000000..e42bbbfdc
--- /dev/null
+++ b/extra/embryo/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 171988 2012-11-25 21:18:10Z ronald $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=embryo
+pkgver=1.7.2
+pkgrel=1
+pkgdesc="implementation of a C like scripting language for e17"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.enlightenment.org"
+license=('BSD')
+depends=('glibc' 'eina')
+options=('!libtool')
+source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
+sha1sums=('517126e873b8c3af9e0ad966af1de390947f89fd')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
+  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
+  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+
+  ./configure --prefix=/usr \
+	--disable-static \
+	--disable-doc
+  make
+}
+
+package(){
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+
+  # install license files
+  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
+        $pkgdir/usr/share/licenses/$pkgname/COPYING
+}
diff --git a/extra/emotion/PKGBUILD b/extra/emotion/PKGBUILD
new file mode 100644
index 000000000..d19d5fb17
--- /dev/null
+++ b/extra/emotion/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 171990 2012-11-25 21:19:38Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
+
+pkgname=emotion
+pkgver=1.7.2
+pkgrel=1
+pkgdesc="Library to easily integrate media playback into EFL applications"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.enlightenment.org"
+license=('BSD')
+depends=('gstreamer0.10' 'edje' 'eeze')
+options=('!libtool' '!emptydirs')
+source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
+sha1sums=('20304f130e5fb4d81176c442262465cacaa52381')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  
+  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
+  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
+  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+
+  ./configure \
+    --prefix=/usr \
+    --disable-static \
+    --enable-generic \
+    --enable-gstreamer \
+    --disable-generic-vlc \
+    --disable-xine \
+    --disable-install-examples \
+    --disable-doc
+  make
+}
+
+package(){
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+
+  # install license files
+  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
+        $pkgdir/usr/share/licenses/$pkgname/COPYING
+}
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index 919488539..03b07d76a 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 162985 2012-07-04 16:56:52Z ibiru $
+# $Id: PKGBUILD 170935 2012-11-13 16:33:01Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=empathy
-pkgver=3.4.2.3
+pkgver=3.6.2
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Empathy"
 license=('GPL2')
-depends=('clutter-gst' 'clutter-gtk' 'folks' 'gcr' 'iso-codes' 'libcanberra' 'libpulse' 'libwebkit3' 'networkmanager' 'telepathy-farstream' 'telepathy-glib' 'telepathy-logger' 'telepathy-mission-control')
-makedepends=('intltool' 'itstool')
+depends=('clutter-gst' 'clutter-gtk' 'folks' 'gcr' 'iso-codes' 'libcanberra' 'libpulse' 'webkitgtk3' 'telepathy-farstream' 'telepathy-glib' 'telepathy-logger' 'telepathy-mission-control')
+makedepends=('intltool' 'itstool' 'docbook-xsl' 'nautilus-sendto')
 optdepends=('telepathy-gabble: XMPP/Jabber support'
             'telepathy-idle: IRC support'
             'telepathy-salut: Link-local XMPP support'
             'telepathy-rakia: SIP support'
-            'telepathy-haze: libpurple support')
-options=('!libtool')
+            'telepathy-haze: libpurple support'
+            'nautilus-sendto: Send files from nautilus')
+options=('!libtool' '!makeflags')
 groups=('gnome-extra')
 install=empathy.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ca511c2a6bb2f39fb29127782b4b0ba813839f7ffc06ae8680445ecb5d58c203')
+sha256sums=('707bf283f37e8b91816c78742d9ebf9e3effc4206a3ecc3e4c0cfbbf8ce0fd26')
 
 build() {
   cd $pkgname-$pkgver
@@ -27,7 +28,8 @@ build() {
       --sysconfdir=/etc  \
       --libexecdir=/usr/lib/empathy \
       --disable-static \
-      --disable-schemas-compile
+      --disable-schemas-compile \
+      --enable-gst-1.0=yes
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD
index d17646b7e..018f211ca 100644
--- a/extra/enblend-enfuse/PKGBUILD
+++ b/extra/enblend-enfuse/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 168516 2012-10-13 05:28:59Z allan $
+# $Id: PKGBUILD 169744 2012-10-27 23:41:41Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Dominik Ryba <domryba@post.pl>
 
 pkgname=enblend-enfuse
 pkgver=4.0
-pkgrel=7
+pkgrel=8
 pkgdesc="Intelligent blend tool for overlapping picture"
 arch=("i686" "x86_64" 'mips64el')
 license=('GPL')
 url="http://enblend.sourceforge.net"
 depends=('openexr' 'glew' 'libxmi' 'freeglut' 'lcms' 'libpng' 'boost-libs')
-makedepends=('boost')
+makedepends=('boost' 'mesa')
 replaces=('enblend')
 conflicts=('enblend')
 provides=('enblend')
diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD
new file mode 100644
index 000000000..bf8a89130
--- /dev/null
+++ b/extra/enlightenment17/PKGBUILD
@@ -0,0 +1,86 @@
+# $Id: PKGBUILD 172451 2012-12-02 20:54:27Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
+
+pkgname=enlightenment17
+_pkgname=enlightenment
+pkgver=0.17.0alpha7
+_pkgver=0.17.0-alpha7
+pkgrel=1
+pkgdesc="Enlightenment window manager DR17 (aka e17)"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.enlightenment.org"
+license=('BSD')
+depends=('alsa-lib' 'pm-utils' 'pam' 'shared-mime-info' 'hicolor-icon-theme'
+  'desktop-file-utils' 'e_dbus' 'edje' 'eeze' 'efreet'
+  'eio' 'elementary' 'xcb-util-keysyms' 'udisks' 'systemd')
+optdepends=('connman: network module')
+provides=('notification-daemon' 'e')
+
+backup=('etc/enlightenment/sysactions.conf')
+options=('!libtool' '!emptydirs')
+install=enlightenment17.install
+source=(http://download.enlightenment.org/releases/$_pkgname-$_pkgver.tar.gz
+  'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch')
+sha1sums=('97ed2c936e6fa2385658f876a4099a029df43787'
+          'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5'
+          '3f53931ae86de8fe99e386aeb097521aac0decd8'
+          '86f1c5e36dc274c3101362532378be034e89c593')
+
+build() {
+  cd "$srcdir/$_pkgname-$_pkgver"
+
+  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
+  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
+  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+
+  patch -p0 < $srcdir/quickstart.patch
+
+  # default to systemd for sysactions
+  patch -Np0 < $srcdir/sysactions_systemd.patch 
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/enlightenment  \
+    --enable-strict \
+    --disable-static \
+    --enable-pam \
+    --disable-device-hal \
+    --enable-device-udev \
+    --disable-mount-hal \
+    --enable-mount-udisks \
+    --enable-mount-eeze \
+    --enable-elementary \
+    --enable-emotion \
+    --enable-enotify \
+    --disable-ephysics \
+    --disable-wayland-clients \
+    --disable-conf-wallpaper2 \
+    --disable-illume2 \
+    --disable-physics \
+    --disable-doc
+  make
+}
+
+package() {
+  cd $srcdir/$_pkgname-$_pkgver
+
+  make DESTDIR=$pkgdir install
+
+# install license files
+  if [ -e $srcdir/$_pkgname-$_pkgver/COPYING ]; then
+    install -Dm644 $srcdir/$_pkgname-$_pkgver/COPYING \
+        $pkgdir/usr/share/licenses/$pkgname/COPYING
+  fi
+
+  if [ -e $srcdir/$_pkgname-$_pkgver/COPYING-PLAIN ]; then
+    install -Dm644 $srcdir/$_pkgname-$_pkgver/COPYING-PLAIN \
+        $pkgdir/usr/share/licenses/$pkgname/COPYING-PLAIN
+  fi
+
+  # install a default applications.menu file (mostly copy from gnome-menus)
+  install -Dm644 $srcdir/e-applications.menu \
+	$pkgdir/etc/xdg/menus/e-applications.menu
+}
+
diff --git a/extra/enlightenment17/e-applications.menu b/extra/enlightenment17/e-applications.menu
new file mode 100644
index 000000000..69456c1d5
--- /dev/null
+++ b/extra/enlightenment17/e-applications.menu
@@ -0,0 +1,154 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+
+<Menu>
+
+  <Name>Applications</Name>
+  <Directory>X-E-Menu-Applications.directory</Directory>
+
+  <!-- Scan legacy dirs first, as later items take priority -->
+  <KDELegacyDirs/>
+  <LegacyDir>/etc/X11/applnk</LegacyDir>
+  <LegacyDir>/usr/share/gnome/apps</LegacyDir>
+
+  <!-- Read standard .directory and .desktop file locations -->
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+
+  <!-- Read in overrides and child menus from applications-merged/ -->
+  <DefaultMergeDirs/>
+
+  <!-- Accessories submenu -->
+  <Menu>
+    <Name>Accessories</Name>
+    <Directory>Utility.directory</Directory>
+    <Include>
+      <And>
+        <Category>Utility</Category>
+	<!-- Accessibility spec must have either the Utility or Settings
+	     category, and we display an accessibility submenu already for
+	     the ones that do not have Settings, so don't display accessibility
+	     applications here -->
+        <Not><Category>Accessibility</Category></Not>
+        <Not><Category>System</Category></Not>
+      </And>
+    </Include>
+  </Menu> <!-- End Accessories -->
+
+  <!-- Accessibility submenu -->
+  <Menu>
+    <Name>Universal Access</Name>
+    <Directory>Utility-Accessibility.directory</Directory>
+    <Include>
+      <And>
+        <Category>Accessibility</Category>
+        <Not><Category>Settings</Category></Not>
+      </And>
+    </Include>
+  </Menu> <!-- End Accessibility -->
+
+  <!-- Development Tools -->
+  <Menu>
+    <Name>Development</Name>
+    <Directory>Development.directory</Directory>
+    <Include>
+      <And>
+        <Category>Development</Category>
+      </And>
+      <Filename>emacs.desktop</Filename>
+    </Include>
+  </Menu> <!-- End Development Tools -->
+
+  <!-- Education -->
+  <Menu>
+    <Name>Education</Name>
+    <Directory>Education.directory</Directory>
+    <Include>
+      <And>
+        <Category>Education</Category>
+      </And>
+    </Include>
+  </Menu> <!-- End Education -->
+
+  <!-- Games -->
+  <Menu>
+    <Name>Games</Name>
+    <Directory>Game.directory</Directory>
+    <Include>
+      <And>
+        <Category>Game</Category>
+      </And>
+    </Include>
+  </Menu> <!-- End Games -->
+
+  <!-- Graphics -->
+  <Menu>
+    <Name>Graphics</Name>
+    <Directory>Graphics.directory</Directory>
+    <Include>
+      <And>
+        <Category>Graphics</Category>
+      </And>
+    </Include>
+  </Menu> <!-- End Graphics -->
+
+  <!-- Internet -->
+  <Menu>
+    <Name>Internet</Name>
+    <Directory>Network.directory</Directory>
+    <Include>
+      <And>
+        <Category>Network</Category>
+      </And>
+    </Include>
+  </Menu>   <!-- End Internet -->
+
+  <!-- Multimedia -->
+  <Menu>
+    <Name>Multimedia</Name>
+    <Directory>AudioVideo.directory</Directory>
+    <Include>
+      <And>
+        <Category>AudioVideo</Category>
+      </And>
+    </Include>
+  </Menu>   <!-- End Multimedia -->
+
+  <!-- Office -->
+  <Menu>
+    <Name>Office</Name>
+    <Directory>Office.directory</Directory>
+    <Include>
+      <And>
+        <Category>Office</Category>
+      </And>
+    </Include>
+  </Menu> <!-- End Office -->
+
+  <!-- System Tools-->
+  <Menu>
+    <Name>System</Name>
+    <Directory>System-Tools.directory</Directory>
+    <Include>
+      <And>
+        <Category>System</Category>
+        <Not><Category>Settings</Category></Not>
+      </And>
+    </Include>
+  </Menu>   <!-- End System Tools -->
+
+  <!-- Other -->
+  <Menu>
+    <Name>Other</Name>
+    <Directory>X-GNOME-Other.directory</Directory>
+    <OnlyUnallocated/>
+    <Include>
+      <And>
+        <Not><Category>Core</Category></Not>
+        <Not><Category>Settings</Category></Not>
+        <Not><Category>Screensaver</Category></Not>
+      </And>
+    </Include>
+  </Menu> <!-- End Other -->
+
+</Menu> <!-- End Applications -->
diff --git a/extra/enlightenment17/enlightenment17.install b/extra/enlightenment17/enlightenment17.install
new file mode 100644
index 000000000..0e3216ffe
--- /dev/null
+++ b/extra/enlightenment17/enlightenment17.install
@@ -0,0 +1,17 @@
+post_install() {
+  update-mime-database usr/share/mime > /dev/null
+  update-desktop-database -q
+
+cat << EOF
+Enlightenment is configured to use systemd by default for shutdown/sleep purposes. 
+This can be changed in /etc/enlightenment/sysactions.conf.
+EOF
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/enlightenment17/quickstart.patch b/extra/enlightenment17/quickstart.patch
new file mode 100644
index 000000000..6b7f372dc
--- /dev/null
+++ b/extra/enlightenment17/quickstart.patch
@@ -0,0 +1,13 @@
+Index: src/bin/e_main.c
+===================================================================
+--- src/bin/e_main.c	(revision 78707)
++++ src/bin/e_main.c	(working copy)
+@@ -101,7 +101,7 @@
+ static Eina_Bool _e_main_cb_startup_fake_end(void *data __UNUSED__);
+ 
+ /* local variables */
+-static Eina_Bool really_know = EINA_FALSE;
++static Eina_Bool really_know = EINA_TRUE;
+ static Eina_Bool locked = EINA_FALSE;
+ static Eina_Bool inloop = EINA_FALSE;
+ static jmp_buf x_fatal_buff;
diff --git a/extra/enlightenment17/sysactions_systemd.patch b/extra/enlightenment17/sysactions_systemd.patch
new file mode 100644
index 000000000..5d535dd60
--- /dev/null
+++ b/extra/enlightenment17/sysactions_systemd.patch
@@ -0,0 +1,17 @@
+--- data/etc/sysactions.conf.in	2012-10-31 17:28:49.000000000 +0100
++++ data/etc/sysactions.conf.in.bak	2012-11-27 19:27:15.955334382 +0100
+@@ -43,10 +43,10 @@
+ # user and group name can use glob matches (* == all for example) like the
+ # shell. as can action names allowed or denied. 
+ 
+-action:   halt      /sbin/shutdown -h now
+-action:   reboot    /sbin/shutdown -r now
+-action:   suspend   @SUSPEND@
+-action:   hibernate @HIBERNATE@
++action:   halt      /usr/bin/systemctl poweroff
++action:   reboot    /usr/bin/systemctl reboot
++action:   suspend   /usr/bin/systemctl suspend
++action:   hibernate /usr/bin/systemctl hibernate
+ action:   /bin/mount /bin/mount
+ action:   /bin/umount /bin/umount
+ action:   /usr/bin/eject /usr/bin/eject
diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD
index fe4839e6a..18edd1fd2 100644
--- a/extra/eog-plugins/PKGBUILD
+++ b/extra/eog-plugins/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 160597 2012-06-02 20:11:49Z ibiru $
+# $Id: PKGBUILD 169864 2012-10-30 22:25:02Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=eog-plugins
-pkgver=3.4.1
+pkgver=3.6.1
 pkgrel=1
 pkgdesc="Plugins for Eye of Gnome"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ install=eog-plugins.install
 options=('!libtool')
 groups=(gnome-extra)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e1f7c4a0a9cc825d1ac8a64cc3d8db4da3054d294e4cd60b28eba13643d71055')
+sha256sums=('0270ae05f6cdd9c73472323370c4779f1148c77f3f8890c89fb8488cf83051ac')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD
index 0e43d9ecb..9154b425f 100644
--- a/extra/eog/PKGBUILD
+++ b/extra/eog/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 163768 2012-07-19 08:37:29Z heftig $
+# $Id: PKGBUILD 170865 2012-11-12 20:14:53Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=eog
-pkgver=3.4.3
+pkgver=3.6.2
 pkgrel=1
 pkgdesc="Eye of Gnome: An image viewing and cataloging program"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gnome-desktop' 'libexif' 'lcms2' 'desktop-file-utils' 'exempi' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf')
-makedepends=('gtk-doc' 'intltool')
+makedepends=('gtk-doc' 'intltool' 'itstool')
 install=eog.install
 groups=('gnome-extra')
 options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('66e468f09de4b8097671cb6e56cd057c0e7869d836a2345e640b6cf4c404d5d9')
+sha256sums=('5879f26a11fa7cd2fa4038e5c51d31e4959456be4fba570dcde89ed0d966ffda')
 
 build() {
   cd "$pkgname-$pkgver"
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
+      --localstatedir=/var
   make
 }
 
diff --git a/extra/epiphany-extensions/PKGBUILD b/extra/epiphany-extensions/PKGBUILD
index 2e011b2a0..3e8505de1 100644
--- a/extra/epiphany-extensions/PKGBUILD
+++ b/extra/epiphany-extensions/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 156748 2012-04-23 09:04:37Z ibiru $
+# $Id: PKGBUILD 169866 2012-10-30 22:25:08Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=epiphany-extensions
-pkgver=3.4.0
+pkgver=3.6.0
 pkgrel=1
 url="http://www.gnome.org/projects/epiphany/"
 pkgdesc="Various extentions for the Epiphany web browser"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('epiphany' 'opensp' 'hicolor-icon-theme')
-makedepends=('gnome-doc-utils' 'intltool' 'gnome-common')
+makedepends=('intltool' 'gnome-doc-utils')
 options=('!libtool' '!emptydirs')
 install=epiphany-extensions.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('eaf1b466e316f4d6ed35437f8fdd4723a61ae57dd2744751e99109fd581f8fa5')
+sha256sums=('3a1cc21b44a7b00cfe055b87c23f20f16c9fbd2b5a30380338885a5ae0847f7a')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD
index aa865a8c1..f731f5d6f 100644
--- a/extra/epiphany/PKGBUILD
+++ b/extra/epiphany/PKGBUILD
@@ -1,28 +1,26 @@
-# $Id: PKGBUILD 165192 2012-08-12 19:49:26Z ibiru $
+# $Id: PKGBUILD 169865 2012-10-30 22:25:05Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=epiphany
-pkgver=3.4.3
-pkgrel=1.1
+pkgver=3.6.1
+pkgrel=1
 install=epiphany.install
 pkgdesc="A GNOME web browser based on the WebKit rendering engine."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('libsoup-gnome' 'libnotify' 'gsettings-desktop-schemas' 'libwebkit3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils'
-         'hicolor-icon-theme' 'seed')
+depends=('libsoup-gnome' 'libnotify' 'gsettings-desktop-schemas' 'webkitgtk3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils'
+         'hicolor-icon-theme' 'gcr' 'gnome-desktop')
 makedepends=('intltool' 'gnome-doc-utils' 'startup-notification')
 options=('!libtool' '!emptydirs')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3233fb9e9e8a056c3ef494e85cf5e27068abf51df5fc7f5203ab7afda480f395')
+sha256sums=('1b4e33e02f7653489be9c49d182be84da13348b4ad3cb4c09c643898586a6008')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --disable-scrollkeeper \
-      --enable-seed
+      --localstatedir=/var
   make
 }
 
diff --git a/extra/ethumb/PKGBUILD b/extra/ethumb/PKGBUILD
new file mode 100644
index 000000000..45fa3bfd0
--- /dev/null
+++ b/extra/ethumb/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 171991 2012-11-25 21:20:15Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
+
+pkgname=ethumb
+pkgver=1.7.2
+pkgrel=1
+pkgdesc="Thumbnailing library and D-Bus service using EFL"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.enlightenment.org"
+license=('BSD')
+depends=('libexif' 'e_dbus'  'emotion')
+options=('!libtool' '!emptydirs')
+source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
+sha1sums=('16d9a9908fb16df2b06f9084190a828683f72f8f')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
+  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
+  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+
+  ./configure \
+    --prefix=/usr \
+    --libexecdir=/usr/lib/ethumb \
+    --with-internal-maximum-log-level=3 \
+    --disable-static \
+    --enable-emotion \
+    --disable-epdf \
+    --enable-libexif \
+    --disable-install-examples \
+    --disable-doc
+  make
+}
+
+package(){
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+
+  # install license files
+  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
+        $pkgdir/usr/share/licenses/$pkgname/COPYING
+}
diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD
new file mode 100644
index 000000000..26eebd3d2
--- /dev/null
+++ b/extra/evas/PKGBUILD
@@ -0,0 +1,66 @@
+# $Id: PKGBUILD 171983 2012-11-25 21:15:28Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
+
+pkgname=evas
+pkgver=1.7.2
+pkgrel=1
+pkgdesc="A hardware-accelerated canvas API for X-Windows"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.enlightenment.org"
+license=('BSD')
+depends=('eet' 'giflib' 'libpng' 'libjpeg>=7' 'libxrender' 'mesa'
+  'fribidi' 'fontconfig' 'freetype2' 'harfbuzz')
+optdepends=("evas_generic_loaders")
+options=('!libtool' '!emptydirs')
+source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
+sha1sums=('47e43fb21dae959959e9e3e2b1e0868e4c92b63f')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
+  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
+  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+
+  ./configure \
+    --prefix=/usr \
+    --libexecdir=/usr/lib/evas \
+    --enable-strict \
+    --disable-static \
+    --enable-fontconfig \
+    --enable-fribidi \
+    --enable-harfbuzz \
+    --disable-pixman \
+    --enable-buffer=static \
+    --disable-gl-sdl \
+    --enable-fb \
+    --disable-directfb \
+    --disable-wayland-shm \
+    --disable-wayland-egl \
+    --disable-sdl-primitive \
+    --disable-software-xcb \
+    --enable-software-xlib=static \
+    --disable-gl-xcb \
+    --enable-gl-xlib \
+    --disable-image-loader-edb \
+    --enable-image-loader-gif=static \
+    --enable-image-loader-tiff=static \
+    --enable-image-loader-svg=static \
+    --enable-image-loader-eet=static \
+    --enable-image-loader-generic=static \
+    --disable-install-examples \
+    --disable-tests \
+    --disable-coverage \
+    --disable-doc
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  # install license files
+  install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING" \
+        "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD
new file mode 100644
index 000000000..0ece23c2c
--- /dev/null
+++ b/extra/evas_generic_loaders/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 171982 2012-11-25 21:14:53Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
+
+pkgname=evas_generic_loaders
+pkgver=1.7.2
+pkgrel=1
+pkgdesc="Additional generic loaders for Evas"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.enlightenment.org"
+license=('BSD')
+depends=('librsvg' 'gstreamer0.10' 'poppler' 'libraw' 'libspectre' 'eina')
+options=('!libtool' '!emptydirs')
+source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
+sha1sums=('dc1adc0b604acc3a3ed3260653d7cb485a4c5732')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
+  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
+  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+
+  ./configure \
+    --prefix=/usr \
+    --libexecdir=/usr/lib/evas \
+    --enable-poppler \
+    --enable-spectre \
+    --enable-libraw \
+    --enable-svg \
+    --enable-gstreamer \
+    --disable-static
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  # install license files
+  install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING" \
+        "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
diff --git a/extra/eventlog/ChangeLog b/extra/eventlog/ChangeLog
new file mode 100644
index 000000000..1c139bdf5
--- /dev/null
+++ b/extra/eventlog/ChangeLog
@@ -0,0 +1,19 @@
+2011-11-02  Andrea Scarpino  <andrea@archlinux.org>
+
+	* Sign package
+
+2011-04-05  Stéphane Gaudreault  <stephane@archlinux.org>
+
+    * Rebuild of old package
+    * Tidy up PKGBUILD
+
+2010-07-10  Dan McGee  <dan@archlinux.org>
+
+	* Updated PKGBUILD to be in line with standard style
+	* Upstream update
+
+2009-01-03  Eric Belanger  <eric@archlinux.org>
+
+	* eventlog 0.2.9-1
+	* Upstream update
+	* Added ChangeLog
diff --git a/extra/eventlog/PKGBUILD b/extra/eventlog/PKGBUILD
new file mode 100644
index 000000000..c0f983253
--- /dev/null
+++ b/extra/eventlog/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 170165 2012-11-04 01:36:23Z dreisner $
+# Maintainer:
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: Judd Vinet <jvinet@zeroflux.org>
+
+pkgname=eventlog
+pkgver=0.2.12
+pkgrel=3
+pkgdesc="API to format and send structured log messages"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.balabit.com/support/community/products/"
+license=('BSD')
+depends=('glibc')
+options=('!libtool')
+changelog=ChangeLog
+source=("http://www.balabit.com/downloads/files/${pkgname}/${pkgver%.*}/${pkgname}_${pkgver}.tar.gz")
+sha1sums=('3e35a634e7de029ab9d36995a085bfcb00ed6a4d')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD
index dae69b09d..0783d0d53 100644
--- a/extra/evince/PKGBUILD
+++ b/extra/evince/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 156750 2012-04-23 09:04:40Z ibiru $
+# $Id: PKGBUILD 169867 2012-10-30 22:25:11Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evince
-pkgver=3.4.0
+pkgver=3.6.1
 pkgrel=1
 pkgdesc="Simply a document viewer"
 url="http://projects.gnome.org/evince/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gtk3' 'libgxps' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas')
-makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection')
-optdepends=('texlive-bin: DVI support')
+makedepends=('itstool' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection' 'docbook-xsl')
+optdepends=('texlive-bin: DVI support'
+	    'gvfs: bookmark support and session saving')
 groups=('gnome-extra')
 install=evince.install
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('02f1c74c123ea0cb4c1a98cb9ba2b67d724e9f90d7ff15acbcd6b8dbeef0a129')
+sha256sums=('1b87b2579d438a126391f9044611b472e9f7b5b712e40b5645b0810164bc41b5')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index d13b49594..d7c535073 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 165223 2012-08-13 18:19:56Z jgc $
+# $Id: PKGBUILD 170810 2012-11-12 02:17:49Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=3.4.4
-pkgrel=1.1
+pkgver=3.6.2
+pkgrel=1
 pkgdesc="Centralized access to appointments and contacts"
 arch=('i686' 'x86_64' 'mips64el')
-depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
+depends=('gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
 makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala')
 options=('!libtool')
 install=$pkgname.install
 url="http://www.gnome.org"
 license=('GPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ce9e1d5625503cd7f1f0631ec2f552e26800c33305b45722b34eba8da5ced491')
+sha256sums=('bc94d8b9f1a6fb81a630cf38abec303b87a87ce2fd880f9519c23e5de2ce88f0')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -21,8 +21,7 @@ build() {
       --localstatedir=/var --with-openldap=yes \
       --libexecdir=/usr/lib/evolution-data-server \
       --with-krb5=/usr --with-libdb=/usr \
-      --enable-vala-bindings \
-      --disable-schemas-install
+      --enable-vala-bindings
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
   make
 }
diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD
index 21d9fd95c..c4b80b6c1 100644
--- a/extra/evolution-ews/PKGBUILD
+++ b/extra/evolution-ews/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 162100 2012-06-19 20:28:58Z heftig $
+# $Id: PKGBUILD 170812 2012-11-12 02:30:11Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=evolution-ews
-pkgver=3.4.3
+pkgver=3.6.1
 pkgrel=1
 pkgdesc="MS Exchange integration through Exchange Web Services"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
 makedepends=('intltool' 'evolution')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3239fcd0f66ab416ceff66b829e3e287599320fcd747f4e2d68a9b094469615d')
+sha256sums=('77931879da57a0721fb3bdc383eab961bf1f20040f309b7be329f19488e5f836')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD
deleted file mode 100644
index 246d4502d..000000000
--- a/extra/evolution-exchange/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 162101 2012-06-19 20:30:13Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution-exchange
-pkgver=3.4.3
-pkgrel=1.1
-pkgdesc="Ximian Connector Exchange plugin for Evolution"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.ximian.com"
-depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
-makedepends=('intltool' 'evolution')
-options=('!libtool' '!emptydirs')
-install=evolution-exchange.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('28b2b47bfdae097b13722dfd0aae6e1335de8d98bd10534a3c7675489352f7b7')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/evolution --disable-static \
-      --with-libdb=/usr --with-krb5=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain evolution-exchange-3.2 "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f $pkgdir/etc/gconf/schemas/*.schemas
-}
diff --git a/extra/evolution-exchange/evolution-exchange.install b/extra/evolution-exchange/evolution-exchange.install
deleted file mode 100644
index 1179887f9..000000000
--- a/extra/evolution-exchange/evolution-exchange.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=evolution-exchange
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/extra/evolution-groupwise/PKGBUILD b/extra/evolution-groupwise/PKGBUILD
deleted file mode 100644
index 4f3561a61..000000000
--- a/extra/evolution-groupwise/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 159019 2012-05-15 10:23:24Z heftig $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=evolution-groupwise
-pkgver=3.4.2
-pkgrel=1
-pkgdesc="GroupWise connector for evolution"
-arch=(i686 x86_64 mips64el)
-url="http://projects.gnome.org/evolution/"
-license=(LGPL)
-depends=('evolution-data-server' 'gtkhtml4')
-makedepends=(intltool evolution)
-optdepends=('evolution: evolution plugin')
-options=(!libtool)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e26e08eb065df21118c92f29be4cfa2ce2faa52c950210e15a3efbdc9cace2aa')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var  --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-}
-
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index 7af0121ec..bd19a8cfe 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 165232 2012-08-13 21:29:21Z jgc $
+# $Id: PKGBUILD 170811 2012-11-12 02:28:56Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution
-pkgver=3.4.4
-pkgrel=1.1
+pkgver=3.6.2
+pkgrel=1
 pkgdesc="Manage your email, contacts and schedule"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'gstreamer0.10' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'networkmanager')
+depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf')
+makedepends=('intltool' 'itstool' 'docbook-xsl' 'networkmanager')
 optdepends=('bogofilter: possible junk filter plugin'
             'spamassassin: possible junk filter plugin')
 groups=('gnome-extra')
@@ -17,7 +17,7 @@ options=('!libtool' '!emptydirs')
 install=evolution.install
 url=http://www.gnome.org/projects/evolution/
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7e541d0894c1d48b89820b6466edafe40215f8cdb45b1c0e9635cc15f49ecb9a')
+sha256sums=('40b326c63abc33ccc1393c9e3b60c747234ab14a46fc4690255b523942ea8983')
 
 build() {
   cd $pkgname-$pkgver
@@ -29,20 +29,14 @@ build() {
       --with-openldap=yes \
       --enable-smime=yes \
       --with-krb5=/usr \
-      --disable-image-inline
+      --disable-schemas-compile
   
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
 
   make
-  make -C plugins/tnef-attachments
 }
 
 package() {
   cd $pkgname-$pkgver
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-  make -C plugins/tnef-attachments DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain evolution-3.2 "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/evolution/evolution.install b/extra/evolution/evolution.install
index 500c5e2da..67eca41f0 100644
--- a/extra/evolution/evolution.install
+++ b/extra/evolution/evolution.install
@@ -1,24 +1,19 @@
 post_install() {
   glib-compile-schemas /usr/share/glib-2.0/schemas
-  gconfpkg --install evolution
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 pre_upgrade() {
-  pre_remove
+  if [ -f /usr/share/gconf/schemas/evolution.schemas ]; then
+    gconfpkg --uninstall evolution
+  fi
 }
 
 post_upgrade() {
   post_install
 }
 
-pre_remove() {
-  gconfpkg --uninstall evolution
-}
-
 post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  post_install
 }
diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD
index 3d9646fda..32429c737 100644
--- a/extra/exo/PKGBUILD
+++ b/extra/exo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157815 2012-04-30 04:19:24Z foutrelis $
+# $Id: PKGBUILD 172469 2012-12-03 11:51:15Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=exo
-pkgver=0.8.0
+pkgver=0.10.0
 pkgrel=1
 pkgdesc="Extensions to Xfce by os-cillation"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,8 @@ makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth')
 optdepends=('perl-uri: for mail-compose helper script')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/0.8/$pkgname-$pkgver.tar.bz2)
-sha256sums=('6e21aa30692affcb45fc8283d034da4a02221d26e3e1facb968d04fed4ba05b0')
+source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('bd5342f5d56a86521315d3ed5834973f28ab58d4f3d76351b590bebbb87afc66')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/f-spot/PKGBUILD b/extra/f-spot/PKGBUILD
index 8d0cc7bcc..6b846e191 100644
--- a/extra/f-spot/PKGBUILD
+++ b/extra/f-spot/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.8.2
 pkgrel=3
 pkgdesc="A personal photo management program for GNOME"
 url="http://www.gnome.org/projects/f-spot/"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 license=('GPL')
 depends=('mono-addins' 'gnome-sharp' 'ndesk-dbus-glib' 'lcms' 'gnome-keyring-sharp' 'flickrnet' 'libgphoto2' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'libunique')
 makedepends=('intltool' 'gnome-doc-utils' 'gnome-screensaver')
diff --git a/extra/farstream/PKGBUILD b/extra/farstream/PKGBUILD
index 2a9c961d4..10f56c670 100644
--- a/extra/farstream/PKGBUILD
+++ b/extra/farstream/PKGBUILD
@@ -1,26 +1,24 @@
-# $Id: PKGBUILD 156762 2012-04-23 09:05:00Z ibiru $
+# $Id: PKGBUILD 170993 2012-11-14 14:37:18Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=farstream
-pkgver=0.1.2
+pkgver=0.2.2
 pkgrel=1
 pkgdesc="Farstream (formerly Farsight) - Audio/Video Communications Framework"
 arch=(i686 x86_64 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/Farstream"
 license=('LGPL2.1')
-depends=('libnice' 'gstreamer0.10-base' 'gstreamer0.10-bad-plugins' 'gstreamer0.10-good' 'gstreamer0.10-ffmpeg')
-makedepends=('gobject-introspection' 'gstreamer0.10-python' 'python2-gobject2')
+depends=('gst-plugins-base-libs' 'libnice')
+makedepends=('gobject-introspection')
+optdepends=('gst-plugins-good' 'gst-plugins-bad')
 conflicts=('farsight2')
 replaces=('farsight2')
 options=(!libtool)
-source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz
-        vp8.patch)
-md5sums=('5d6e561b3688d0d0c8906fec4f356df3'
-         'c4e76d03d678d29b872b610f9cff42cd')
+source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('01c20c1ed014ad4e18e55f1f6caf7877')
 
 build() {
-  cd  "$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/vp8.patch"
+  cd  $pkgname-$pkgver
   ./configure --prefix=/usr \
     --with-package-name='Parabola GNU/Linux-libre farstream package' \
     --with-package-origin='https://parabolagnulinux.org/' \
@@ -29,7 +27,7 @@ build() {
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD
deleted file mode 100644
index 3975ccc08..000000000
--- a/extra/fcitx/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 167680 2012-10-02 22:57:36Z 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.6.1
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/fcitx/"
-license=('GPL')
-makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'icu' 'wget' \
-             'iso-codes' 'gobject-introspection' 'libxkbfile' 'enchant')
-source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz)
-sha1sums=('dc4577bb6bd6de41317f978196f377fc801cc63a')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DENABLE_OPENCC=OFF \
-    -DFORCE_PRESAGE=ON \
-    -DENABLE_TEST=ON \
-    -DENABLE_GTK3_IM_MODULE=ON \
-    -DENABLE_QT_IM_MODULE=ON
-  make
-}
-
-check() {
-  cd "${srcdir}"/build
-  make test
-}
-
-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' \
-           'libxfixes' 'dbus-core' 'icu')
-  optdepends=('enchant: for word predication support')
-  install=fcitx.install
-
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-
-  rm -r "${pkgdir}"/usr/lib/{gtk-2.0,gtk-3.0,qt}
-}
-
-package_fcitx-gtk2() {
-  pkgdesc='GTK2 IM Module for fcitx'
-  depends=('gtk2' 'fcitx')
-  install=fcitx-gtk2.install
-
-  cd "${srcdir}"/build/src/frontend/gtk2
-  make DESTDIR="${pkgdir}" install
-}
-
-package_fcitx-gtk3() {
-  pkgdesc='GTK3 IM Module for fcitx'
-  depends=('gtk3' 'fcitx')
-  install=fcitx-gtk3.install
-
-  cd "${srcdir}"/build/src/frontend/gtk3
-  make DESTDIR="${pkgdir}" install
-}
-
-package_fcitx-qt() {
-  pkgdesc='QT IM Module for fcitx'
-  depends=('qt' 'fcitx')
-
-  cd "${srcdir}"/build/src/frontend/qt
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/fcitx/fcitx-gtk2.install b/extra/fcitx/fcitx-gtk2.install
deleted file mode 100644
index 7503c05eb..000000000
--- a/extra/fcitx/fcitx-gtk2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/fcitx/fcitx-gtk3.install b/extra/fcitx/fcitx-gtk3.install
deleted file mode 100644
index b44958797..000000000
--- a/extra/fcitx/fcitx-gtk3.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/gtk-query-immodules-3.0 --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/fcitx/fcitx.install b/extra/fcitx/fcitx.install
deleted file mode 100644
index 7f156e002..000000000
--- a/extra/fcitx/fcitx.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index b3de5d0fe..fe9445869 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 167254 2012-09-29 12:49:31Z ibiru $
+# $Id: PKGBUILD 171263 2012-11-16 23:35:38Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 arch=('i686' 'x86_64' 'mips64el')
@@ -26,7 +26,8 @@ build() {
   if [ "$CARCH" = "mips64el" ] ; then
 # Make video decoding faster and turn all pixels green.
 #      patch -Np1 -i $srcdir/ffmpeg-loongson.patch
-      extraconf="--disable-runtime-cpudetect --disable-vdpau --disable-vaapi"
+      # Disable runtime CPU detection, video acceleration APIs our hardware doesn't support and ISAs our CPUs don't support.
+      extraconf="--disable-runtime-cpudetect --disable-vdpau --disable-vaapi --disable-mips32r2 --disable-mipsdspr1 --disable-mipsdspr2"
   else
       extraconf=""
   fi
diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD
index d8d626bdb..e983d3d2c 100644
--- a/extra/ffmpegthumbnailer/PKGBUILD
+++ b/extra/ffmpegthumbnailer/PKGBUILD
@@ -3,37 +3,27 @@
 # Contributor: boromil@gmail.com
 
 pkgname=ffmpegthumbnailer
-pkgver=2.0.7
-pkgrel=5
+pkgver=2.0.8
+pkgrel=1
 pkgdesc="Lightweight video thumbnailer that can be used by file managers."
 url="http://code.google.com/p/ffmpegthumbnailer/"
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('ffmpeg' 'libjpeg' 'libpng')
 optdepends=('gvfs: support for gio uris')
-source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz"
-        'ffmpegthumbnailer.desktop' 'ffmpegapi_fix_r241.patch')
+source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz")
 options=('!libtool')
-sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73'
-          'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53'
-          '4e1a6a0f06ae3ae322ea44046599ebf3ab693cb6')
+sha1sums=('2c54ca16efd953f46547e22799cfc40bd9c24533')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # Don't use deprecated (removed?) ffmpeg api
-  patch -Np0 -i "${srcdir}/ffmpegapi_fix_r241.patch"
+  ./configure --prefix=/usr --enable-gio --enable-thumbnailer
 
-  ./configure --prefix=/usr --enable-gio
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
-  # FS#24105: Generate thumbnails in nautilus
-  # FS#26540: Rename to .thumbnailer for nautilus
-  install -Dm644 "${srcdir}/ffmpegthumbnailer.desktop" \
-    "${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.thumbnailer"
 }
diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD
index 04940f268..9b259b50e 100644
--- a/extra/fltk/PKGBUILD
+++ b/extra/fltk/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 148718 2012-02-05 11:48:05Z ibiru $
+# $Id: PKGBUILD 170534 2012-11-07 23:38:03Z eric $
 # Maintainer:
 
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
-pkgver=1.3.0
-pkgrel=3.1
+pkgver=1.3.1
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:LGPL')
 url="http://www.fltk.org/"
 makedepends=('mesa' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \
              'alsa-lib' 'desktop-file-utils')
 source=(http://ftp.easysw.com/pub/$pkgbase/$pkgver/$pkgbase-$pkgver-source.tar.gz)
-md5sums=('44d5d7ba06afdd36ea17da6b4b703ca3')
+md5sums=('b5b84ed63751ab3f76aa8d36cccf59e7')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD
index bb953854c..45c2ee704 100644
--- a/extra/folks/PKGBUILD
+++ b/extra/folks/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 156766 2012-04-23 09:05:06Z ibiru $
+# $Id: PKGBUILD 169873 2012-10-30 22:25:29Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=folks
-pkgver=0.6.9
-pkgrel=2
+pkgver=0.8.0
+pkgrel=1
 pkgdesc="Library to aggregates people into metacontacts"
 arch=(i686 x86_64 'mips64el')
 url="http://telepathy.freedesktop.org/wiki/Folks"
 license=('LGPL2.1')
-depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb')
+depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb' 'libzeitgeist')
 makedepends=('gobject-introspection' 'intltool')
+install=folks.install
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('cb14657f581e3d4b50884ac099ab13c7f9949c99f95806d1b8ad865345d26540')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('8c56c7594dd502ef5877e93181136e41f4ea03de4971372a7a04e7f1492eed9d')
 
 build() {
   cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-schemas-compile
   make
 }
 
diff --git a/extra/folks/folks.install b/extra/folks/folks.install
new file mode 100644
index 000000000..c19349f72
--- /dev/null
+++ b/extra/folks/folks.install
@@ -0,0 +1,11 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD
index 849426577..3ea5317d4 100644
--- a/extra/fontconfig/PKGBUILD
+++ b/extra/fontconfig/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 166327 2012-09-06 13:53:52Z andyrtr $
+# $Id: PKGBUILD 172072 2012-11-27 15:23:20Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=fontconfig
-pkgver=2.10.1
-pkgrel=2
+pkgver=2.10.2
+pkgrel=1
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64 'mips64el')
 url="http://www.fontconfig.org/release/"
@@ -11,10 +11,10 @@ license=('custom')
 depends=('expat' 'freetype2')
 options=('!libtool')
 install=fontconfig.install
-source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz
+source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
         29-replace-bitmap-fonts.conf)
-md5sums=('c94e380eea42f2f23ca9537035ef1899'
-         'f6b67e8cc79197ed6abd4701911e83da')
+sha256sums=('8ea8ef56738fd95f0be611015f89614fd4dec79ddac6b3ff26bc4a8338569952'
+            '5addef189c5e01679ce3b610f8864c59980029c98f323f40f8c9080429857fdc')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD
index 1525ae0f8..3349c343f 100644
--- a/extra/fontforge/PKGBUILD
+++ b/extra/fontforge/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 164687 2012-08-02 16:06:30Z bisson $
+# $Id: PKGBUILD 171997 2012-11-25 21:50:28Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=fontforge
 pkgver=20120731_b
-pkgrel=1
+pkgrel=3
 pkgdesc='Outline and bitmap font editor'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://fontforge.sourceforge.net/'
 license=('BSD')
-depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro')
+depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro'
+         'desktop-file-utils' 'gtk-update-icon-cache' 'hicolor-icon-theme')
 options=('!libtool' '!makeflags')
 source=("http://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-${pkgver//_/-}.tar.bz2")
 sha1sums=('b520f532b48e557c177dffa29120225066cc4e84')
@@ -18,6 +19,8 @@ sha1sums=('b520f532b48e557c177dffa29120225066cc4e84')
 # git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > ../${pkgname}-${pkgver}.tar.xz
 # source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
 
+install=install
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver//_/-}"
 	sed -i 's/python /python2 /g' Makefile.dynamic.in
@@ -37,5 +40,9 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver//_/-}"
 	make DESTDIR="${pkgdir}" install
+	install -d "${pkgdir}/usr/share/icons"
+	cp -a Packaging/icons "${pkgdir}/usr/share/icons/hicolor"
+	rm -fr "${pkgdir}/usr/share/icons/hicolor/src"
 	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -Dm644 Packaging/fontforge.desktop "${pkgdir}/usr/share/applications/fontforge.desktop"
 }
diff --git a/extra/fontforge/install b/extra/fontforge/install
new file mode 100644
index 000000000..5ffa24730
--- /dev/null
+++ b/extra/fontforge/install
@@ -0,0 +1,12 @@
+post_upgrade() {
+	update-desktop-database -q
+	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_install() {
+	post_upgrade
+}
+
+post_remove() {
+	post_upgrade
+}
diff --git a/extra/fortune-mod/01_all_fortune_all-fix.patch b/extra/fortune-mod/01_all_fortune_all-fix.patch
deleted file mode 100644
index b4175ac81..000000000
--- a/extra/fortune-mod/01_all_fortune_all-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- fortune/fortune.c.old	2006-03-11 15:33:14.000000000 +0100
-+++ fortune/fortune.c	2006-03-11 15:43:16.000000000 +0100
-@@ -974,7 +974,7 @@
- 	  if (!ret)
- 	    ret=add_file(percent, fullpathname, NULL, &File_list,
- 			 &File_tail, NULL);
--	  if ( (!ret && fullpathname != locpathname) || strcmp(sp, "all") == 0 )
-+	  if (!ret && strncmp(fullpathname, locpathname, sizeof(fullpathname)))
- 	    ret=add_file(percent, locpathname, NULL, &File_list,
- 		         &File_tail, NULL);
- 	  
-@@ -985,7 +985,8 @@
- 	  }
- 	  if (!ret)
- 	    return FALSE;
--	  
-+	  if (strncmp(fullpathname, locpathname, sizeof(fullpathname)) && strcmp(sp, "all") == 0)
-+	    add_file(percent, locpathname, NULL, &File_list, &File_tail, NULL);
- 	}
- 	else
- 	  if (!add_file(percent, fullpathname, NULL, &File_list,
diff --git a/extra/fortune-mod/LICENSE b/extra/fortune-mod/LICENSE
deleted file mode 100644
index d0ad75977..000000000
--- a/extra/fortune-mod/LICENSE
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * Copyright (c) 1986, 1993
- *      The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ken Arnold.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
diff --git a/extra/fortune-mod/PKGBUILD b/extra/fortune-mod/PKGBUILD
deleted file mode 100644
index 794722784..000000000
--- a/extra/fortune-mod/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 128484 2011-06-24 04:37:24Z eric $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Dale Blount <archlinux@dale.us>
-
-pkgname=fortune-mod
-pkgver=1.99.1
-pkgrel=5.1
-pkgdesc="The Fortune Cookie Program from BSD games"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.redellipse.net/code/fortune"
-license=('BSD')
-depends=('recode')
-source=(ftp://ftp.archlinux.org/other/fortune-mod/$pkgname-$pkgver.tar.gz LICENSE 01_all_fortune_all-fix.patch)
-md5sums=('f208805b3b712e32997d7667e0ec52d8'
-         '0217481ae93971296cfb7872157cabb7'
-         'e85b073f16dc6f0e8f0ed90044797aa3')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p0 < ../01_all_fortune_all-fix.patch
-  make REGEXDEFS='-DHAVE_REGEX_H -DPOSIX_REGEX -DHAVE_STDBOOL'  \
-       COOKIEDIR=/usr/share/fortune  \
-       LOCALDIR=/usr/local/share/fortune all fortune/fortune.man
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make FORTDIR="$pkgdir"/usr/bin \
-       COOKIEDIR="$pkgdir"/usr/share/fortune \
-       BINDIR="$pkgdir"/usr/sbin \
-       BINMANDIR="$pkgdir"/usr/share/man/man1 \
-       FORTMANDIR="$pkgdir"/usr/share/man/man6 install
-  rm "$pkgdir"/usr/share/fortune/*.u8
-  rm "$pkgdir"/usr/share/fortune/off/*.u8
-  install -D -m644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/extra/fprintd/PKGBUILD b/extra/fprintd/PKGBUILD
index 292af2d28..64fbe4918 100644
--- a/extra/fprintd/PKGBUILD
+++ b/extra/fprintd/PKGBUILD
@@ -1,30 +1,34 @@
-# $Id: PKGBUILD 158562 2012-05-04 23:57:03Z allan $
+# $Id: PKGBUILD 170104 2012-11-01 20:54:41Z heftig $
 # Maintainer:
 # Contributor: Nikolay Rysev <mad.f3ka@gmail.com>
 
 pkgname=fprintd
 pkgver=0.4.1
-pkgrel=4
+pkgrel=5
 pkgdesc="D-Bus service to access fingerprint readers"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.freedesktop.org/wiki/Software/fprint/fprintd"
 license=(GPL)
 depends=(libfprint dbus-glib polkit)
 makedepends=(intltool gtk-doc)
 groups=(fprint)
 options=(!libtool)
+backup=(etc/pam.d/fingerprint-auth)
 _snap=V_${pkgver//./_}
-source=(http://cgit.freedesktop.org/libfprint/$pkgname/snapshot/$_snap.tar.bz2)
-md5sums=('58fcac035c181dce8f49c374181aa2ae')
+source=(http://cgit.freedesktop.org/libfprint/$pkgname/snapshot/$_snap.tar.bz2
+        fingerprint-auth)
+md5sums=('58fcac035c181dce8f49c374181aa2ae'
+         '8c7da9ccd28ec87dd2572ddfb85d563e')
 
 build() {
-  cd "$srcdir/$_snap"
+  cd $_snap
   ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
     --disable-static
   make
 }
 
 package() {
-  cd "$srcdir/$_snap"
+  cd $_snap
   make DESTDIR="$pkgdir" pammoddir="/usr/lib/security" install
+  install -Dm644 ../fingerprint-auth "$pkgdir/etc/pam.d/fingerprint-auth"
 }
diff --git a/extra/fprintd/fingerprint-auth b/extra/fprintd/fingerprint-auth
new file mode 100644
index 000000000..b0652c1ec
--- /dev/null
+++ b/extra/fprintd/fingerprint-auth
@@ -0,0 +1,6 @@
+auth  required    pam_tally.so    onerr=succeed file=/var/log/faillog
+auth  required    pam_shells.so
+auth  requisite   pam_nologin.so
+auth  required    pam_env.so
+auth  required    pam_fprintd.so
+auth  optional    pam_permit.so
diff --git a/extra/freenx/PKGBUILD b/extra/freenx/PKGBUILD
index 3a10f6ed9..5f716c1c1 100644
--- a/extra/freenx/PKGBUILD
+++ b/extra/freenx/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 167672 2012-10-02 21:03:34Z andyrtr $
+# $Id: PKGBUILD 171732 2012-11-21 18:26:59Z andyrtr $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 #Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> 
 
 pkgname=freenx
 pkgver=0.7.3
-pkgrel=13
+pkgrel=14
 pkgdesc="Free Software (GPL) Implementation of the NX Server"
 arch=(i686 x86_64 'mips64el')
 url="http://freenx.berlios.de"
 license=('GPL')
-depends=('nx-common' 'nx-x11' 'nxagent' 'nxproxy' 'gnu-netcat' 'inetutils' 'openssh' 'expect' 'python2' 'python2-gobject'
+depends=('nx-common' 'nx-x11' 'nxagent' 'nxproxy' 'netcat' 'inetutils' 'openssh' 'expect' 'python2' 'python2-gobject'
          'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg')
 optdepends=('cups: adds printing support')
 makedepends=('imake')
diff --git a/extra/ftgl/PKGBUILD b/extra/ftgl/PKGBUILD
index 4c1163742..14c9cf343 100644
--- a/extra/ftgl/PKGBUILD
+++ b/extra/ftgl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 168802 2012-10-16 03:14:27Z heftig $
+# $Id: PKGBUILD 171289 2012-11-16 23:57:52Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
@@ -6,13 +6,13 @@
 pkgname=ftgl
 _pkgver=2.1.3-rc5
 pkgver=${_pkgver/-/}
-pkgrel=4
+pkgrel=5
 pkgdesc="OpenGL library to use arbitrary fonts"
 arch=(i686 x86_64 'mips64el')
 url="http://ftgl.wiki.sourceforge.net/"
-license=(MIT)
-depends=(freetype2 mesa glu)
-makedepends=(doxygen)
+license=('MIT')
+depends=('freetype2' 'glu')
+makedepends=('doxygen' 'mesa')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2")
 md5sums=('c7879018cde844059495b3029b0b6503')
diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD
index d54a3f352..514dc00bf 100644
--- a/extra/fuse/PKGBUILD
+++ b/extra/fuse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164767 2012-08-04 18:59:21Z ronald $
+# $Id: PKGBUILD 171437 2012-11-17 15:03:45Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Tom Gundersen <teg@jklm.no>
 # Contributor: Mark Rosenstand <mark@archlinux.org>
 
 pkgname=fuse
-pkgver=2.9.1
+pkgver=2.9.2
 pkgrel=1
 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ backup=(etc/fuse.conf)
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	'fuse.conf')
 options=(!libtool)
-sha1sums=('ed9e8ab740576a038856109cc587d52a387b223f'
+sha1sums=('fcfc005b1edcd5e8b325729a1b325ff0e8b2a5ab'
           '3b42e37a741d4651099225987dc40e7f02a716ad')
 
 build() {
diff --git a/extra/fyre/PKGBUILD b/extra/fyre/PKGBUILD
index e7e7dd1de..496b32468 100644
--- a/extra/fyre/PKGBUILD
+++ b/extra/fyre/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168512 2012-10-13 05:22:49Z eric $
+# $Id: PKGBUILD 169745 2012-10-27 23:41:44Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=fyre
 pkgver=1.0.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Rendering of the Peter de Jong map"
 arch=("i686" "x86_64" 'mips64el')
 url="http://fyre.navi.cx/"
diff --git a/extra/gcalctool/PKGBUILD b/extra/gcalctool/PKGBUILD
index b911bf9b9..c0c4eae21 100644
--- a/extra/gcalctool/PKGBUILD
+++ b/extra/gcalctool/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 159075 2012-05-15 11:46:29Z heftig $
+# $Id: PKGBUILD 170921 2012-11-13 02:09:59Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gcalctool
-pkgver=6.4.2.1
+pkgver=6.6.2
 pkgrel=1
 pkgdesc="GNOME Scientific calculator"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ groups=('gnome-extra')
 options=(!emptydirs)
 url="http://www.gnome.org"
 install=gcalctool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d79f7272534fc33357acc4438fe7746fa125fb05c45dfdb468a193b7490ca1f8')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('e708a16cc758c3a9fcb07e9c3e45989f7d9d64e2993f440e99707fcea3e1b76c')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gcc4.6/PKGBUILD b/extra/gcc4.6/PKGBUILD
deleted file mode 100644
index 80f3fc24e..000000000
--- a/extra/gcc4.6/PKGBUILD
+++ /dev/null
@@ -1,95 +0,0 @@
-# $Id: PKGBUILD 162071 2012-06-19 12:28:59Z allan $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-pkgname=gcc4.6
-pkgver=4.6.3
-_ver=${pkgver:0:3}
-pkgrel=2
-pkgdesc="The GNU Compiler Collection ($_ver; C and C++)"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-depends=('glibc' 'binutils' 'gmp' 'mpfr' 'libmpc' 'ppl' 'isl' 'cloog')
-makedepends=('flex' 'bison')
-checkdepends=('dejagnu')
-options=('!libtool' '!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-        gcc_pure64.patch
-        gcc-hash-style-both.patch
-        gcc-4.6.2-cloog-0.17.patch)
-md5sums=('773092fe5194353b02bb0110052a972e'
-         '4030ee1c08dd1e843c0225b772360e76'
-         '4df25b623799b148a0703eaeec8fdf3f'
-         '6d9939a2e667376031679ac9f9c49263')
-
-build() {
-  cd gcc-$pkgver
-
-  # Do not install libiberty
-  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
-  # Do not run fixincludes
-  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    patch -p1 -i ${srcdir}/gcc_pure64.patch
-  fi
-  patch -p0 -i ${srcdir}/gcc-hash-style-both.patch
-
-  # compatibility with latest cloog
-  patch -p1 -i ${srcdir}/gcc-4.6.2-cloog-0.17.patch
-
-  echo ${pkgver} > gcc/BASE-VER
-
-  cd ..
-  mkdir gcc-build
-  cd gcc-build
-
-  ../gcc-$pkgver/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --mandir=/usr/share/man --infodir=/usr/share/info \
-      --datadir=/usr/share/gcc-$_ver \
-      --with-bugurl=https://bugs.archlinux.org/ \
-      --enable-languages=c,c++,lto \
-      --enable-shared --enable-threads=posix \
-      --with-system-zlib --enable-__cxa_atexit \
-      --disable-libunwind-exceptions --enable-clocale=gnu \
-      --disable-libstdcxx-pch --enable-libstdcxx-time \
-      --enable-gnu-unique-object --enable-linker-build-id \
-      --with-ppl --enable-cloog-backend=isl \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --disable-multilib --disable-libssp \
-      --enable-checking=release \
-      --program-suffix=-$_ver \
-      --enable-version-specific-runtime-libs
-
-  make
-}
-
-check() {
-  # increase stack size to prevent test failures
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
-  ulimit -s 32768
-
-  # do not abort on error as some are "expected"
-  make -C gcc-build -k check || true
-  gcc-$pkgver/contrib/test_summary
-}
-
-package()
-{
-  make -j1 -C gcc-build DESTDIR=${pkgdir} install
-
-  # Install Runtime Library Exception
-  install -Dm644 gcc-$pkgver/COPYING.RUNTIME \
-    $pkgdir/usr/share/licenses/$pkgname/RUNTIME.LIBRARY.EXCEPTION
-
-  # deal with conflicting man and info pages
-  cd $pkgdir
-  rm usr/share/man/man7/{fsf-funding,gfdl,gpl}.7
-  for i in usr/share/info/*; do
-    mv $i ${i%.info}-$_ver.info
-  done
-}
diff --git a/extra/gcc4.6/gcc-4.6.2-cloog-0.17.patch b/extra/gcc4.6/gcc-4.6.2-cloog-0.17.patch
deleted file mode 100644
index 0503a05ed..000000000
--- a/extra/gcc4.6/gcc-4.6.2-cloog-0.17.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure
---- gcc-4.6-20120120-orig/configure	2011-12-18 20:03:44.000000000 +1000
-+++ gcc-4.6-20120120/configure	2012-02-03 17:55:14.885990135 +1000
-@@ -6049,8 +6049,8 @@
-     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
- 
-     if test "${cloog_org}" = yes ; then
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
--$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5
-+$as_echo_n "checking for version 0.17 of CLooG... " >&6; }
- if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-@@ -6061,8 +6061,7 @@
- main ()
- {
- #if CLOOG_VERSION_MAJOR != 0 \
--    || CLOOG_VERSION_MINOR != 16 \
--    || CLOOG_VERSION_REVISION < 1
-+    || CLOOG_VERSION_MINOR != 17
-     choke me
-    #endif
-   ;
-diff -Naur gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c
---- gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c	2011-03-13 08:05:38.000000000 +1000
-+++ gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c	2012-02-03 17:51:47.943463879 +1000
-@@ -1367,7 +1367,7 @@
-   /* Change cloog output language to C.  If we do use FORTRAN instead, cloog
-      will stop e.g. with "ERROR: unbounded loops not allowed in FORTRAN.", if
-      we pass an incomplete program to cloog.  */
--  options->language = LANGUAGE_C;
-+  options->language = CLOOG_LANGUAGE_C;
- 
-   /* Enable complex equality spreading: removes dummy statements
-      (assignments) in the generated code which repeats the
diff --git a/extra/gcc4.6/gcc-hash-style-both.patch b/extra/gcc4.6/gcc-hash-style-both.patch
deleted file mode 100644
index 8b59f4535..000000000
--- a/extra/gcc4.6/gcc-hash-style-both.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- gcc/config/alpha/linux-elf.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/alpha/linux-elf.h	2011-03-11 10:01:47.770000457 +1000
-@@ -41,7 +41,7 @@
- 
- #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
- 
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
-+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax}	\
-   %{O*:-O3} %{!O*:-O1}						\
-   %{shared:-shared}						\
-   %{!shared:							\
---- gcc/config/i386/linux64.h.orig	2011-03-03 08:35:36.000000000 +1000
-+++ gcc/config/i386/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -78,7 +78,7 @@
-  %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
-+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/i386/linux.h.orig	2011-01-15 04:45:06.000000000 +1000
-+++ gcc/config/i386/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -104,7 +104,7 @@
-   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/ia64/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/ia64/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -64,7 +64,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC "--hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/rs6000/linux64.h.orig	2011-02-11 03:30:10.000000000 +1000
-+++ gcc/config/rs6000/linux64.h	2011-03-11 10:03:34.280000457 +1000
-@@ -389,11 +389,11 @@
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
- 
- 
--#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
- 
--#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
- 
---- gcc/config/rs6000/sysv4.h.orig	2011-01-28 04:36:03.000000000 +1000
-+++ gcc/config/rs6000/sysv4.h	2011-03-11 10:01:47.773333792 +1000
-@@ -830,7 +830,7 @@
- #define LINUX_DYNAMIC_LINKER \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
- 
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
- 
---- gcc/config/s390/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/s390/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -77,7 +77,7 @@
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
--  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
-    %{shared:-shared} \
-    %{!shared: \
-       %{static:-static} \
---- gcc/config/sparc/linux64.h.orig	2011-02-17 23:57:21.000000000 +1000
-+++ gcc/config/sparc/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -113,7 +113,7 @@
-   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
-   { "link_arch",	 LINK_ARCH_SPEC },
- 
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -121,7 +121,7 @@
-       %{static:-static}} \
- "
- 
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -193,7 +193,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/sparc/linux.h.orig	2011-01-27 06:30:12.000000000 +1000
-+++ gcc/config/sparc/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -74,7 +74,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!static: \
diff --git a/extra/gcc4.6/gcc_pure64.patch b/extra/gcc4.6/gcc_pure64.patch
deleted file mode 100644
index 8c0baf8e2..000000000
--- a/extra/gcc4.6/gcc_pure64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
---- gcc-4.2.0.orig/gcc/config/i386/linux64.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/linux64.h	2007-05-18 17:04:05.000000000 -0400
-@@ -49,8 +49,8 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- 
- #undef	LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
---- gcc-4.2.0.orig/gcc/config/i386/t-linux64	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/t-linux64	2007-05-18 17:04:36.000000000 -0400
-@@ -6,7 +6,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/extra/gconf-editor/PKGBUILD b/extra/gconf-editor/PKGBUILD
index 697822a45..03cab56c4 100644
--- a/extra/gconf-editor/PKGBUILD
+++ b/extra/gconf-editor/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 150859 2012-02-23 13:04:28Z ibiru $
+# $Id: PKGBUILD 170049 2012-10-31 09:09:59Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gconf-editor
-pkgver=3.0.0
-pkgrel=2.1
+pkgver=3.0.1
+pkgrel=1
 pkgdesc="Graphical gconf registry editor"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
@@ -13,11 +13,14 @@ url="http://www.gnome.org"
 groups=('gnome-extra')
 options=(!emptydirs)
 install=gconf-editor.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('184e17416c2dd927ccb3a9b435d86fbe4b654316b91a6db724a3fd447a9fae60')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+        fix-assertion-failed-crash.patch)
+sha256sums=('9afc4fc0d0afe019998736f06c04cbfa0393c813e2aa755133d95e83835f8869'
+            '6550714ee06d09632244d0f4f41402224599f5230ef71376ea34291ce0d651bc')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i "${srcdir}/fix-assertion-failed-crash.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
      --localstatedir=/var --disable-scrollkeeper
   make
diff --git a/extra/gconf-editor/fix-assertion-failed-crash.patch b/extra/gconf-editor/fix-assertion-failed-crash.patch
new file mode 100644
index 000000000..c9162f7f6
--- /dev/null
+++ b/extra/gconf-editor/fix-assertion-failed-crash.patch
@@ -0,0 +1,34 @@
+From 25d823099337f7ede4782f46fea46f251646dc3e Mon Sep 17 00:00:00 2001
+From: Edward Sheldrake <ejsheldrake@gmail.com>
+Date: Wed, 11 Apr 2012 07:27:16 +0000
+Subject: Fix assertion failed crash
+
+Fix "assertion failed: (last_slash != NULL)" crash while navigating the
+left tree view, fixed by having the model for the right list view emit
+all the row deleted signals before deleting any of its data.
+
+Fixes https://bugzilla.gnome.org/show_bug.cgi?id=670586
+---
+diff --git a/src/gconf-list-model.c b/src/gconf-list-model.c
+index 27e1af6..4fc60f8 100644
+--- a/src/gconf-list-model.c
++++ b/src/gconf-list-model.c
+@@ -133,11 +133,14 @@ gconf_list_model_set_root_path (GConfListModel *model, const gchar *root_path)
+ 
+ 	if (model->root_path != NULL) {
+ 		for (list = model->values; list; list = list->next) {
++			model->stamp++;
++			gtk_tree_model_row_deleted (GTK_TREE_MODEL (model), path);
++		}
++
++		for (list = model->values; list; list = list->next) {
+ 			GConfEntry *entry = list->data;
+ 
+ 			g_hash_table_remove (model->key_hash, gconf_entry_get_key (entry));
+-			model->stamp++;
+-			gtk_tree_model_row_deleted (GTK_TREE_MODEL (model), path);
+ 
+ 			gconf_entry_unref (entry);
+ 		}
+--
+cgit v0.9.0.2
diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD
index a40f8e164..04dbecf47 100644
--- a/extra/gconf/PKGBUILD
+++ b/extra/gconf/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156770 2012-04-23 09:05:12Z ibiru $
+# $Id: PKGBUILD 170051 2012-10-31 09:24:25Z jgc $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gconf
 pkgver=3.2.5
-pkgrel=2
+pkgrel=3
 pkgdesc="A configuration database system"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
@@ -13,11 +13,17 @@ options=('!libtool')
 install=gconf.install
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-$pkgver.tar.xz
+        gconf-dbus-fix-use-after-free.patch
+        gconf-dbus-fix-shutdown.patch
+        gsettings-schema-convert-dont-fail.patch
         gconf-merge-schema
         gconfpkg
         gconf-reload.patch
         01_xml-gettext-domain.patch)
 sha256sums=('4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6'
+            '76c078218e7c3e93691ddd4d7fd9f5c83d4862d0a0406d17b805f3106b50375d'
+            'ddf55a40a260dd00364b32b3200bd8a76e890070ea6267fbfb322907c0946ab2'
+            'be6f084a31229e8edfd6936005c6bb4f2d1548b777df5937923b4702f7a9ac19'
             'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028'
             'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898'
             '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694'
@@ -25,6 +31,11 @@ sha256sums=('4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6'
 
 build() {
   cd "GConf-$pkgver"
+  # Upstream fixes from git
+  patch -Np1 -i "$srcdir/gconf-dbus-fix-shutdown.patch"
+  patch -Np1 -i "$srcdir/gsettings-schema-convert-dont-fail.patch"
+  patch -Np1 -i "$srcdir/gconf-dbus-fix-use-after-free.patch"
+
   # Patch from fedora - reloads gconf after installing schemas
   patch -Np1 -i "$srcdir/gconf-reload.patch"
   # http://bugzilla.gnome.org/show_bug.cgi?id=568845
diff --git a/extra/gconf/gconf-dbus-fix-shutdown.patch b/extra/gconf/gconf-dbus-fix-shutdown.patch
new file mode 100644
index 000000000..b294284b2
--- /dev/null
+++ b/extra/gconf/gconf-dbus-fix-shutdown.patch
@@ -0,0 +1,34 @@
+From 39299610083e0e7f9b44e62b7f4e51e89693cf89 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Tue, 06 Mar 2012 19:39:06 +0000
+Subject: dbus: fix shutdown
+
+gconftool-2 wasn't properly shutting down gconfd, because
+it was trying to do it before connecting to the daemon.
+
+This commit makes sure that we always first try to connect to
+the daemon before asking it to shutdown.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=671490
+---
+diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
+index 442a94b..f167fc5 100644
+--- a/gconf/gconf-dbus.c
++++ b/gconf/gconf-dbus.c
+@@ -2483,7 +2483,13 @@ gconf_shutdown_daemon (GError** err)
+ {
+   DBusMessage *message;
+ 
+-  /* Don't want to spawn it if it's already down */
++  /* If we haven't reached out to it yet,
++   * reach out now.
++   */
++  if (global_conn == NULL)
++    gconf_ping_daemon();
++
++  /* But we don't want to spawn it if it's already down */
+   if (global_conn == NULL || !service_running)
+     return;
+   
+--
+cgit v0.9.0.2
diff --git a/extra/gconf/gconf-dbus-fix-use-after-free.patch b/extra/gconf/gconf-dbus-fix-use-after-free.patch
new file mode 100644
index 000000000..d99b222cc
--- /dev/null
+++ b/extra/gconf/gconf-dbus-fix-use-after-free.patch
@@ -0,0 +1,99 @@
+From 84884e9df7ce8c081a1c223c66a799b82545ff1e Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Thu, 18 Oct 2012 20:08:02 +0000
+Subject: gconf-dbus: fix use after free
+
+gconf_engine_get_fuller is accessing freed memory.
+The problem is that it's referencing strings that are owned
+by a D-Bus message, and they go away when the D-Bus message is freed.
+
+This commit addresses the problem by duplicating the strings and
+freeing them later.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=667167
+---
+diff --git a/gconf/gconf-dbus-utils.c b/gconf/gconf-dbus-utils.c
+index 6fd5bfa..92f5980 100644
+--- a/gconf/gconf-dbus-utils.c
++++ b/gconf/gconf-dbus-utils.c
+@@ -569,11 +569,11 @@ gconf_dbus_utils_get_entry_values (DBusMessageIter  *main_iter,
+ 				   gchar           **schema_name_p)
+ {
+   DBusMessageIter  struct_iter;
+-  gchar           *key;
++  const gchar     *key;
+   GConfValue      *value;
+   gboolean         is_default;
+   gboolean         is_writable;
+-  gchar           *schema_name;
++  const gchar     *schema_name;
+ 
+   g_return_val_if_fail (dbus_message_iter_get_arg_type (main_iter) == DBUS_TYPE_STRUCT,
+ 			FALSE);
+@@ -587,7 +587,7 @@ gconf_dbus_utils_get_entry_values (DBusMessageIter  *main_iter,
+   value = utils_get_value (&struct_iter);
+ 
+   dbus_message_iter_next (&struct_iter);
+-  schema_name = (gchar *) utils_get_optional_string (&struct_iter);
++  schema_name = utils_get_optional_string (&struct_iter);
+ 
+   dbus_message_iter_next (&struct_iter);
+   dbus_message_iter_get_basic (&struct_iter, &is_default);
+@@ -596,7 +596,7 @@ gconf_dbus_utils_get_entry_values (DBusMessageIter  *main_iter,
+   dbus_message_iter_get_basic (&struct_iter, &is_writable);
+ 
+   if (key_p)
+-    *key_p = key;
++    *key_p = g_strdup (key);
+ 
+   if (value_p)
+     *value_p = value;
+@@ -604,7 +604,7 @@ gconf_dbus_utils_get_entry_values (DBusMessageIter  *main_iter,
+     gconf_value_free (value);
+ 
+   if (schema_name_p)
+-    *schema_name_p = schema_name;
++    *schema_name_p = g_strdup (schema_name);
+   
+   if (is_default_p)
+     *is_default_p = is_default;
+diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
+index f167fc5..5610fcf 100644
+--- a/gconf/gconf-dbus.c
++++ b/gconf/gconf-dbus.c
+@@ -1252,12 +1252,13 @@ gconf_engine_get_fuller (GConfEngine *conf,
+   
+   if (schema_name && schema_name[0] != '/')
+     {
++      g_free (schema_name);
+       schema_name = NULL;
+     }
+   
+   if (schema_name_p)
+-    *schema_name_p = g_strdup (schema_name);
+-  
++    *schema_name_p = schema_name;
++
+   return val;
+ }
+ 
+@@ -2402,7 +2403,7 @@ handle_notify (DBusConnection *connection,
+ 	       GConfEngine *conf2)
+ {
+   GConfEngine *conf;
+-  gchar *key, *schema_name;
++  gchar *key = NULL, *schema_name = NULL;
+   gboolean is_default, is_writable;
+   DBusMessageIter iter;
+   GConfValue *value;
+@@ -2466,6 +2467,8 @@ handle_notify (DBusConnection *connection,
+ 
+   if (value)
+     gconf_value_free (value);
++  g_free (key);
++  g_free (schema_name);
+ 
+   if (!match)
+     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+--
+cgit v0.9.0.2
diff --git a/extra/gconf/gsettings-schema-convert-dont-fail.patch b/extra/gconf/gsettings-schema-convert-dont-fail.patch
new file mode 100644
index 000000000..92040b343
--- /dev/null
+++ b/extra/gconf/gsettings-schema-convert-dont-fail.patch
@@ -0,0 +1,28 @@
+From 02f12f41b031a1c2672e7cf1cb8ebde58288c547 Mon Sep 17 00:00:00 2001
+From: Guido Günther <agx@sigxcpu.org>
+Date: Thu, 23 Feb 2012 20:14:18 +0000
+Subject: gsettings-schema-convert: Don't fail to convert lists without default element
+
+---
+diff --git a/gsettings/gsettings-schema-convert b/gsettings/gsettings-schema-convert
+index a60dc35..913cc83 100755
+--- a/gsettings/gsettings-schema-convert
++++ b/gsettings/gsettings-schema-convert
+@@ -854,11 +854,10 @@ class GConfSchema:
+         # Fix the default value to be parsable by GVariant
+         if self.type == 'list':
+             l = self.default.strip()
+-            if not (l[0] == '[' and l[-1] == ']'):
+-                if not l:
+-                    l = '[]'
+-                else:
+-                    raise GSettingsSchemaConvertException('Cannot parse default list value \'%s\' for key \'%s\'.' % (self.default, self.applyto or self.key))
++            if not l:
++                l = '[]'
++            elif not (l[0] == '[' and l[-1] == ']'):
++                raise GSettingsSchemaConvertException('Cannot parse default list value \'%s\' for key \'%s\'.' % (self.default, self.applyto or self.key))
+             values = l[1:-1].strip()
+             if not values:
+                 self.default = '[]'
+--
+cgit v0.9.0.2
diff --git a/extra/gcr/10-gcr.conf b/extra/gcr/10-gcr.conf
new file mode 100644
index 000000000..0394220f9
--- /dev/null
+++ b/extra/gcr/10-gcr.conf
@@ -0,0 +1,3 @@
+@users - memlock 1024
+
+# vim:set ft=limits:
diff --git a/extra/gcr/PKGBUILD b/extra/gcr/PKGBUILD
index 3504aca90..c29e0c91c 100644
--- a/extra/gcr/PKGBUILD
+++ b/extra/gcr/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156772 2012-04-23 09:05:15Z ibiru $
+# $Id: PKGBUILD 170868 2012-11-12 21:20:07Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gcr
-pkgver=3.4.1
-pkgrel=1.1
+pkgver=3.6.2
+pkgrel=2
 pkgdesc="A library for bits of crypto UI and parsing"
 arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
@@ -12,8 +12,10 @@ depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt')
 makedepends=('intltool' 'gobject-introspection')
 options=(!libtool)
 install=gcr.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a0812b6e9623465b0053f4b1b09f3b9316317b2c6ed69a73bc2c5b3b6b849609')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
+        10-gcr.conf)
+sha256sums=('f709db2435e3635b68d8aa212863e0a8e81b1cc33442852a5183762876c7be9b'
+            '5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -28,6 +30,11 @@ build() {
 package() {
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
+
+  # gcr wants to lock some memory to prevent swapping out private keys
+  # https://bugs.archlinux.org/task/32616
+  # https://bugzilla.gnome.org/show_bug.cgi?id=688161
+  install -Dm644 ../10-gcr.conf "$pkgdir/etc/security/limits.d/10-gcr.conf"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD
index bb3774375..766e61d64 100644
--- a/extra/gdb/PKGBUILD
+++ b/extra/gdb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165406 2012-08-18 05:25:03Z allan $
+# $Id: PKGBUILD 172148 2012-11-30 04:20:34Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdb
-pkgver=7.5
-pkgrel=1.1
+pkgver=7.5.1
+pkgrel=1
 pkgdesc="The GNU Debugger"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gdb/"
@@ -15,8 +15,8 @@ backup=('etc/gdb/gdbinit')
 options=('!libtool')
 install=gdb.install
 source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('24a6779a9fe0260667710de1b082ef61'
-         'c1d42158075135b539ecba166987bc15')
+md5sums=('3f48f468b24447cf24820054ff6e85b1'
+         '31ab569c78a01d3f946c6fe0336175fe')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index 2a7b37743..8d781b97a 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 165754 2012-08-29 12:15:27Z jgc $
+# $Id: PKGBUILD 170725 2012-11-10 05:22:37Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gdk-pixbuf2
-pkgver=2.26.3
+pkgver=2.26.5
 pkgrel=1
 pkgdesc="An image loading library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
-license=('GPL2')
+license=('LGPL2.1')
 depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11')
 makedepends=('gtk-doc' 'gobject-introspection')
 options=('!libtool')
 install=gdk-pixbuf2.install
 source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz)
-sha256sums=('a22373a72621c6f73e8c216410aeb46e3bb05b477e600b6ac481a47ecd4c09cc')
+sha256sums=('77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84')
 
 build() {
   cd gdk-pixbuf-$pkgver
diff --git a/extra/gdl/PKGBUILD b/extra/gdl/PKGBUILD
index a15ee3c45..8ccebacfa 100644
--- a/extra/gdl/PKGBUILD
+++ b/extra/gdl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156776 2012-04-23 09:05:20Z ibiru $
+# $Id: PKGBUILD 170733 2012-11-10 16:00:06Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdl
-pkgver=3.4.2
+pkgver=3.6.2
 pkgrel=1
 pkgdesc="GNOME Docking Library"
 arch=(i686 x86_64 mips64el)
@@ -12,7 +12,7 @@ depends=('gtk3')
 makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('66eeca8aa8e7205abf38911a9eadfbd288967f92388682bd62942ed4f1db4906')
+sha256sums=('e772319f1b133047f54e3c1b7e95a718168071cfef972f981337f6bf570ddf1c')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD
index ae34f2890..6bc85e9f8 100644
--- a/extra/gdm/PKGBUILD
+++ b/extra/gdm/PKGBUILD
@@ -1,69 +1,58 @@
-# $Id: PKGBUILD 165620 2012-08-27 12:24:59Z heftig $
+# $Id: PKGBUILD 171020 2012-11-15 06:19:11Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdm
-pkgver=3.4.1
-pkgrel=3.1
-pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
+pkgver=3.6.2
+pkgrel=1
+pkgdesc="Gnome Display Manager"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
+license=(GPL)
 url="http://www.gnome.org"
-backup=('etc/pam.d/gdm-autologin' 'etc/pam.d/gdm-fingerprint' 'etc/pam.d/gdm' 'etc/pam.d/gdm-password'
-        'etc/pam.d/gdm-smartcard' 'etc/pam.d/gdm-welcome' 'etc/gdm/custom.conf')
-groups=('gnome-extra')
+backup=(etc/pam.d/gdm-autologin etc/pam.d/gdm-fingerprint etc/pam.d/gdm-launch-environment
+        etc/pam.d/gdm-password etc/pam.d/gdm-smartcard etc/gdm/custom.conf)
+groups=(gnome)
 options=('!libtool')
-depends=('libcanberra' 'libxklavier' 'gnome-session' 'gnome-settings-daemon' 'metacity' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss')
-makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection')
+depends=(libcanberra gnome-session gnome-settings-daemon metacity upower accountsservice systemd
+         xorg-xrdb nss polkit-gnome xorg-server gnome-icon-theme)
+makedepends=(itstool intltool gnome-doc-utils gobject-introspection)
 optdepends=('gnome-shell: new login interface'
             'fprintd: fingerprint authentication')
 install=gdm.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        fix_external_program_directories.patch
-        gdm-vt-allocation-hack.patch
-        gdm gdm.service
-        gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam)
-sha256sums=('6292968dff5fc89877b5e1aaa3c7d1484dd3ed2d4f388e935841d053439be665'
-            'f68600ccf80f475deb417d58ab3306c4a1ba4622688e2901996c8549c85a9ee6'
-            '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
-            '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
-            'b7b91c682ff4c7cfb2d395c65abeca9dad8c0997b399dcf22abdf481c3e61349'
-            '6a8b286d1ffa04150b3cc401f64e6ddec778c7b65f5bfc831031b64345d7e6b2'
-            'dd50f5bd28807a16c5ebe89fc868b7c47fa571138498e879f2b1c9da1ad6eb84'
-            'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
-            '1a1e9b3f26de4eb9f45d1e9a0b5d0db902ca734461ba46b4bb620b0298bb98aa'
-            '844d5fae0df59241d34099a3d458289bd95707b2aae976627c663904294043d8'
-            '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834')
+        fix_external_program_directories.patch)
+sha256sums=('fbf41bd68299eccdcf456c0869771999f75d3d9bf0f57ce1038db08b54e8cbb9'
+            'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2')
 
 build() {
   cd "$pkgname-$pkgver"
   patch -Np1 -i "$srcdir/fix_external_program_directories.patch"
-  patch -Np1 -i "$srcdir/gdm-vt-allocation-hack.patch"
 
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gdm \
-      --localstatedir=/var \
-      --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \
-      --disable-scrollkeeper \
-      --disable-static \
-      --without-tcp-wrappers \
-      --disable-schemas-compile \
-      --with-systemd=no
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/gdm \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-schemas-compile \
+    --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \
+    --with-check-accelerated-directory=/usr/lib/gnome-session \
+    --with-authentication-agent-directory=/usr/lib/polkit-gnome \
+    --without-tcp-wrappers \
+    --without-console-kit \
+    --with-systemd \
+    --with-default-pam-config=exherbo
+
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-  make
+
+  make -j1 # race condition building gdm-client.c, does not wait for gdm-client-glue.h
 }
 
 package() {
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 
-  for i in gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam;do
-      install -m644 "$srcdir/$i" "$pkgdir/etc/pam.d/${i%.pam}"
-  done
-
-  install -Dm755 "$srcdir/gdm" "$pkgdir/etc/rc.d/gdm"
-  install -Dm644 "$srcdir/gdm.service" "$pkgdir/usr/lib/systemd/system/gdm.service"
-
   chmod 1770 "$pkgdir/var/log/gdm"
   chmod 700 "$pkgdir/var/lib/gdm/.config/dconf"
-  rm -rf "$pkgdir/var/run" "$pkgdir/var/gdm"
+  rm -r "$pkgdir/var/run" "$pkgdir/var/gdm"
 }
diff --git a/extra/gdm/fix_external_program_directories.patch b/extra/gdm/fix_external_program_directories.patch
index b3a0f0cf6..5e51a776f 100644
--- a/extra/gdm/fix_external_program_directories.patch
+++ b/extra/gdm/fix_external_program_directories.patch
@@ -1,25 +1,3 @@
-diff -Nur gdm-3.3.92.orig/daemon/gdm-server.c gdm-3.3.92/daemon/gdm-server.c
---- gdm-3.3.92.orig/daemon/gdm-server.c	2012-03-19 22:30:05.311490006 +0000
-+++ gdm-3.3.92/daemon/gdm-server.c	2012-03-19 22:30:17.004732251 +0000
-@@ -139,7 +139,7 @@
-         g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
- 
-         error = NULL;
--        command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s",
-+        command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s",
-                                    server->priv->display_name);
- 
-         g_debug ("GdmServer: Running helper %s", command);
-diff -Nur gdm-3.3.92.orig/data/gdm-shell.session.in gdm-3.3.92/data/gdm-shell.session.in
---- gdm-3.3.92.orig/data/gdm-shell.session.in	2012-03-19 22:30:05.311490006 +0000
-+++ gdm-3.3.92/data/gdm-shell.session.in	2012-03-19 22:30:17.004732251 +0000
-@@ -1,5 +1,5 @@
- [GNOME Session]
- Name=Display Manager
- RequiredComponents=gnome-shell;gnome-settings-daemon;
--IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
-+IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && /usr/lib/gnome-session/gnome-session-check-accelerated'
- FallbackSession=gdm-fallback
 diff -Nur gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c
 --- gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c	2012-03-19 22:30:05.304823391 +0000
 +++ gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c	2012-03-19 22:30:17.004732251 +0000
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index 076a008b7..4a3c717a3 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161369 2012-06-10 10:47:54Z jgc $
+# $Id: PKGBUILD 170911 2012-11-12 22:46:39Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gedit
-pkgver=3.4.2
+pkgver=3.6.2
 pkgrel=1
 pkgdesc="A text editor for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gedit.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4bd81156de3da433d93eaf3df9cae4aa28356c2bda23fd88ca68ba6e184a9e6d')
+sha256sums=('ad4c6837a7e844e000f7cf2c248e636febdcc9b9b9559cf9e27b99392f5735c3')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD
index 50a7fb69e..c482458e9 100644
--- a/extra/gegl/PKGBUILD
+++ b/extra/gegl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168518 2012-10-13 05:42:21Z allan $
+# $Id: PKGBUILD 169746 2012-10-27 23:41:47Z eric $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=gegl
 pkgver=0.2.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Graph based image processing framework"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gegl.org/"
@@ -21,7 +21,7 @@ sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573'
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff
+  patch -p1 < "${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff"
   ./configure  --prefix=/usr  --with-sdl --with-openexr --with-librsvg \
     --with-libavformat --with-jasper --disable-docs
   make
diff --git a/extra/ggz-client-libs/PKGBUILD b/extra/ggz-client-libs/PKGBUILD
deleted file mode 100644
index 8ae9d19b6..000000000
--- a/extra/ggz-client-libs/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 149560 2012-02-08 14:11:20Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=ggz-client-libs
-pkgver=0.0.14.1
-pkgrel=3.1
-pkgdesc="GGZ client library, used by the GGZ Gaming Zone server (ggzd), the ggzcore library and other components"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.ggzgamingzone.org/"
-license=('LGPL')
-depends=('libggz>=0.0.14.1' 'expat>=2.0.1')
-options=('!libtool')
-source=("http://ftp.ggzgamingzone.org/pub/ggz/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('299eaa93721b1d867b5bf7dc6ac764b0')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/ggz-gtk-client/PKGBUILD b/extra/ggz-gtk-client/PKGBUILD
deleted file mode 100644
index 4f886abb8..000000000
--- a/extra/ggz-gtk-client/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 143018 2011-11-21 01:24:00Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: dazzy
-
-pkgname=ggz-gtk-client
-pkgver=0.0.14.1
-pkgrel=5
-pkgdesc="GGZ Gaming Zone GTK+ client"
-arch=('i686' 'x86_64')
-url="http://www.ggzgamingzone.org/"
-license=('GPL')
-depends=('gtk2' 'ggz-client-libs')
-options=('!libtool')
-source=(http://ftp.ggzgamingzone.org/pub/ggz/${pkgver}/ggz-gtk-client-${pkgver}.tar.gz
-	gtk2.patch)
-md5sums=('87f67ff01f867bd04ba894a7c6a9f7fc'
-         '368f993d07befd41681ac76ef532b448')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/gtk2.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-debug
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/ggz-gtk-client/gtk2.patch b/extra/ggz-gtk-client/gtk2.patch
deleted file mode 100644
index b8332f401..000000000
--- a/extra/ggz-gtk-client/gtk2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- ggz-gtk-client-0.0.14.1/ggz-gtk/props.c	2008-01-05 20:03:36.000000000 +0100
-+++ ggz-gtk-client-0.0.14.1.PATCHED/ggz-gtk/props.c	2010-08-04 01:53:37.573425091 +0200
-@@ -1203,7 +1203,7 @@
-   gtk_box_pack_start (GTK_BOX (vbox9), color_table, TRUE, TRUE, 0);
-   gtk_container_set_border_width (GTK_CONTAINER (color_table), 3);
- 
--  h_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 1);
-+  h_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 0);
-   h_spin = gtk_spin_button_new (GTK_ADJUSTMENT (h_spin_adj), 1, 0);
-   gtk_widget_ref (h_spin);
-   g_object_set_data_full(G_OBJECT (dlg_props), "h_spin", h_spin,
-@@ -1213,7 +1213,7 @@
-                     (GtkAttachOptions) (0), 0, 0);
-   gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (h_spin), TRUE);
- 
--  n_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 1);
-+  n_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 0);
-   n_spin = gtk_spin_button_new (GTK_ADJUSTMENT (n_spin_adj), 1, 0);
-   gtk_widget_ref (n_spin);
-   g_object_set_data_full(G_OBJECT (dlg_props), "n_spin", n_spin,
-@@ -1223,7 +1223,7 @@
-                     (GtkAttachOptions) (0), 0, 0);
-   gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (n_spin), TRUE);
- 
--  f_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 1);
-+  f_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 0);
-   f_spin = gtk_spin_button_new (GTK_ADJUSTMENT (f_spin_adj), 1, 0);
-   gtk_widget_ref (f_spin);
-   g_object_set_data_full(G_OBJECT (dlg_props), "f_spin", f_spin,
---- ggz-gtk-client-0.0.14.1/ggz-gtk/xtext.c	2008-01-05 20:03:36.000000000 +0100
-+++ ggz-gtk-client-0.0.14.1.PATCHED/ggz-gtk/xtext.c	2010-08-04 01:52:36.446764446 +0200
-@@ -720,7 +720,7 @@
- 	xtext->overdraw = FALSE;
- 	xtext->tint_red = xtext->tint_green = xtext->tint_blue = TINT_VALUE;
- 
--	xtext->adj = (GtkAdjustment *) gtk_adjustment_new (0, 0, 1, 1, 1, 1);
-+	xtext->adj = (GtkAdjustment *) gtk_adjustment_new (0, 0, 1, 1, 1, 0);
- 	g_object_ref (G_OBJECT (xtext->adj));
- 	gtk_object_sink ((GtkObject *) xtext->adj);
- 
diff --git a/extra/ghex/PKGBUILD b/extra/ghex/PKGBUILD
index b475a051f..f7d2ea6fb 100644
--- a/extra/ghex/PKGBUILD
+++ b/extra/ghex/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 159036 2012-05-15 10:48:47Z heftig $
+# $Id: PKGBUILD 169880 2012-10-30 22:25:50Z heftig $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=ghex
-pkgver=3.4.1
+pkgver=3.6.1
 pkgrel=1
 pkgdesc="A simple binary editor for the Gnome desktop"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('intltool' 'gnome-doc-utils')
 options=('!libtool' '!emptydirs')
 install=ghex.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8696babf56a24be01cbf856c6fbad6f1d0e10c44736957625f9535430dfee692')
+sha256sums=('ef74fc5a5a67736391b3fb7fb14f588f3a4441b1aa48d1a6eaa1adb6c0427544')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 7eed76f46..70c45a19c 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169122 2012-10-18 14:05:32Z dan $
+# $Id: PKGBUILD 172027 2012-11-26 16:17:46Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.12.4
+pkgver=1.8.0.1
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64 'mips64el')
@@ -109,8 +109,8 @@ package() {
   install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
 }
 
-md5sums=('5f3f0feb59d96f8106e0a56112bc73db'
-         '9370b44fa97843c5f8adaaaf29b7a4d3'
+md5sums=('3d598a31bd8ff04f6a72c65a4cd015a8'
+         '0354726bd084cace4318142b53ce5aa2'
          '8e2648910fd5dd4f1c41d3c7fa9e9156'
          '2e42bf97779a1c6411d89043334c9e78'
          '042524f942785772d7bd52a1f02fe5ae'
diff --git a/extra/gjs/PKGBUILD b/extra/gjs/PKGBUILD
index f3726ded3..b7545d160 100644
--- a/extra/gjs/PKGBUILD
+++ b/extra/gjs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157393 2012-04-28 09:26:32Z allan $
+# $Id: PKGBUILD 169881 2012-10-30 22:25:52Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gjs
-pkgver=1.32.0
-pkgrel=2
+pkgver=1.34.0
+pkgrel=1
 pkgdesc="Javascript Bindings for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Gjs"
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('cairo' 'dbus-glib' 'gobject-introspection' 'js')
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b9f1dc156c15806824c936bb08ddc5048f52f6921654146c47025a62457108c0')
+sha256sums=('3d62c717a0522a36c6faa1eb021872255e3cd285a72786afe23b7cca2e3084cb')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD
index c8b68a936..b4f45e6e9 100644
--- a/extra/glade/PKGBUILD
+++ b/extra/glade/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 158695 2012-05-07 14:01:07Z ibiru $
+# $Id: PKGBUILD 172080 2012-11-27 16:33:29Z jgc $
 # Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=glade
-pkgver=3.12.1
+pkgver=3.14.2
 pkgrel=1
 pkgdesc="User interface builder for GTK+ and GNOME."
 arch=(i686 x86_64 mips64el)
 license=('GPL' 'LGPL')
 depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'python2-gobject')
-optdepends=('python2: Python widgets support')
+makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'python2-gobject' 'itstool' 'docbook-xsl')
+optdepends=('python2: Python widgets support'
+            'devhelp: help browser')
 options=('!libtool')
 url="http://glade.gnome.org/"
 install=glade.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('27e89fb743adb9996c418aa70cde8ce3c0769103f3691cc8011e6c6846600e76')
+sha256sums=('d2e6b5a20cfdbc0a5ed49122ac7b4e3a10ba140ccfcaba60082e6e2b52a62ac6')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD
index ed702056b..7425f8cfd 100644
--- a/extra/glew/PKGBUILD
+++ b/extra/glew/PKGBUILD
@@ -1,20 +1,27 @@
-# $Id: PKGBUILD 168601 2012-10-13 11:47:03Z andyrtr $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# $Id: PKGBUILD 172301 2012-12-02 09:47:22Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: SleepyDog
 
 pkgname=glew
-pkgver=1.8.0
+pkgver=1.9.0
 pkgrel=2
 pkgdesc="The OpenGL Extension Wrangler Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://glew.sourceforge.net"
 license=('BSD' 'MIT' 'GPL')
 depends=('libxmu' 'libxi' 'glu')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz)
-sha1sums=('641c6bb3f924ec786e1e6cf2b1b230f594e0f0e4')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz
+        glxew_export_fix.diff)
+sha1sums=('9291f5c5afefd482c7f3e91ffb3cd4716c6c9ffe'
+          'f389645a1400aebdadce596fec970cfe0be6c15b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  
+  # fix compilation for some 3rd party apps; FS#32835
+  patch -Np1 -i ${srcdir}/glxew_export_fix.diff
+  
   sed -i 's|lib64|lib|' config/Makefile.linux
   make
 }
diff --git a/extra/glew/glxew_export_fix.diff b/extra/glew/glxew_export_fix.diff
new file mode 100644
index 000000000..8a179e0a7
--- /dev/null
+++ b/extra/glew/glxew_export_fix.diff
@@ -0,0 +1,30 @@
+X-Git-Url: 
+http://glew.git.sourceforge.net/git/gitweb.cgi?p=glew%2Fglew;a=blobdiff_plain;f=auto%2Fsrc%2Fglxew_mid.h;h=e9a3391acefafcc1b2979d2cfad1d43c602521c1;hp=cfcd20d472a790f461e01e6e20a570582452236c;hb=6d14805de58321e8a7b1881323e604bb0ba27217;hpb=38a3d857549e7ac31b7edb2a1cfa1ead52f72220
+
+diff --git a/auto/src/glxew_mid.h b/auto/src/glxew_mid.h
+index cfcd20d..e9a3391 100644
+--- a/auto/src/glxew_mid.h
++++ b/auto/src/glxew_mid.h
+@@ -1,7 +1,7 @@
+ /* ------------------------------------------------------------------------- */
+ 
+ #ifdef GLEW_MX
+-#define GLXEW_FUN_EXPORT
++#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT
+ #define GLXEW_VAR_EXPORT
+ #else
+ #define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT
+Index: glew-1.8.0/include/GL/glxew.h
+===================================================================
+--- glew-1.8.0.orig/include/GL/glxew.h	2012-08-08 20:56:17.574088414 +0200
++++ glew-1.8.0/include/GL/glxew.h	2012-08-08 20:57:34.350092129 +0200
+@@ -1360,7 +1360,7 @@
+ /* ------------------------------------------------------------------------- */
+ 
+ #ifdef GLEW_MX
+-#define GLXEW_FUN_EXPORT
++#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT
+ #define GLXEW_VAR_EXPORT
+ #else
+ #define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT
+ 
diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD
index e9e6da327..46d6ed04d 100644
--- a/extra/glib-networking/PKGBUILD
+++ b/extra/glib-networking/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 159094 2012-05-15 14:33:52Z ibiru $
+# $Id: PKGBUILD 170891 2012-11-12 22:12:18Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=glib-networking
-pkgver=2.32.3
+pkgver=2.34.2
 pkgrel=1
 pkgdesc="Network-related giomodules for glib"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 license=('GPL2')
-depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-desktop-schemas')
+depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schemas')
 makedepends=('intltool')
 options=('!libtool')
 install=glib-networking.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('39fe23e86a57bb7a8a67c65668394ad0fbe2d43960c1f9d68311d5d13ef1e5cf')
+sha256sums=('00a92ec7b31f03a2fc1eeff568c0f1664e109b3add8c7042d2d420953f49dfde')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD
index 15258d19b..c8c95b3b4 100644
--- a/extra/glibmm/PKGBUILD
+++ b/extra/glibmm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163765 2012-07-19 08:32:36Z heftig $
+# $Id: PKGBUILD 170205 2012-11-05 11:32:48Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=glibmm
 pkgname=('glibmm' 'glibmm-docs')
-pkgver=2.32.1
+pkgver=2.34.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
@@ -12,7 +12,7 @@ makedepends=('glib2' 'libsigc++2.0' 'pkgconfig')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 options=('!libtool')
 url="http://www.gtkmm.org/"
-sha256sums=('d6ed4d38e8739813941a0f0fec471c00ea93c5ed46179543340821c7ca798a2f')
+sha256sums=('b425a52c7e178aeaaaffd02c5497bfd68d0cb8be56cef3620558a80dd5d692c4')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/glpk/PKGBUILD b/extra/glpk/PKGBUILD
index 072b481e6..f4a7dde1a 100644
--- a/extra/glpk/PKGBUILD
+++ b/extra/glpk/PKGBUILD
@@ -1,25 +1,27 @@
+# $Id: PKGBUILD 171320 2012-11-17 07:46:20Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: bzklrm <bzklrm@gmail.com>
 # Additional contributors Senjin, Xavier, dundee
 
 pkgname=glpk
 pkgver=4.47
-pkgrel=1.1
+pkgrel=2
 pkgdesc="GNU Linear Programming Kit : solve LP, MIP and other problems."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/glpk/glpk.html"
 license=('GPL')
 depends=('glibc')
 options=('!libtool')
-source=("http://ftp.gnu.org/gnu/glpk/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('35e16d3167389b6bc75eb51b4b48590db59f789c')
+source=(http://ftp.gnu.org/gnu/glpk/${pkgname}-${pkgver}.tar.gz{,.sig})
+sha1sums=('35e16d3167389b6bc75eb51b4b48590db59f789c'
+          'e29069fb4e8e34929a980a8659b3dd7ccd92a676')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr
 
-  if [ "$CARCH" == "x86_64" ]; then
+  if [ "$CARCH" != "i686" ]; then
     make CFLAGS="$CFLAGS -fPIC"  
   else
     make
@@ -27,6 +29,8 @@ build() {
 }
 
 package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
+  install -Dm644 doc/glpk.pdf "${pkgdir}/usr/share/doc/glpk/glpk.pdf"
+  install -Dm644 doc/gmpl.pdf "${pkgdir}/usr/share/doc/glpk/gmpl.pdf"
 }
diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD
index 569f24473..697e93523 100644
--- a/extra/glsof/PKGBUILD
+++ b/extra/glsof/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 159121 2012-05-16 06:34:12Z eric $
+# $Id: PKGBUILD 170173 2012-11-04 03:56:58Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=glsof
-pkgver=2.0
-_fmver=2.0
+pkgver=2.1.0
+_fmver=2.1.0
 _qver=1.0.0
 pkgrel=1
 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility"
@@ -15,7 +15,7 @@ source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver}
         http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \
         http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \
         glsof-filemonitor glsof-queries)
-sha1sums=('4bb1ca87aa8aedcf793cd704d4ea5dfec5c53bb1'
+sha1sums=('cb5c31639f0aafb5ef45b9f3895fa05dceda9b7d'
           'd5a17d66dd02cd78bad5ffdda0b936c7848e4890'
           'c5dd12e9b2860f1c427ed7cd482e898978051d2c'
           '197b58f40880995d6442fd42a58fa1f4594fd19d'
diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD
index 0fe6d3ea0..b1b9121dc 100644
--- a/extra/gmime/PKGBUILD
+++ b/extra/gmime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169305 2012-10-19 02:10:54Z heftig $
+# $Id: PKGBUILD 170151 2012-11-03 17:55:00Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=gmime
-pkgver=2.6.11
+pkgver=2.6.12
 pkgrel=1
 pkgdesc="Core mime parsing library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('glib2' 'gpgme' 'zlib')
 [ "$CARCH" != "mips64el" ] && makedepends=('gtk-sharp-2')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ec227549062120af006ed0842baab921e133aa520353ca0fff004390c68af9ab')
+sha256sums=('85ccdf29bc8c4801123e28c27d1afadf0b2c5618aae17e6ec78d40d03ef431a8')
 
 build() {
   # get rid of that .wapi errors in fakeroot
diff --git a/extra/gnome-applets/PKGBUILD b/extra/gnome-applets/PKGBUILD
index 4357911c1..7ff3ec0d9 100644
--- a/extra/gnome-applets/PKGBUILD
+++ b/extra/gnome-applets/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165330 2012-08-15 21:16:25Z heftig $
+# $Id: PKGBUILD 170135 2012-11-03 12:57:39Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-applets
-pkgver=3.4.1
-pkgrel=2.1
+pkgver=3.5.92
+pkgrel=1
 pkgdesc="GNOME Applets"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
@@ -13,7 +13,7 @@ options=(!emptydirs)
 url="http://www.gnome.org"
 install=gnome-applets.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ec5487eb81fb29851b6336de94a329f5623e73830d61022e0e20fe3d038a415e')
+sha256sums=('f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-applets/gnome-applets.install b/extra/gnome-applets/gnome-applets.install
index dd9c34269..e3441e722 100644
--- a/extra/gnome-applets/gnome-applets.install
+++ b/extra/gnome-applets/gnome-applets.install
@@ -1,7 +1,8 @@
 pkgname=gnome-applets
 
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  gconfpkg --install ${pkgname}
+  glib-compile-schemas /usr/share/glib-2.0/schemas
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -14,9 +15,10 @@ post_upgrade() {
 }
 
 pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+  gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
diff --git a/extra/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules b/extra/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules
index a76c1e73c..d7d9650dc 100644
--- a/extra/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules
+++ b/extra/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules
@@ -1,11 +1,7 @@
 # Get access to /dev/rfkill for users
 # See https://bugzilla.redhat.com/show_bug.cgi?id=514798
 #
-# Updated for udev >= 154
-# http://bugs.debian.org/582188
-# https://bugzilla.redhat.com/show_bug.cgi?id=588660
+# Simplified by Kay Sievers
+# https://bugzilla.redhat.com/show_bug.cgi?id=733326
 
-ENV{ACL_MANAGE}=="0", GOTO="gnome_bluetooth_end"
-ACTION!="add|change", GOTO="gnome_bluetooth_end"
-KERNEL=="rfkill", TAG+="udev-acl"
-LABEL="gnome_bluetooth_end"
+KERNEL=="rfkill", SUBSYSTEM=="misc", TAG+="uaccess"
diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD
index cad7fa98a..7ae8a9b0a 100644
--- a/extra/gnome-bluetooth/PKGBUILD
+++ b/extra/gnome-bluetooth/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 162989 2012-07-04 17:08:04Z ibiru $
+# $Id: PKGBUILD 171034 2012-11-15 17:49:18Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-bluetooth
-pkgver=3.4.2
+pkgver=3.6.1
 pkgrel=1
 pkgdesc="The GNOME Bluetooth Subsystem"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/GnomeBluetooth"
 license=('GPL' 'LGPL')
 depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf' 'libnotify')
-makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gobject-introspection')
+makedepends=('intltool' 'nautilus-sendto' 'gobject-introspection' 'itstool' 'docbook-xsl')
 options=('!libtool' '!emptydirs')
 install=gnome-bluetooth.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         61-gnome-bluetooth-rfkill.rules)
-sha256sums=('c58480f1687aca048444d5e4dbd306594d0785c8e6e74f99fa0b13e57fdad4de'
-            'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474')
+sha256sums=('71d72a4637916450987f69c71d374c5bc1102be6dd9d9d7f923aa924659f768a'
+            '8dd2d3637f380a89e72f65e6c8021e994ccbdc645f1a1b1dbffe74ac9f061f53')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD
index 3941f9196..57ebb7056 100644
--- a/extra/gnome-color-manager/PKGBUILD
+++ b/extra/gnome-color-manager/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 164835 2012-08-06 23:07:26Z andrea $
+# $Id: PKGBUILD 169889 2012-10-30 22:33:42Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-color-manager
-pkgver=3.4.2
-pkgrel=2.1
+pkgver=3.6.0
+pkgrel=1
 pkgdesc="Color profile manager for the GNOME desktop"
 arch=(i686 x86_64 'mips64el')
 url="http://projects.gnome.org/gnome-color-manager/"
 license=(GPL2)
 depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk'
-         'mash' 'shared-color-profiles' 'shared-color-targets' 'gnome-desktop')
-makedepends=('intltool' 'gtk-doc')
+         'mash' 'shared-color-profiles' 'shared-color-targets' 'gnome-desktop' 'colord-gtk')
+makedepends=('intltool' 'yelp-tools')
 install=gnome-color-manager.install
 options=('!libtool' '!emptydirs')
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ad69ac0ac242be0ad5b7966e0c2978a9a1440e52ee816993e4a8eb2cf6f0c922')
+sha256sums=('c4e9d63c53061c65c4d1bcdd14952dd01aed7332c2e36d34f4a243a9e5097ec9')
 
 build(){
   cd $pkgname-$pkgver
diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD
index 31da50d68..9d8eb65d1 100644
--- a/extra/gnome-contacts/PKGBUILD
+++ b/extra/gnome-contacts/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 158004 2012-04-30 22:44:22Z ibiru $
+# $Id: PKGBUILD 170834 2012-11-12 13:27:20Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-contacts
-pkgver=3.4.1
+pkgver=3.6.2
 pkgrel=1
 pkgdesc="Contacts Manager for GNOME"
 arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=('GPL2')
 groups=(gnome-extra)
-depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop' 'dconf')
+depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop' 'dconf' 'gnome-online-accounts' 'libgee' 'telepathy-glib' 'cheese')
 makedepends=('intltool' 'vala')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('673614fe6cd5f986132819eeb21d67c40af336ffd2c4ca4c3e99365114f13523')
+sha256sums=('7d1b6a8e395b15bf150062f332348549cf9deb38dfa3aad9994f70e71d8449fa')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --libexecdir=/usr/lib/gnome-contacts
   make
 }
 
diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD
index cf32726e7..df659050e 100644
--- a/extra/gnome-control-center/PKGBUILD
+++ b/extra/gnome-control-center/PKGBUILD
@@ -1,39 +1,34 @@
-# $Id: PKGBUILD 159092 2012-05-15 14:29:58Z ibiru $
+# $Id: PKGBUILD 170990 2012-11-14 14:28:31Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-control-center
-pkgver=3.4.2
-pkgrel=1.1
+pkgver=3.6.3
+pkgrel=2
 pkgdesc="The Control Center for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus'
          'gnome-online-accounts' 'gnome-settings-daemon' 'gsettings-desktop-schemas' 'gtk3'
-         'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower'
-         'libsystemd')
+         'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower' 'libpwquality' 'libsystemd')
 optdepends=('mesa-demos: provides glxinfo for graphics information'
-            'apg: adds password generation for user accounts'
             'gnome-color-manager: for color management tasks')
-makedepends=('gnome-doc-utils' 'intltool' 'gnome-common')
+makedepends=('gnome-doc-utils' 'intltool' 'docbook-xsl')
 url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-control-center.install
 license=('GPL')
 options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        systemd-fallback.patch)
-sha256sums=('efc72bf8af07b439f5f0e9135d1b2c5237e649e6a0f1ff3cf32bdd710421042a'
-            '5fa706de582228df36dfc13eb37470e543b2f228f1fc4ad27e35a781a8779b39')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('2ae23972bc64f62b4facd12dd5adce212bda02491eb6e56bbf195332157d21fb')
 
 build() {
   cd $pkgname-$pkgver
   
-  patch -Np1 -i ../systemd-fallback.patch
-  gnome-autogen.sh --prefix=/usr --sysconfdir=/etc \
+  ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --enable-systemd --with-libsocialweb \
       --disable-update-mimedb \
-      --without-cheese
+      --without-cheese --disable-ibus
 
   #https://bugzilla.gnome.org/show_bug.cgi?id=656229
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
@@ -44,4 +39,8 @@ package() {
   cd $pkgname-$pkgver
 
   make DESTDIR="$pkgdir" install
+
+  # Fix a warning
+  chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
+  chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
 }
diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD
index 127b500a2..a55331c2a 100644
--- a/extra/gnome-desktop/PKGBUILD
+++ b/extra/gnome-desktop/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 159034 2012-05-15 10:45:52Z heftig $
+# $Id: PKGBUILD 170920 2012-11-13 02:08:44Z heftig $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-desktop
-pkgver=3.4.2
+pkgver=3.6.2
 pkgrel=1
 epoch=1
 pkgdesc="Library with common API for various GNOME modules"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
-depends=('gsettings-desktop-schemas' 'gtk3')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
+depends=('gsettings-desktop-schemas' 'gtk3' 'xkeyboard-config')
+makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7565e0a822132ea7b699cb8c64d42b57081ddefd0b5d911f4f4209be0c755952')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('ef15cc0b34a8360fd48ceeb833515790db4de38e6945fb3661f178dc7df70236')
 
 build() {
   cd "$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
+      --libexecdir=/usr/lib/gnome-desktop \
       --with-gnome-distributor="Arch Linux"
   make
 }
diff --git a/extra/gnome-dictionary/PKGBUILD b/extra/gnome-dictionary/PKGBUILD
index 7e0cf237e..07aa9a54e 100644
--- a/extra/gnome-dictionary/PKGBUILD
+++ b/extra/gnome-dictionary/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 156812 2012-04-23 09:06:27Z ibiru $
+# $Id: PKGBUILD 169894 2012-10-30 22:33:54Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=gnome-dictionary
-pkgver=3.4.0
-pkgrel=1.1
+pkgver=3.6.0
+pkgrel=1
 pkgdesc="Look up words in dictionary sources"
 arch=(i686 x86_64 mips64el)
 url="http://gnome.org"
 license=('GPL2')
 depends=('dconf' 'gtk3')
-makedepends=('intltool' 'gnome-doc-utils')
+makedepends=('intltool' 'itstool' 'docbook-xsl')
 install=$pkgname.install
 options=(!libtool)
+groups=('gnome-extra')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('70a15987617f5ae39f1fc27f7ed0a039193b4704cef7b89ed3aea30ac38f56af')
+sha256sums=('1ad03f629bbfe4360fc6d8dd2d7cb4a03e24579068bdd79a25ff5fc5fbff6fa9')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD
index a214e98e6..83bdd92c3 100644
--- a/extra/gnome-disk-utility/PKGBUILD
+++ b/extra/gnome-disk-utility/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 157100 2012-04-23 20:43:27Z ibiru $
+# $Id: PKGBUILD 169895 2012-10-30 22:34:01Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Silvio Knizek (killermoehre)
 
 pkgname=gnome-disk-utility
-pkgver=3.4.1
+pkgver=3.6.1
 pkgrel=1
 pkgdesc="Disk Management Utility for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org"
 groups=('gnome-extra')
-depends=('gtk3' 'udisks2' 'hicolor-icon-theme')
-makedepends=('intltool')
+depends=('gtk3' 'udisks2' 'hicolor-icon-theme' 'libsecret' 'libpwquality' 'desktop-file-utils')
+makedepends=('intltool' 'docbook-xsl')
 options=('!libtool' '!emptydirs')
 install=gnome-disk-utility.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('54c60a3215a144a353f78742cf14221a011641244421170d7169da39f82b0129')
+sha256sums=('e848bd0a5787a654e3421c904718c587e1a953fc1b43a21401ca65b329988c32')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-disk-utility/gnome-disk-utility.install b/extra/gnome-disk-utility/gnome-disk-utility.install
index 71d138f2d..8b17fa3d4 100644
--- a/extra/gnome-disk-utility/gnome-disk-utility.install
+++ b/extra/gnome-disk-utility/gnome-disk-utility.install
@@ -1,4 +1,6 @@
 post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+    update-desktop-database -q
     gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD
index 543823b90..af7bde26a 100644
--- a/extra/gnome-documents/PKGBUILD
+++ b/extra/gnome-documents/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 159057 2012-05-15 11:15:31Z heftig $
+# $Id: PKGBUILD 170912 2012-11-12 22:48:08Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-documents
-pkgver=0.4.2
+pkgver=3.6.2
 pkgrel=1
 pkgdesc="Documents Manager for GNOME"
 arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=('GPL')
 groups=('gnome-extra')
-depends=('clutter-gtk' 'evince' 'gjs' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata' 'tracker')
+depends=('clutter-gtk' 'evince' 'gjs' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata'
+         'tracker' 'libzapojit')
 makedepends=('intltool')
 optdepends=('unoconv: Support for Libreoffice document types')
 options=('!libtool')
 install=gnome-documents.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8c345ccf2e71cfc22d3f1118e7c8676e1a657c8a3fd4052c719be1b4a311ac8c')
+sha256sums=('b2b548685c1074cf222a21d747e6daa8f339815219616b12bb4d2e447e2a34c2')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-font-viewer/PKGBUILD b/extra/gnome-font-viewer/PKGBUILD
index 2dcc745a3..785b94dfb 100644
--- a/extra/gnome-font-viewer/PKGBUILD
+++ b/extra/gnome-font-viewer/PKGBUILD
@@ -1,20 +1,20 @@
-#  $Id: PKGBUILD 156818 2012-04-23 09:06:42Z ibiru $
+#  $Id: PKGBUILD 170924 2012-11-13 03:16:12Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-font-viewer
-pkgver=3.4.0
-pkgrel=1.1
+pkgver=3.6.1
+pkgrel=1
 pkgdesc="GNOME font viewer and thumbnailer"
 arch=(i686 x86_64 mips64el)
 license=('GPL')
-depends=('gtk3' 'desktop-file-utils')
+depends=('gtk3' 'desktop-file-utils' 'gnome-desktop')
 makedepends=('intltool')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 groups=('gnome-extra')
 install=gnome-font-viewer.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('6311fc6e390b7ddfde4fbe5954452d0846a0b3991e9e52f179be3969e6033a76')
+sha256sums=('abe327b23f6f894361c0007e18eae5934f6c7f5f271970f6c70eb06693ce79c6')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD
index 8b6dcc6c9..a10245342 100644
--- a/extra/gnome-games/PKGBUILD
+++ b/extra/gnome-games/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 168602 2012-10-13 11:47:08Z andyrtr $
+# $Id: PKGBUILD 169898 2012-10-30 22:34:10Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-games
-pkgver=3.4.2
-pkgrel=2
+pkgver=3.6.1
+pkgrel=1
 pkgdesc="Some Games for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -14,8 +14,8 @@ options=('!emptydirs' '!libtool')
 install=gnome-games.install
 url="http://www.gnome.org"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('25676285fad33a39da7fc26b5b1dc751c7981ae778b8fe82e8b7c0a367e5117c')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('f016068350ca2a4deceeac0374d5372610b1da07e2c4b356470f3401e6e2a43d')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-games/gnome-games.install b/extra/gnome-games/gnome-games.install
index aaa36a896..2fad5db0b 100644
--- a/extra/gnome-games/gnome-games.install
+++ b/extra/gnome-games/gnome-games.install
@@ -1,39 +1,47 @@
-_scores=(glines.Large.scores
+_scores=(glines.Small.scores
 	glines.Medium.scores
-	glines.Small.scores
-	gnibbles.1.0.scores
-	gnibbles.1.1.scores
-	gnibbles.2.0.scores
-	gnibbles.2.1.scores
-	gnibbles.3.0.scores
-	gnibbles.3.1.scores
+	glines.Large.scores
 	gnibbles.4.0.scores
+	gnibbles.3.0.scores
+	gnibbles.2.0.scores
+	gnibbles.1.0.scores
 	gnibbles.4.1.scores
-	gnobots2.classic_robots-safe.scores
-	gnobots2.classic_robots-super-safe.scores
-	gnobots2.classic_robots.scores
-	gnobots2.nightmare-safe.scores
-	gnobots2.nightmare-super-safe.scores
-	gnobots2.nightmare.scores
+	gnibbles.3.1.scores
+	gnibbles.2.1.scores
+	gnibbles.1.1.scores
+	gnobots2.robots2.scores
 	gnobots2.robots2-safe.scores
 	gnobots2.robots2-super-safe.scores
-	gnobots2.robots2.scores
+	gnobots2.robots2_easy.scores
 	gnobots2.robots2_easy-safe.scores
 	gnobots2.robots2_easy-super-safe.scores
-	gnobots2.robots2_easy.scores
+	gnobots2.classic_robots.scores
+	gnobots2.classic_robots-safe.scores
+	gnobots2.classic_robots-super-safe.scores
+	gnobots2.robots_with_safe_teleport.scores
 	gnobots2.robots_with_safe_teleport-safe.scores
 	gnobots2.robots_with_safe_teleport-super-safe.scores
-	gnobots2.robots_with_safe_teleport.scores
-	gnomine.Custom.scores
-	gnomine.Large.scores
-	gnomine.Medium.scores
+	gnobots2.nightmare.scores
+	gnobots2.nightmare-safe.scores
+	gnobots2.nightmare-super-safe.scores
 	gnomine.Small.scores
+	gnomine.Medium.scores
+	gnomine.Large.scores
+	gnomine.Custom.scores
 	gnotravex.2x2.scores
 	gnotravex.3x3.scores
 	gnotravex.4x4.scores
 	gnotravex.5x5.scores
 	gnotravex.6x6.scores
 	gnotski.1.scores
+	gnotski.2.scores
+	gnotski.3.scores
+	gnotski.4.scores
+	gnotski.5.scores
+	gnotski.6.scores
+	gnotski.7.scores
+	gnotski.8.scores
+	gnotski.9.scores
 	gnotski.10.scores
 	gnotski.11.scores
 	gnotski.12.scores
@@ -44,7 +52,6 @@ _scores=(glines.Large.scores
 	gnotski.17.scores
 	gnotski.18.scores
 	gnotski.19.scores
-	gnotski.2.scores
 	gnotski.20.scores
 	gnotski.21.scores
 	gnotski.22.scores
@@ -55,7 +62,6 @@ _scores=(glines.Large.scores
 	gnotski.27.scores
 	gnotski.28.scores
 	gnotski.29.scores
-	gnotski.3.scores
 	gnotski.30.scores
 	gnotski.31.scores
 	gnotski.32.scores
@@ -64,27 +70,21 @@ _scores=(glines.Large.scores
 	gnotski.35.scores
 	gnotski.36.scores
 	gnotski.37.scores
-	gnotski.4.scores
-	gnotski.5.scores
-	gnotski.6.scores
-	gnotski.7.scores
-	gnotski.8.scores
-	gnotski.9.scores
-	gtali.Colors.scores
 	gtali.Regular.scores
-	mahjongg.bridges.scores
-	mahjongg.cloud.scores
-	mahjongg.confounding.scores
-	mahjongg.difficult.scores
-	mahjongg.dragon.scores
-	mahjongg.easy.scores
-	mahjongg.pyramid.scores
-	mahjongg.tictactoe.scores
-	mahjongg.ziggurat.scores
-	swell-foop.Large.scores
-	swell-foop.Medium.scores
-	swell-foop.Small.scores
-	quadrapassel.scores)
+	gtali.Colors.scores
+	gnome-mahjongg.easy.scores
+	gnome-mahjongg.difficult.scores
+	gnome-mahjongg.confounding.scores
+	gnome-mahjongg.pyramid.scores
+	gnome-mahjongg.tictactoe.scores
+	gnome-mahjongg.cloud.scores
+	gnome-mahjongg.dragon.scores
+	gnome-mahjongg.bridges.scores
+	gnome-mahjongg.ziggurat.scores
+	quadrapassel.scores
+	swell-foop.small.scores
+	swell-foop.normal.scores
+	swell-foop.large.scores)
 
 post_install() {
   glib-compile-schemas usr/share/glib-2.0/schemas
diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD
index cc2ec9ed6..c66c73b07 100644
--- a/extra/gnome-keyring/PKGBUILD
+++ b/extra/gnome-keyring/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 164501 2012-08-01 09:36:07Z jgc $
+#$Id: PKGBUILD 170820 2012-11-12 08:37:05Z heftig $
 # Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gnome-keyring
-pkgver=3.4.1
-pkgrel=3
+pkgver=3.6.2
+pkgrel=1
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
@@ -13,14 +13,11 @@ groups=('gnome')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-keyring.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        gpg-agent-fix-encoding.patch)
-sha256sums=('9e90267721198cbe6ebc08f6390d24901d9c0de39b180cd2ad1bbcdd7b30b249'
-            '05ae4ec8db316b1b7552099721226e3a211bcf3d2445f1ea464d26bf31590760')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('ae60558d60171325ddd90603328393d35d7b560a70b7ab45c4d2718d01130cd6')
 
 build() {
   cd "$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/gpg-agent-fix-encoding.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gnome-keyring \
diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD
index 8cdb469b8..d0ec12f60 100644
--- a/extra/gnome-menus/PKGBUILD
+++ b/extra/gnome-menus/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 159030 2012-05-15 10:41:25Z heftig $
+# $Id: PKGBUILD 170973 2012-11-14 07:13:15Z heftig $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-menus
-pkgver=3.4.2
+pkgver=3.6.1
 pkgrel=1
 pkgdesc="GNOME menu specifications"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL' 'LGPL')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         menus.patch)
-sha256sums=('fa8b98eb5c62da20f1fb4f6e251f819d78c925006b00d2f63005a6418aa81e63'
+sha256sums=('1615f6852280a161cd137d5b8b59f35519a3a7ba89738f55c578325b0512043e'
             'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc')
 
 build() {
diff --git a/extra/gnome-nettool/PKGBUILD b/extra/gnome-nettool/PKGBUILD
index bffb24ecf..64020997a 100644
--- a/extra/gnome-nettool/PKGBUILD
+++ b/extra/gnome-nettool/PKGBUILD
@@ -1,21 +1,23 @@
-# $Id: PKGBUILD 156831 2012-04-23 09:07:07Z ibiru $
+# $Id: PKGBUILD 169903 2012-10-30 22:34:22Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kritoke <kritoke@nospam.gmail.com>
 
 pkgname=gnome-nettool
-pkgver=3.1.1
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="A Collection of GNOME3 Networking Tools."
 arch=(i686 x86_64 mips64el)
 license=('GPL')
-depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'nmap' 'netkit-bsd-finger' 'whois' 'hicolor-icon-theme')
-makedepends=('gnome-doc-utils' 'intltool')
+depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme')
+makedepends=('gnome-doc-utils' 'intltool' 'nmap' 'net-tools')
+optdepends=('nmap: Port scanning'
+            'net-tools: Network statistics')
 groups=('gnome-extra')
 url="http://www.gnome.org"
 install=gnome-nettool.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1e0430c94084484f234864c160e6252552d54bb72c163d3e451641045429901c')
+sha256sums=('9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD
index 24e0702de..af08e2397 100644
--- a/extra/gnome-online-accounts/PKGBUILD
+++ b/extra/gnome-online-accounts/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 159045 2012-05-15 11:00:06Z heftig $
+# $Id: PKGBUILD 170937 2012-11-13 16:38:27Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-online-accounts
-pkgver=3.4.2
+pkgver=3.6.2
 pkgrel=1
 pkgdesc="GNOME service to access online accounts"
 arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=('GPL')
-depends=('libwebkit3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme')
+depends=('webkitgtk3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret')
 makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
 options=(!libtool)
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b349ea12fbb564c8a71574b47d8949974cf42f959d7da212ef8933a5eb1d7945')
+sha256sums=('55d207d2dc5428f41b0a504aa3edd996a6167a5625d9e11d678f33f282935fa7')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts
   make
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/gnome-panel/PKGBUILD b/extra/gnome-panel/PKGBUILD
index bf045cbcf..45fd7d020 100644
--- a/extra/gnome-panel/PKGBUILD
+++ b/extra/gnome-panel/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 159040 2012-05-15 10:55:32Z heftig $
+# $Id: PKGBUILD 170862 2012-11-12 20:11:06Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-panel
-pkgver=3.4.2.1
+pkgver=3.6.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 pkgdesc="The GNOME Panel"
 url="http://www.gnome.org"
-depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf' 'telepathy-glib')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra')
+depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf'
+         'gconf' 'telepathy-glib')
+makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra')
 install=gnome-panel.install
 groups=('gnome')
 provides=("gnome-panel-bonobo=${pkgver}")
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('188ea2b93e4c8116e187abac3ecf590429ff8366ef4b610fab438bd338d857d2')
+sha256sums=('a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-phone-manager/PKGBUILD b/extra/gnome-phone-manager/PKGBUILD
index 42b4f5757..6ecde393f 100644
--- a/extra/gnome-phone-manager/PKGBUILD
+++ b/extra/gnome-phone-manager/PKGBUILD
@@ -1,27 +1,26 @@
-# $Id: PKGBUILD 157740 2012-04-29 05:35:15Z eric $
+# $Id: PKGBUILD 169906 2012-10-30 22:34:29Z heftig $
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-phone-manager
 pkgver=0.68
-pkgrel=2
+pkgrel=3
 pkgdesc="Control your mobile phone from your GNOME desktop."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/PhoneManager"
 license=('GPL')
-depends=('evolution-data-server' 'gnokii' 'gnome-bluetooth' 'gnome-icon-theme' 'libcanberra')
-makedepends=('intltool' 'gnome-common')
+depends=('evolution-data-server' 'gnokii' 'gnome-bluetooth' 'gnome-icon-theme' 'libcanberra' 'gconf')
+makedepends=('intltool')
 options=('!emptydirs' '!libtool')
 install=gnome-phone-manager.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/${pkgver}/${pkgname}-${pkgver}.tar.xz
-        phonemgr-gnome-bluetooth-3.3.patch)
-sha256sums=('3777b62ee36492274532ece965f4688600457014f17a6f21dd01fb63bbb77f8f'
-            'a69c1d2d1d25eca4f32215d8a8ca3c8e4a048af76d7a291b86b0aa7f0f65c452')
+source=(ftp://ftp.archlinux.org/other/gnome-phone-manager/gnome-phone-manager-0.68-git20121019.tar.xz
+        gnome-phone-manager-0.68-eds.patch)
+sha256sums=('885dfa80989c633a5ae8b118c9b7c903e18e44f0e9fc89e6a9bae05da87c9b15'
+            '98d5c2d3034081eebbaa0dac85f53dcc40c8970114f5711aff8c37bab2931a66')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i ../phonemgr-gnome-bluetooth-3.3.patch
-  autoreconf -fi
-  LIBS+="-lgthread-2.0" ./configure --prefix=/usr --sysconfdir=/etc \
+  patch -p1 -i ../gnome-phone-manager-0.68-eds.patch
+  ./configure --prefix=/usr --sysconfdir=/etc \
     --localstatedir=/var --disable-static
   make
 }
diff --git a/extra/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch b/extra/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch
new file mode 100644
index 000000000..2a36de13a
--- /dev/null
+++ b/extra/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch
@@ -0,0 +1,386 @@
+diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.c b/cut-n-paste/e-contact-entry/e-contact-entry.c
+index dc8e2e3..d95e5b9 100644
+--- a/cut-n-paste/e-contact-entry/e-contact-entry.c
++++ b/cut-n-paste/e-contact-entry/e-contact-entry.c
+@@ -38,11 +38,6 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ 
+-#include <libedataserver/e-source.h>
+-#include <libebook/e-book.h>
+-#include <libebook/e-book-view.h>
+-#include <libebook/e-contact.h>
+-
+ #include "e-contact-entry.h"
+ #include "econtactentry-marshal.h"
+ 
+@@ -59,7 +54,7 @@ static int signals[LAST_SIGNAL] = { 0 };
+ /* Properties */
+ enum {
+   PROP_0, /* TODO: why? */
+-  PROP_SOURCE_LIST,
++  PROP_REGISTRY,
+   PROP_COMPLETE_LENGTH,
+ };
+ 
+@@ -70,7 +65,7 @@ enum {
+ struct EContactEntryPriv {
+   GtkEntryCompletion *completion;
+   GtkListStore *store;
+-  ESourceList *source_list;
++  ESourceRegistry *registry;
+   /* A list of EntryLookup structs we are searching */
+   GList *lookup_entries;
+   /* Number of characters to start searching at */
+@@ -227,7 +222,7 @@ e_contact_entry_display_func (EContact *contact)
+   emails = e_contact_get (contact, E_CONTACT_EMAIL);
+   for (l = emails; l != NULL; l = l->next) {
+     item = g_new0 (EContactEntyItem, 1);
+-    item->identifier = item->identifier = g_strdup (l->data);
++    item->identifier = g_strdup (l->data);
+     item->display_string = g_strdup_printf ("%s <%s>", (char*)e_contact_get_const (contact, E_CONTACT_NAME_OR_ORG), item->identifier);
+ 
+     items = g_list_prepend (items, item);
+@@ -276,22 +271,13 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data)
+       return;
+ 
+     photo = e_contact_get (contact, E_CONTACT_PHOTO);
+-#ifndef HAVE_ECONTACTPHOTOTYPE
+-    if (photo) {
+-#else
+     if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) {
+-#endif
+       GdkPixbufLoader *loader;
+ 
+       loader = gdk_pixbuf_loader_new ();
+ 
+-#ifndef HAVE_ECONTACTPHOTOTYPE
+-      if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data,
+-			      photo->length, NULL))
+-#else
+       if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data.inlined.data,
+ 			      photo->data.inlined.length, NULL))
+-#endif
+         pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+ 
+       if (pixbuf) {
+@@ -339,16 +325,15 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data)
+  * The query on the EBookView has completed.
+  */
+ static void
+-view_completed_cb (EBookView *book_view, EBookViewStatus status, gpointer user_data)
++view_completed_cb (EBookView *book_view, EBookViewStatus status, const gchar *message, gpointer user_data)
+ {
+   EntryLookup *lookup;
+   g_return_if_fail (user_data != NULL);
+-  /* TODO: handle status != OK */
+-  g_return_if_fail (status == E_BOOK_ERROR_OK);
+   g_return_if_fail (book_view != NULL);
+ 
+   lookup = (EntryLookup*)user_data;
+   g_object_unref (lookup->bookview);
++  lookup->bookview = NULL;
+ }
+ 
+ /**
+@@ -373,8 +358,8 @@ bookview_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer clo
+   lookup->bookview = book_view;
+   g_object_add_weak_pointer ((GObject*)book_view, (gpointer*)&lookup->bookview);
+   
+-  g_signal_connect (book_view, "contacts_added", (GCallback)view_contacts_added_cb, lookup);
+-  g_signal_connect (book_view, "sequence_complete", (GCallback)view_completed_cb, lookup);
++  g_signal_connect (book_view, "contacts-added", (GCallback)view_contacts_added_cb, lookup);
++  g_signal_connect (book_view, "view_complete", (GCallback)view_completed_cb, lookup);
+   
+   e_book_view_start (book_view);
+ }
+@@ -396,6 +381,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data)
+       if (lookup->bookview) {
+         e_book_view_stop (lookup->bookview);
+         g_object_unref (lookup->bookview);
++        lookup->bookview = NULL;
+       }
+     }
+     
+@@ -410,7 +396,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data)
+       if (!lookup->open)
+         continue;
+       
+-      if (e_book_async_get_book_view (lookup->book, query, NULL, 11, (EBookBookViewCallback)bookview_cb, lookup) != 0) {
++      if (e_book_async_get_book_view (lookup->book, query, NULL, MAX_ENTRIES, (EBookBookViewCallback)bookview_cb, lookup) == FALSE) {
+         g_signal_emit (entry, signals[ERROR], 0, _("Cannot create searchable view."));
+       }
+     }
+@@ -458,11 +444,12 @@ book_opened_cb (EBook *book, EBookStatus status, gpointer data)
+  */
+ 
+ void
+-e_contact_entry_set_source_list (EContactEntry *entry,
+-    				  ESourceList *source_list)
++e_contact_entry_set_registry (EContactEntry *entry,
++    			      ESourceRegistry *registry)
+ {
++  GList *list, *link;
++  const gchar *extension_name;
+   GError *error = NULL;
+-  GSList *list, *l;
+ 
+   g_return_if_fail (E_IS_CONTACT_ENTRY (entry));
+ 
+@@ -471,58 +458,48 @@ e_contact_entry_set_source_list (EContactEntry *entry,
+     g_list_foreach (entry->priv->lookup_entries, (GFunc)lookup_entry_free, NULL);
+     g_list_free (entry->priv->lookup_entries);
+   }
+-  if (entry->priv->source_list) {
+-    g_object_unref (entry->priv->source_list);
++  if (entry->priv->registry) {
++    g_object_unref (entry->priv->registry);
+   }
+ 
+   /* If we have no new sources, disable and return here */
+-  if (source_list == NULL) {
++  if (registry == NULL) {
+     g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE);
+-    entry->priv->source_list = NULL;
++    entry->priv->registry = NULL;
+     entry->priv->lookup_entries = NULL;
+     return;
+   }
+ 
+-  entry->priv->source_list = source_list;
+-  /* So that the list isn't going away underneath us */
+-  g_object_ref (entry->priv->source_list);
++  entry->priv->registry = registry;
++  /* So that the registry isn't going away underneath us */
++  g_object_ref (entry->priv->registry);
+ 
+-  /* That gets us a list of ESourceGroup */
+-  list = e_source_list_peek_groups (source_list);
+   entry->priv->lookup_entries = NULL;
+ 
+-  for (l = list; l != NULL; l = l->next) {
+-    ESourceGroup *group = l->data;
+-    GSList *sources = NULL, *m;
+-    /* That should give us a list of ESource */
+-    sources = e_source_group_peek_sources (group);
+-    for (m = sources; m != NULL; m = m->next) {
+-      ESource *source = m->data;
+-      ESource *s = e_source_copy (source);
+-      EntryLookup *lookup;
+-      char *uri;
++  extension_name = E_SOURCE_EXTENSION_ADDRESS_BOOK;
++  list = e_source_registry_list_sources (registry, extension_name);
+ 
+-      uri = g_strdup_printf("%s/%s", e_source_group_peek_base_uri (group), e_source_peek_relative_uri (source));
+-      e_source_set_absolute_uri (s, uri);
+-      g_free (uri);
++  for (link = list; link != NULL; link = g_list_next (link)) {
++    ESource *source = E_SOURCE (link->data);
++    EntryLookup *lookup;
+ 
+-      /* Now add those to the lookup entries list */
+-      lookup = g_new0 (EntryLookup, 1);
+-      lookup->entry = entry;
+-      lookup->status = E_BOOK_ERROR_OK;
+-      lookup->open = FALSE;
++    /* Now add those to the lookup entries list */
++    lookup = g_new0 (EntryLookup, 1);
++    lookup->entry = entry;
++    lookup->status = E_BOOK_ERROR_OK;
++    lookup->open = FALSE;
+ 
+-      if ((lookup->book = e_book_new (s, &error)) == NULL) {
+-        /* TODO handle this better, fire the error signal I guess */
++    if ((lookup->book = e_book_new (source, &error)) == NULL) {
++      /* TODO handle this better, fire the error signal I guess */
++      if (error) {
+         g_warning ("%s", error->message);
+-	g_error_free (error);
+-	g_free (lookup);
+-      } else {
+-        entry->priv->lookup_entries = g_list_append (entry->priv->lookup_entries, lookup);
+-	e_book_async_open(lookup->book, TRUE, (EBookCallback)book_opened_cb, lookup);
++        g_error_free (error);
++        error = NULL;
+       }
+-
+-      g_object_unref (s);
++      g_free (lookup);
++    } else {
++      entry->priv->lookup_entries = g_list_append (entry->priv->lookup_entries, lookup);
++      e_book_async_open(lookup->book, TRUE, (EBookCallback)book_opened_cb, lookup);
+     }
+   }
+ 
+@@ -530,12 +507,12 @@ e_contact_entry_set_source_list (EContactEntry *entry,
+     g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE);
+ }
+ 
+-ESourceList *
+-e_contact_entry_get_source_list (EContactEntry *entry)
++ESourceRegistry *
++e_contact_entry_get_registry (EContactEntry *entry)
+ {
+   g_return_val_if_fail (E_IS_CONTACT_ENTRY (entry), NULL);
+ 
+-  return entry->priv->source_list;
++  return entry->priv->registry;
+ }
+ 
+ void
+@@ -601,8 +578,8 @@ e_contact_entry_set_property (GObject *object, guint property_id, const GValue *
+   entry = E_CONTACT_ENTRY (object);
+   
+   switch (property_id) {
+-  case PROP_SOURCE_LIST:
+-    e_contact_entry_set_source_list (entry, g_value_get_object (value));
++  case PROP_REGISTRY:
++    e_contact_entry_set_registry (entry, g_value_get_object (value));
+     break;
+   case PROP_COMPLETE_LENGTH:
+     e_contact_entry_set_complete_length (entry, g_value_get_int (value));
+@@ -620,8 +597,8 @@ e_contact_entry_get_property (GObject *object, guint property_id, GValue *value,
+   entry = E_CONTACT_ENTRY (object);
+   
+   switch (property_id) {
+-  case PROP_SOURCE_LIST:
+-    g_value_set_object (value, e_contact_entry_get_source_list (entry));
++  case PROP_REGISTRY:
++    g_value_set_object (value, e_contact_entry_get_registry (entry));
+     break;
+   case PROP_COMPLETE_LENGTH:
+     g_value_set_int (value, e_contact_entry_get_complete_length (entry));
+@@ -644,7 +621,7 @@ e_contact_entry_finalize (GObject *object)
+     g_list_free (entry->priv->lookup_entries);
+     g_object_unref (entry->priv->completion);
+     g_object_unref (entry->priv->store);
+-    g_object_unref (entry->priv->source_list);
++    g_object_unref (entry->priv->registry);
+ 
+     if (entry->priv->display_destroy) {
+       entry->priv->display_destroy (entry->priv->display_func);
+@@ -657,7 +634,7 @@ e_contact_entry_finalize (GObject *object)
+ static void
+ reset_search_fields (EContactEntry *entry)
+ {
+-  EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, E_CONTACT_NICKNAME, E_CONTACT_ORG, 0 };
++  EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, E_CONTACT_NICKNAME, 0 };
+ 
+   g_free (entry->priv->search_fields);
+   entry->priv->search_fields = g_new0 (EContactField, G_N_ELEMENTS (fields));
+@@ -716,9 +693,9 @@ e_contact_entry_class_init (EContactEntryClass *klass)
+   object_class->finalize = e_contact_entry_finalize;
+ 
+   /* Properties */
+-  g_object_class_install_property (object_class, PROP_SOURCE_LIST,
+-                                   g_param_spec_object ("source-list", "Source List", "The source list to search for contacts.",
+-                                                        E_TYPE_SOURCE_LIST, G_PARAM_READWRITE));
++  g_object_class_install_property (object_class, PROP_REGISTRY,
++                                   g_param_spec_object ("registry", "Registry", "Data source registry.",
++                                                        E_TYPE_SOURCE_REGISTRY, G_PARAM_READWRITE));
+   
+   g_object_class_install_property (object_class, PROP_COMPLETE_LENGTH,
+                                    g_param_spec_int ("complete-length", "Complete length", "Number of characters to start a search on.",
+@@ -771,6 +748,7 @@ lookup_entry_free (EntryLookup *lookup)
+   if (lookup->bookview) {
+     g_warning("EBookView still around");
+     g_object_unref (lookup->bookview);
++    lookup->bookview = NULL;
+   }
+   if (lookup->book) {
+     g_object_unref (lookup->book);
+diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.h b/cut-n-paste/e-contact-entry/e-contact-entry.h
+index bf6b39b..6fedef7 100644
+--- a/cut-n-paste/e-contact-entry/e-contact-entry.h
++++ b/cut-n-paste/e-contact-entry/e-contact-entry.h
+@@ -23,10 +23,8 @@
+ #ifndef CONTACT_ENTRY_H
+ #define CONTACT_ENTRY_H
+ 
+-#include <libedataserver/e-source-group.h>
+-#include <libedataserver/e-source-list.h>
+-#include <libebook/e-contact.h>
+ #include <gtk/gtk.h>
++#include <libebook/libebook.h>
+ 
+ G_BEGIN_DECLS
+ 
+@@ -71,8 +69,8 @@ GType e_contact_entry_get_type (void);
+ 
+ GtkWidget *e_contact_entry_new (void);
+ 
+-void e_contact_entry_set_source_list (EContactEntry *entry, ESourceList *list);
+-ESourceList *e_contact_entry_get_source_list (EContactEntry *entry);
++void e_contact_entry_set_registry (EContactEntry *entry, ESourceRegistry *registry);
++ESourceRegistry *e_contact_entry_get_registry (EContactEntry *entry);
+ 
+ void e_contact_entry_set_complete_length(EContactEntry *entry, int length);
+ int e_contact_entry_get_complete_length(EContactEntry *entry);
+diff --git a/libgsm/phonemgr-utils.c b/libgsm/phonemgr-utils.c
+index 4e62e10..baef34f 100644
+--- a/libgsm/phonemgr-utils.c
++++ b/libgsm/phonemgr-utils.c
+@@ -27,7 +27,7 @@
+ #include <glib.h>
+ #include <glib/gstdio.h>
+ #include <glib-object.h>
+-#include <libebook/e-contact.h>
++#include <libebook/libebook.h>
+ #include <gnokii.h>
+ 
+ #include <bluetooth/bluetooth.h>
+diff --git a/src/e-phone-entry.c b/src/e-phone-entry.c
+index 5d25622..38f4c2f 100644
+--- a/src/e-phone-entry.c
++++ b/src/e-phone-entry.c
+@@ -31,8 +31,7 @@
+ 
+ #include <gtk/gtk.h>
+ #include <string.h>
+-#include <libedataserver/e-source-list.h>
+-#include <libedataserverui/e-client-utils.h>
++#include <libedataserverui/libedataserverui.h>
+ #include "e-phone-entry.h"
+ 
+ #define CONTACT_FORMAT "%s (%s)"
+@@ -181,25 +180,25 @@ e_phone_entry_finalize (GObject *object)
+ }
+ 
+ static void
+-add_sources (EContactEntry *entry)
+-{
+-	ESourceList *source_list;
+-
+-	if (e_client_utils_get_sources (&source_list,
+-					E_CLIENT_SOURCE_TYPE_CONTACTS,
+-					NULL)) {
+-		e_contact_entry_set_source_list (E_CONTACT_ENTRY (entry),
+-						 source_list);
+-		g_object_unref (source_list);
+-	}
+-}
+-
+-static void
+ e_phone_entry_init (EPhoneEntry *entry)
+ {
+ 	EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_NICKNAME, E_CONTACT_ORG, E_CONTACT_PHONE_MOBILE, 0 };
++	ESourceRegistry *registry;
++	GError *error = NULL;
++
++	/* XXX This call blocks while a D-Bus connection is made, possibly
++	 *     requiring activation.  Might be better to create the registry
++	 *     in main(), pass it to ui_init(), and have e_phone_entry_new()
++	 *     take it as an argument.  Calling this from main() means if it
++	 *     fails you can abort cleanly with a console error message. */
++	registry = e_source_registry_new_sync (NULL, &error);
++	if (registry == NULL) {
++		g_error ("%s: %s", G_STRFUNC, error->message);
++		g_assert_not_reached ();
++	}
++	e_contact_entry_set_registry (E_CONTACT_ENTRY (entry), registry);
++	g_object_unref (registry);
+ 
+-	add_sources (E_CONTACT_ENTRY (entry));
+ 	e_contact_entry_set_search_fields (E_CONTACT_ENTRY (entry), (const EContactField *)fields);
+ 	e_contact_entry_set_display_func (E_CONTACT_ENTRY (entry), test_display_func, NULL, NULL);
+ 	g_signal_connect (G_OBJECT (entry), "contact_selected",
diff --git a/extra/gnome-pilot/PKGBUILD b/extra/gnome-pilot/PKGBUILD
deleted file mode 100644
index 7cc25291f..000000000
--- a/extra/gnome-pilot/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 157208 2012-04-26 02:01:26Z eric $
-# Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-pilot
-pkgver=2.91.93
-pkgrel=2
-pkgdesc="Pilot Support for Gnome"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-depends=('pilot-link' 'evolution-data-server')
-makedepends=('intltool' 'gob2' 'gnome-doc-utils' 'gnome-panel')
-optdepends=('gnome-panel')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=gnome-pilot.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('56fbb1c54621dcda9cde4c7ac0754d5d9d68ae2ae1eb63acffb00817e4a8dd21')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-pilot \
-      --localstatedir=/var --disable-static \
-      --without-hal
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
diff --git a/extra/gnome-pilot/gnome-pilot.install b/extra/gnome-pilot/gnome-pilot.install
deleted file mode 100644
index 616daa0e4..000000000
--- a/extra/gnome-pilot/gnome-pilot.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=gnome-pilot
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD
index 13e115b92..ce92f72d8 100644
--- a/extra/gnome-power-manager/PKGBUILD
+++ b/extra/gnome-power-manager/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156837 2012-04-23 09:07:16Z ibiru $
+# $Id: PKGBUILD 169907 2012-10-30 22:34:30Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-power-manager
-pkgver=3.4.0
+pkgver=3.6.0
 pkgrel=1
 pkgdesc="Power management tools."
 arch=(i686 x86_64 'mips64el')
@@ -15,7 +15,7 @@ options=(!emptydirs)
 install=gnome-power-manager.install
 groups=(gnome-extra)
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('2c47786a1ed85b6ba48ad5e74e2584ab7cbc0127fda46359ec4671b1c0286c71')
+sha256sums=('176023d51d544a888bcd07611f2c1adaedfe2e20796f3fb97fba59f6330851c6')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-screensaver/PKGBUILD b/extra/gnome-screensaver/PKGBUILD
index f55fdb6fb..a90034576 100644
--- a/extra/gnome-screensaver/PKGBUILD
+++ b/extra/gnome-screensaver/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163692 2012-07-17 22:26:51Z ibiru $
+# $Id: PKGBUILD 169908 2012-10-30 22:34:33Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-screensaver
-pkgver=3.4.4
+pkgver=3.6.1
 pkgrel=1
 pkgdesc="Screensaver designed to integrate well with the GNOME desktop."
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ options=(!emptydirs)
 install=gnome-screensaver.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
        gnome-screensaver.pam)
-sha256sums=('dae4be9daa2c3db15f614dd004aa858e32e5fc5d1818a8317167441097b57904'
+sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
             'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb')
 
 build() {
diff --git a/extra/gnome-screenshot/PKGBUILD b/extra/gnome-screenshot/PKGBUILD
index be0d01087..bd955e1f2 100644
--- a/extra/gnome-screenshot/PKGBUILD
+++ b/extra/gnome-screenshot/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156841 2012-04-23 09:07:21Z ibiru $
+# $Id: PKGBUILD 170897 2012-11-12 22:32:16Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-screenshot
-pkgver=3.4.1
-pkgrel=1.1
+pkgver=3.6.1
+pkgrel=1
 pkgdesc="Take pictures of your screen"
 arch=(i686 x86_64 mips64el)
 url="http://gnome.org"
@@ -13,7 +13,7 @@ makedepends=('intltool')
 groups=('gnome-extra')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('47c227e43404d6cc101cf473d8f48f7572064b2b10724f2660066f9a4718d488')
+sha256sums=('7954424f927c9cf5451d27e78edd10fa80d15345dfdb78bd7bc98f873617f382')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-search-tool/PKGBUILD b/extra/gnome-search-tool/PKGBUILD
index eff65e584..7a8faea13 100644
--- a/extra/gnome-search-tool/PKGBUILD
+++ b/extra/gnome-search-tool/PKGBUILD
@@ -1,34 +1,30 @@
-# $Id: PKGBUILD 156843 2012-04-23 09:07:23Z ibiru $
+# $Id: PKGBUILD 169910 2012-10-30 22:34:37Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-search-tool
-pkgver=3.4.0
-pkgrel=1.1
+pkgver=3.6.0
+pkgrel=1
 pkgdesc="Utility to search for files"
 arch=(i686 x86_64 mips64el)
 url="http://gnome.org"
 license=('GPL2')
-depends=('gconf' 'gtk3' 'libsm')
-makedepends=('intltool' 'gnome-doc-utils')
+depends=('gtk3' 'libsm')
+makedepends=('intltool' 'yelp-tools')
 install=$pkgname.install
 options=('!emptydirs')
+groups=('gnome-extra')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6c4ed39ab1196d118e5e0d2a7faa07fbbb257831454ee92ff0c6f28c0942e69c')
+sha256sums=('a33000cd7d033be4ea50422f0f2cca611da5b79bd0f0875017f105a1bc177f42')
 
 build() {
   cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --disable-schemas-install
+  ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
 package() {
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain $pkgname "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/gnome-search-tool/gnome-search-tool.install b/extra/gnome-search-tool/gnome-search-tool.install
index 9bc909b92..b631b6a89 100644
--- a/extra/gnome-search-tool/gnome-search-tool.install
+++ b/extra/gnome-search-tool/gnome-search-tool.install
@@ -1,17 +1,16 @@
-pkgname=gnome-search-tool
-
 post_install() {
-    gconfpkg --install $pkgname
+  glib-compile-schemas usr/share/glib-2.0/schemas
 }
 
 pre_upgrade() {
-    pre_remove
+  (( $(vercmp $2 3.6.0) < 0 )) && gconfpkg --uninstall gnome-search-tool
+  return 0
 }
 
 post_upgrade() {
-    post_install
+  post_install
 }
 
-pre_remove() {
-    gconfpkg --uninstall $pkgname
+post_remove() {
+  post_install
 }
diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD
index 740b4d802..552c7f486 100644
--- a/extra/gnome-session/PKGBUILD
+++ b/extra/gnome-session/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 161341 2012-06-10 01:43:11Z heftig $
+# $Id: PKGBUILD 170916 2012-11-12 23:48:19Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-session
-pkgver=3.4.2
-pkgrel=3
+pkgver=3.6.2
+pkgrel=1
 pkgdesc="The GNOME Session Handler"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
-depends=('libsystemd' 'consolekit' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3'
+depends=('libsystemd' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3'
          'hicolor-icon-theme' 'json-glib' 'libgl' 'libsm' 'libxtst' 'polkit-gnome'
-         'startup-notification' 'upower')
+         'upower')
 makedepends=('intltool' 'mesa' 'xtrans')
 options=('!emptydirs')
 install=gnome-session.install
 url="http://www.gnome.org"
 groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
         gnome-session-3.3.1-llvmpipe.patch timeout.patch)
-sha256sums=('6c2cbc86b63bb4869f4f95e7771ec6eee0c02965b732d634de5c8122607c4356'
+sha256sums=('2e3a3466eed4136826e150b639c63beb5c93710346dea2e538adfe5e18d701b4'
             '59ea58012febe48a67dabd944dc638400637ad4d296d63b63b585f10eea4f85e'
             '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc')
 
diff --git a/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
new file mode 100644
index 000000000..03b662c86
--- /dev/null
+++ b/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
@@ -0,0 +1,1476 @@
+From f418ff2cd04b233dbffc1129e856630d8c96cd07 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Fri, 21 Sep 2012 11:56:53 +0100
+Subject: [PATCH] power and media-keys: Use logind for suspending and
+ rebooting the system
+
+Use the new logind features to suspend and resume but making sure we opt out
+of logind handling the sleep and power keys, and also inhibiting for lid close
+auto-suspend if there is an external monitor connected.
+
+Also use a delay inihibit for logind so that we can do actions on suspend like
+blanking the screen using the screensaver and also poking the screensaver on
+resume.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=680689
+
+Conflicts:
+	plugins/power/gsd-power-manager.c
+---
+ plugins/common/Makefile.am                  |   4 +-
+ plugins/common/gsd-power-helper.c           | 203 --------
+ plugins/common/gsd-power-helper.h           |  35 --
+ plugins/media-keys/gsd-media-keys-manager.c | 156 +++++--
+ plugins/power/gsd-power-manager.c           | 697 +++++++++++++++++++---------
+ 5 files changed, 594 insertions(+), 501 deletions(-)
+ delete mode 100644 plugins/common/gsd-power-helper.c
+ delete mode 100644 plugins/common/gsd-power-helper.h
+
+diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
+index 7e50db4..b0e907c 100644
+--- a/plugins/common/Makefile.am
++++ b/plugins/common/Makefile.am
+@@ -6,9 +6,7 @@ libcommon_la_SOURCES = \
+ 	gsd-keygrab.c		\
+ 	gsd-keygrab.h		\
+ 	gsd-input-helper.c	\
+-	gsd-input-helper.h	\
+-	gsd-power-helper.c	\
+-	gsd-power-helper.h
++	gsd-input-helper.h
+ 
+ libcommon_la_CPPFLAGS = \
+ 	$(AM_CPPFLAGS)
+diff --git a/plugins/common/gsd-power-helper.c b/plugins/common/gsd-power-helper.c
+deleted file mode 100644
+index 27d0eda..0000000
+--- a/plugins/common/gsd-power-helper.c
++++ /dev/null
+@@ -1,203 +0,0 @@
+-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+- *
+- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net>
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+- *
+- */
+-
+-#include "config.h"
+-
+-#include "gsd-power-helper.h"
+-
+-#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
+-#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
+-#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
+-
+-#define CONSOLEKIT_DBUS_NAME                    "org.freedesktop.ConsoleKit"
+-#define CONSOLEKIT_DBUS_PATH_MANAGER            "/org/freedesktop/ConsoleKit/Manager"
+-#define CONSOLEKIT_DBUS_INTERFACE_MANAGER       "org.freedesktop.ConsoleKit.Manager"
+-
+-#ifdef HAVE_SYSTEMD
+-static void
+-systemd_stop (void)
+-{
+-        GDBusConnection *bus;
+-
+-        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
+-        g_dbus_connection_call (bus,
+-                                SYSTEMD_DBUS_NAME,
+-                                SYSTEMD_DBUS_PATH,
+-                                SYSTEMD_DBUS_INTERFACE,
+-                                "PowerOff",
+-                                g_variant_new ("(b)", FALSE),
+-                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
+-        g_object_unref (bus);
+-}
+-
+-static void
+-systemd_suspend (void)
+-{
+-        GDBusConnection *bus;
+-
+-        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
+-        g_dbus_connection_call (bus,
+-                                SYSTEMD_DBUS_NAME,
+-                                SYSTEMD_DBUS_PATH,
+-                                SYSTEMD_DBUS_INTERFACE,
+-                                "Suspend",
+-                                g_variant_new ("(b)", TRUE),
+-                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
+-        g_object_unref (bus);
+-}
+-
+-static void
+-systemd_hibernate (void)
+-{
+-        GDBusConnection *bus;
+-
+-        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
+-        g_dbus_connection_call (bus,
+-                                SYSTEMD_DBUS_NAME,
+-                                SYSTEMD_DBUS_PATH,
+-                                SYSTEMD_DBUS_INTERFACE,
+-                                "Hibernate",
+-                                g_variant_new ("(b)", TRUE),
+-                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
+-        g_object_unref (bus);
+-}
+-
+-#else /* HAVE_SYSTEMD */
+-
+-static void
+-consolekit_stop_cb (GObject *source_object,
+-                    GAsyncResult *res,
+-                    gpointer user_data)
+-{
+-        GVariant *result;
+-        GError *error = NULL;
+-
+-        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
+-                                           res,
+-                                           &error);
+-        if (result == NULL) {
+-                g_warning ("couldn't stop using ConsoleKit: %s",
+-                           error->message);
+-                g_error_free (error);
+-        } else {
+-                g_variant_unref (result);
+-        }
+-}
+-
+-static void
+-consolekit_stop (void)
+-{
+-        GError *error = NULL;
+-        GDBusProxy *proxy;
+-
+-        /* power down the machine in a safe way */
+-        proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+-                                               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+-                                               NULL,
+-                                               CONSOLEKIT_DBUS_NAME,
+-                                               CONSOLEKIT_DBUS_PATH_MANAGER,
+-                                               CONSOLEKIT_DBUS_INTERFACE_MANAGER,
+-                                               NULL, &error);
+-        if (proxy == NULL) {
+-                g_warning ("cannot connect to ConsoleKit: %s",
+-                           error->message);
+-                g_error_free (error);
+-                return;
+-        }
+-        g_dbus_proxy_call (proxy,
+-                           "Stop",
+-                           NULL,
+-                           G_DBUS_CALL_FLAGS_NONE,
+-                           -1, NULL,
+-                           consolekit_stop_cb, NULL);
+-        g_object_unref (proxy);
+-}
+-static void
+-upower_sleep_cb (GObject *source_object,
+-                 GAsyncResult *res,
+-                 gpointer user_data)
+-{
+-        GVariant *result;
+-        GError *error = NULL;
+-
+-        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
+-                                           res,
+-                                           &error);
+-        if (result == NULL) {
+-                g_warning ("couldn't sleep using UPower: %s",
+-                           error->message);
+-                g_error_free (error);
+-        } else {
+-                g_variant_unref (result);
+-        }
+-}
+-
+-static void
+-upower_suspend (GDBusProxy *upower_proxy)
+-{
+-        g_dbus_proxy_call (upower_proxy,
+-                           "Suspend",
+-                           NULL,
+-                           G_DBUS_CALL_FLAGS_NONE,
+-                           -1, NULL,
+-                           upower_sleep_cb, NULL);
+-}
+-
+-static void
+-upower_hibernate (GDBusProxy *upower_proxy)
+-{
+-        g_dbus_proxy_call (upower_proxy,
+-                           "Hibernate",
+-                           NULL,
+-                           G_DBUS_CALL_FLAGS_NONE,
+-                           -1, NULL,
+-                           upower_sleep_cb, NULL);
+-}
+-#endif /* HAVE_SYSTEMD */
+-
+-void
+-gsd_power_suspend (GDBusProxy *upower_proxy)
+-{
+-#ifdef HAVE_SYSTEMD
+-	systemd_suspend ();
+-#else
+-	upower_suspend (upower_proxy);
+-#endif
+-}
+-
+-void
+-gsd_power_poweroff (void)
+-{
+-#ifdef HAVE_SYSTEMD
+-	systemd_stop ();
+-#else
+-	consolekit_stop ();
+-#endif
+-}
+-
+-void
+-gsd_power_hibernate (GDBusProxy *upower_proxy)
+-{
+-#ifdef HAVE_SYSTEMD
+-	systemd_hibernate ();
+-#else
+-	upower_hibernate (upower_proxy);
+-#endif
+-}
+diff --git a/plugins/common/gsd-power-helper.h b/plugins/common/gsd-power-helper.h
+deleted file mode 100644
+index e3be14f..0000000
+--- a/plugins/common/gsd-power-helper.h
++++ /dev/null
+@@ -1,35 +0,0 @@
+-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+- *
+- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net>
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+- */
+-
+-#ifndef __GSD_POWER_HELPER_H
+-#define __GSD_POWER_HELPER_H
+-
+-#include <glib.h>
+-
+-G_BEGIN_DECLS
+-
+-#include <gio/gio.h>
+-
+-void gsd_power_suspend   (GDBusProxy *upower_proxy);
+-void gsd_power_hibernate (GDBusProxy *upower_proxy);
+-void gsd_power_poweroff  (void);
+-
+-G_END_DECLS
+-
+-#endif /* __GSD_POWER_HELPER_H */
+diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
+index 9c84d7f..a2f277e 100644
+--- a/plugins/media-keys/gsd-media-keys-manager.c
++++ b/plugins/media-keys/gsd-media-keys-manager.c
+@@ -39,6 +39,7 @@
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
+ #include <gio/gdesktopappinfo.h>
++#include <gio/gunixfdlist.h>
+ 
+ #ifdef HAVE_GUDEV
+ #include <gudev/gudev.h>
+@@ -51,7 +52,6 @@
+ #include "shortcuts-list.h"
+ #include "gsd-osd-window.h"
+ #include "gsd-input-helper.h"
+-#include "gsd-power-helper.h"
+ #include "gsd-enums.h"
+ 
+ #include <canberra.h>
+@@ -105,6 +105,10 @@ static const gchar introspection_xml[] =
+ #define KEY_CURRENT_INPUT_SOURCE "current"
+ #define KEY_INPUT_SOURCES        "sources"
+ 
++#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
++#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
++#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
++
+ #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate))
+ 
+ typedef struct {
+@@ -148,10 +152,13 @@ struct GsdMediaKeysManagerPrivate
+ 
+         /* Power stuff */
+         GSettings       *power_settings;
+-        GDBusProxy      *upower_proxy;
+         GDBusProxy      *power_screen_proxy;
+         GDBusProxy      *power_keyboard_proxy;
+ 
++        /* systemd stuff */
++        GDBusProxy      *logind_proxy;
++        gint             inhibit_keys_fd;
++
+         /* Multihead stuff */
+         GdkScreen       *current_screen;
+         GSList          *screens;
+@@ -1618,6 +1625,38 @@ do_toggle_contrast_action (GsdMediaKeysManager *manager)
+ }
+ 
+ static void
++power_action_suspend (GsdMediaKeysManager *manager)
++{
++#ifndef HAVE_SYSTEMD
++        g_warning ("no systemd support");
++        return;
++#endif
++        g_dbus_proxy_call (manager->priv->logind_proxy,
++                           "Suspend",
++                           g_variant_new ("(b)", TRUE),
++                           G_DBUS_CALL_FLAGS_NONE,
++                           G_MAXINT,
++                           manager->priv->bus_cancellable,
++                           NULL, NULL);
++}
++
++static void
++power_action_hibernate (GsdMediaKeysManager *manager)
++{
++#ifndef HAVE_SYSTEMD
++        g_warning ("no systemd support");
++        return;
++#endif
++        g_dbus_proxy_call (manager->priv->logind_proxy,
++                           "Hibernate",
++                           g_variant_new ("(b)", TRUE),
++                           G_DBUS_CALL_FLAGS_NONE,
++                           G_MAXINT,
++                           manager->priv->bus_cancellable,
++                           NULL, NULL);
++}
++
++static void
+ do_config_power_action (GsdMediaKeysManager *manager,
+                         const gchar *config_key)
+ {
+@@ -1627,14 +1666,14 @@ do_config_power_action (GsdMediaKeysManager *manager,
+                                            config_key);
+         switch (action_type) {
+         case GSD_POWER_ACTION_SUSPEND:
+-                gsd_power_suspend (manager->priv->upower_proxy);
++                power_action_suspend (manager);
+                 break;
+         case GSD_POWER_ACTION_INTERACTIVE:
+         case GSD_POWER_ACTION_SHUTDOWN:
+                 gnome_session_shutdown (manager);
+                 break;
+         case GSD_POWER_ACTION_HIBERNATE:
+-                gsd_power_hibernate (manager->priv->upower_proxy);
++                power_action_hibernate (manager);
+                 break;
+         case GSD_POWER_ACTION_BLANK:
+         case GSD_POWER_ACTION_NOTHING:
+@@ -2248,6 +2287,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
+         }
+ #endif /* HAVE_GUDEV */
+ 
++        g_clear_object (&priv->logind_proxy);
+         if (priv->settings) {
+                 g_object_unref (priv->settings);
+                 priv->settings = NULL;
+@@ -2268,11 +2308,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
+                 priv->power_keyboard_proxy = NULL;
+         }
+ 
+-        if (priv->upower_proxy) {
+-                g_object_unref (priv->upower_proxy);
+-                priv->upower_proxy = NULL;
+-        }
+-
+         if (priv->cancellable != NULL) {
+                 g_cancellable_cancel (priv->cancellable);
+                 g_object_unref (priv->cancellable);
+@@ -2363,9 +2398,85 @@ gsd_media_keys_manager_class_init (GsdMediaKeysManagerClass *klass)
+ }
+ 
+ static void
++inhibit_done (GObject      *source,
++              GAsyncResult *result,
++              gpointer      user_data)
++{
++        GDBusProxy *proxy = G_DBUS_PROXY (source);
++        GsdMediaKeysManager *manager = GSD_MEDIA_KEYS_MANAGER (user_data);
++        GError *error = NULL;
++        GVariant *res;
++        GUnixFDList *fd_list = NULL;
++        gint idx;
++
++        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
++        if (res == NULL) {
++                g_warning ("Unable to inhibit keypresses: %s", error->message);
++                g_error_free (error);
++        } else {
++                g_variant_get (res, "(h)", &idx);
++                manager->priv->inhibit_keys_fd = g_unix_fd_list_get (fd_list, idx, &error);
++                if (manager->priv->inhibit_keys_fd == -1) {
++                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
++                        g_error_free (error);
++                }
++                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_keys_fd);
++                g_object_unref (fd_list);
++                g_variant_unref (res);
++        }
++}
++
++static void
+ gsd_media_keys_manager_init (GsdMediaKeysManager *manager)
+ {
++        GError *error;
++        GDBusConnection *bus;
++
++        error = NULL;
+         manager->priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager);
++
++        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
++        if (bus == NULL) {
++                g_warning ("Failed to connect to system bus: %s",
++                           error->message);
++                g_error_free (error);
++                return;
++        }
++
++        manager->priv->logind_proxy =
++                g_dbus_proxy_new_sync (bus,
++                                       0,
++                                       NULL,
++                                       SYSTEMD_DBUS_NAME,
++                                       SYSTEMD_DBUS_PATH,
++                                       SYSTEMD_DBUS_INTERFACE,
++                                       NULL,
++                                       &error);
++
++        if (manager->priv->logind_proxy == NULL) {
++                g_warning ("Failed to connect to systemd: %s",
++                           error->message);
++                g_error_free (error);
++        }
++
++        g_object_unref (bus);
++
++        g_debug ("Adding system inhibitors for power keys");
++        manager->priv->inhibit_keys_fd = -1;
++        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
++                                             "Inhibit",
++                                             g_variant_new ("(ssss)",
++                                                            "handle-power-key:handle-suspend-key:handle-hibernate-key",
++                                                            g_get_user_name (),
++                                                            "GNOME handling keypresses",
++                                                            "block"),
++                                             0,
++                                             G_MAXINT,
++                                             NULL,
++                                             NULL,
++                                             inhibit_done,
++                                             manager);
++
+ }
+ 
+ static void
+@@ -2382,6 +2493,8 @@ gsd_media_keys_manager_finalize (GObject *object)
+ 
+         if (media_keys_manager->priv->start_idle_id != 0)
+                 g_source_remove (media_keys_manager->priv->start_idle_id);
++        if (media_keys_manager->priv->inhibit_keys_fd != -1)
++                close (media_keys_manager->priv->inhibit_keys_fd);
+ 
+         G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->finalize (object);
+ }
+@@ -2401,21 +2514,6 @@ xrandr_ready_cb (GObject             *source_object,
+ }
+ 
+ static void
+-upower_ready_cb (GObject             *source_object,
+-                 GAsyncResult        *res,
+-                 GsdMediaKeysManager *manager)
+-{
+-        GError *error = NULL;
+-
+-        manager->priv->upower_proxy = g_dbus_proxy_new_finish (res, &error);
+-        if (manager->priv->upower_proxy == NULL) {
+-                g_warning ("Failed to get proxy for upower: %s",
+-                           error->message);
+-                g_error_free (error);
+-        }
+-}
+-
+-static void
+ power_screen_ready_cb (GObject             *source_object,
+                        GAsyncResult        *res,
+                        GsdMediaKeysManager *manager)
+@@ -2517,16 +2615,6 @@ register_manager (GsdMediaKeysManager *manager)
+                    manager->priv->bus_cancellable,
+                    (GAsyncReadyCallback) on_bus_gotten,
+                    manager);
+-
+-        g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
+-                                  G_DBUS_PROXY_FLAGS_NONE,
+-                                  NULL,
+-                                  "org.freedesktop.UPower",
+-                                  "/org/freedesktop/UPower",
+-                                  "org.freedesktop.UPower",
+-                                  NULL,
+-                                  (GAsyncReadyCallback) upower_ready_cb,
+-                                  manager);
+ }
+ 
+ GsdMediaKeysManager *
+diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
+index 1c594d8..bb7224c 100644
+--- a/plugins/power/gsd-power-manager.c
++++ b/plugins/power/gsd-power-manager.c
+@@ -1,7 +1,7 @@
+ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+  *
+  * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
+- * Copyright (C) 2011 Richard Hughes <richard@hughsie.com>
++ * Copyright (C) 2011-2012 Richard Hughes <richard@hughsie.com>
+  * Copyright (C) 2011 Ritesh Khadgaray <khadgaray@gmail.com>
+  *
+  * This program is free software; you can redistribute it and/or modify
+@@ -32,6 +32,7 @@
+ #include <libupower-glib/upower.h>
+ #include <libnotify/notify.h>
+ #include <canberra-gtk.h>
++#include <gio/gunixfdlist.h>
+ 
+ #define GNOME_DESKTOP_USE_UNSTABLE_API
+ #include <libgnome-desktop/gnome-rr.h>
+@@ -43,7 +44,6 @@
+ #include "gnome-settings-session.h"
+ #include "gsd-enums.h"
+ #include "gsd-power-manager.h"
+-#include "gsd-power-helper.h"
+ 
+ #define GNOME_SESSION_DBUS_NAME                 "org.gnome.SessionManager"
+ #define GNOME_SESSION_DBUS_PATH                 "/org/gnome/SessionManager"
+@@ -78,6 +78,10 @@
+ #define GSD_POWER_MANAGER_RECALL_DELAY                  30 /* seconds */
+ #define GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT      30 /* seconds */
+ 
++#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
++#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
++#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
++
+ /* Keep this in sync with gnome-shell */
+ #define SCREENSAVER_FADE_TIME                           10 /* seconds */
+ 
+@@ -193,15 +197,21 @@ struct GsdPowerManagerPrivate
+         ca_context              *canberra_context;
+         ca_proplist             *critical_alert_loop_props;
+         guint32                  critical_alert_timeout_id;
+-        GDBusProxy              *screensaver_proxy;
+         GDBusProxy              *session_proxy;
+         GDBusProxy              *session_presence_proxy;
+         GpmIdletime             *idletime;
+         GsdPowerIdleMode         current_idle_mode;
+-        guint                    lid_close_safety_timer_id;
+         GtkStatusIcon           *status_icon;
+         guint                    xscreensaver_watchdog_timer_id;
+         gboolean                 is_virtual_machine;
++
++        /* systemd stuff */
++        GDBusProxy              *logind_proxy;
++        gint                     inhibit_lid_switch_fd;
++        gboolean                 inhibit_lid_switch_taken;
++        gint                     inhibit_suspend_fd;
++        gboolean                 inhibit_suspend_taken;
++        guint                    inhibit_lid_switch_timer_id;
+ };
+ 
+ enum {
+@@ -218,8 +228,8 @@ static GIcon    *engine_get_icon (GsdPowerManager *manager);
+ static gchar    *engine_get_summary (GsdPowerManager *manager);
+ static void      do_power_action_type (GsdPowerManager *manager, GsdPowerActionType action_type);
+ static void      do_lid_closed_action (GsdPowerManager *manager);
+-static void      lock_screensaver (GsdPowerManager *manager);
+-static void      kill_lid_close_safety_timer (GsdPowerManager *manager);
++static void      uninhibit_lid_switch (GsdPowerManager *manager);
++static gboolean  external_monitor_is_connected (GnomeRRScreen *screen);
+ 
+ G_DEFINE_TYPE (GsdPowerManager, gsd_power_manager, G_TYPE_OBJECT)
+ 
+@@ -2049,6 +2059,57 @@ gnome_session_shutdown (void)
+ }
+ 
+ static void
++action_poweroff (GsdPowerManager *manager)
++{
++        if (manager->priv->logind_proxy == NULL) {
++                g_warning ("no systemd support");
++                return;
++        }
++        g_dbus_proxy_call (manager->priv->logind_proxy,
++                           "PowerOff",
++                           g_variant_new ("(b)", FALSE),
++                           G_DBUS_CALL_FLAGS_NONE,
++                           G_MAXINT,
++                           NULL,
++                           NULL,
++                           NULL);
++}
++
++static void
++action_suspend (GsdPowerManager *manager)
++{
++        if (manager->priv->logind_proxy == NULL) {
++                g_warning ("no systemd support");
++                return;
++        }
++        g_dbus_proxy_call (manager->priv->logind_proxy,
++                           "Suspend",
++                           g_variant_new ("(b)", FALSE),
++                           G_DBUS_CALL_FLAGS_NONE,
++                           G_MAXINT,
++                           NULL,
++                           NULL,
++                           NULL);
++}
++
++static void
++action_hibernate (GsdPowerManager *manager)
++{
++        if (manager->priv->logind_proxy == NULL) {
++                g_warning ("no systemd support");
++                return;
++        }
++        g_dbus_proxy_call (manager->priv->logind_proxy,
++                           "Hibernate",
++                           g_variant_new ("(b)", FALSE),
++                           G_DBUS_CALL_FLAGS_NONE,
++                           G_MAXINT,
++                           NULL,
++                           NULL,
++                           NULL);
++}
++
++static void
+ do_power_action_type (GsdPowerManager *manager,
+                       GsdPowerActionType action_type)
+ {
+@@ -2057,19 +2118,19 @@ do_power_action_type (GsdPowerManager *manager,
+ 
+         switch (action_type) {
+         case GSD_POWER_ACTION_SUSPEND:
+-                gsd_power_suspend (manager->priv->upower_proxy);
++                action_suspend (manager);
+                 break;
+         case GSD_POWER_ACTION_INTERACTIVE:
+                 gnome_session_shutdown ();
+                 break;
+         case GSD_POWER_ACTION_HIBERNATE:
+-                gsd_power_hibernate (manager->priv->upower_proxy);
++                action_hibernate (manager);
+                 break;
+         case GSD_POWER_ACTION_SHUTDOWN:
+                 /* this is only used on critically low battery where
+                  * hibernate is not available and is marginally better
+                  * than just powering down the computer mid-write */
+-                gsd_power_poweroff ();
++                action_poweroff (manager);
+                 break;
+         case GSD_POWER_ACTION_BLANK:
+                 ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
+@@ -2141,85 +2202,20 @@ upower_kbd_toggle (GsdPowerManager *manager,
+         return ret;
+ }
+ 
+-static void
+-do_lid_open_action (GsdPowerManager *manager)
+-{
+-        gboolean ret;
+-        GError *error = NULL;
+-
+-        /* play a sound, using sounds from the naming spec */
+-        ca_context_play (manager->priv->canberra_context, 0,
+-                         CA_PROP_EVENT_ID, "lid-open",
+-                         /* TRANSLATORS: this is the sound description */
+-                         CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"),
+-                         NULL);
+-
+-        /* ensure we turn the panel back on after lid open */
+-        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
+-                                             GNOME_RR_DPMS_ON,
+-                                             &error);
+-        if (!ret) {
+-                g_warning ("failed to turn the panel on after lid open: %s",
+-                           error->message);
+-                g_clear_error (&error);
+-        }
+-
+-        /* only toggle keyboard if present and already toggled off */
+-        if (manager->priv->upower_kdb_proxy != NULL &&
+-            manager->priv->kbd_brightness_old != -1) {
+-                ret = upower_kbd_toggle (manager, &error);
+-                if (!ret) {
+-                        g_warning ("failed to turn the kbd backlight on: %s",
+-                                   error->message);
+-                        g_error_free (error);
+-                }
+-        }
+-
+-        kill_lid_close_safety_timer (manager);
+-}
+-
+ static gboolean
+-is_on (GnomeRROutput *output)
++inhibit_lid_switch_timer_cb (GsdPowerManager *manager)
+ {
+-	GnomeRRCrtc *crtc;
+-
+-	crtc = gnome_rr_output_get_crtc (output);
+-	if (!crtc)
+-		return FALSE;
+-	return gnome_rr_crtc_get_current_mode (crtc) != NULL;
+-}
+-
+-static gboolean
+-non_laptop_outputs_are_all_off (GnomeRRScreen *screen)
+-{
+-        GnomeRROutput **outputs;
+-        int i;
+-
+-        outputs = gnome_rr_screen_list_outputs (screen);
+-        for (i = 0; outputs[i] != NULL; i++) {
+-                if (gnome_rr_output_is_laptop (outputs[i]))
+-                        continue;
+-
+-                if (is_on (outputs[i]))
+-                        return FALSE;
++        if (!external_monitor_is_connected (manager->priv->x11_screen) ||
++            g_settings_get_boolean (manager->priv->settings,
++                                    "lid-close-suspend-with-external-monitor")) {
++                g_debug ("no external monitors for a while; uninhibiting lid close");
++                uninhibit_lid_switch (manager);
++                manager->priv->inhibit_lid_switch_timer_id = 0;
++                return G_SOURCE_REMOVE;
+         }
+ 
+-        return TRUE;
+-}
+-
+-/* Timeout callback used to check conditions when the laptop's lid is closed but
+- * the machine is not suspended yet.  We try to suspend again, so that the laptop
+- * won't overheat if placed in a backpack.
+- */
+-static gboolean
+-lid_close_safety_timer_cb (GsdPowerManager *manager)
+-{
+-        manager->priv->lid_close_safety_timer_id = 0;
+-
+-        g_debug ("lid has been closed for a while; trying to suspend again");
+-        do_lid_closed_action (manager);
+-
+-        return FALSE;
++        g_debug ("external monitor still there; trying again later");
++        return G_SOURCE_CONTINUE;
+ }
+ 
+ /* Sets up a timer to be triggered some seconds after closing the laptop lid
+@@ -2227,82 +2223,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager)
+  * again in the timeout handler to see if we can suspend then.
+  */
+ static void
+-setup_lid_close_safety_timer (GsdPowerManager *manager)
++setup_inhibit_lid_switch_timer (GsdPowerManager *manager)
+ {
+-        if (manager->priv->lid_close_safety_timer_id != 0)
++        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
++                g_debug ("lid close safety timer already set up");
+                 return;
++        }
++
++        g_debug ("setting up lid close safety timer");
+ 
+-        manager->priv->lid_close_safety_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT,
+-                                                                          (GSourceFunc) lid_close_safety_timer_cb,
++        manager->priv->inhibit_lid_switch_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT,
++                                                                          (GSourceFunc) inhibit_lid_switch_timer_cb,
+                                                                           manager);
+-        g_source_set_name_by_id (manager->priv->lid_close_safety_timer_id, "[GsdPowerManager] lid close safety timer");
++        g_source_set_name_by_id (manager->priv->inhibit_lid_switch_timer_id, "[GsdPowerManager] lid close safety timer");
+ }
+ 
+ static void
+-kill_lid_close_safety_timer (GsdPowerManager *manager)
++restart_inhibit_lid_switch_timer (GsdPowerManager *manager)
+ {
+-        if (manager->priv->lid_close_safety_timer_id != 0) {
+-                g_source_remove (manager->priv->lid_close_safety_timer_id);
+-                manager->priv->lid_close_safety_timer_id = 0;
++        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
++                g_debug ("restarting lid close safety timer");
++                g_source_remove (manager->priv->inhibit_lid_switch_timer_id);
++                manager->priv->inhibit_lid_switch_timer_id = 0;
++                setup_inhibit_lid_switch_timer (manager);
+         }
+ }
+ 
+ static void
+-suspend_with_lid_closed (GsdPowerManager *manager)
++do_lid_open_action (GsdPowerManager *manager)
+ {
+         gboolean ret;
+         GError *error = NULL;
+-        GsdPowerActionType action_type;
+ 
+-        /* maybe lock the screen if the lid is closed */
+-        lock_screensaver (manager);
+-
+-        /* we have different settings depending on AC state */
+-        if (up_client_get_on_battery (manager->priv->up_client)) {
+-                action_type = g_settings_get_enum (manager->priv->settings,
+-                                                   "lid-close-battery-action");
+-        } else {
+-                action_type = g_settings_get_enum (manager->priv->settings,
+-                                                   "lid-close-ac-action");
+-        }
+-
+-        /* check we won't melt when the lid is closed */
+-        if (action_type != GSD_POWER_ACTION_SUSPEND &&
+-            action_type != GSD_POWER_ACTION_HIBERNATE) {
+-                if (up_client_get_lid_force_sleep (manager->priv->up_client)) {
+-                        g_warning ("to prevent damage, now forcing suspend");
+-                        do_power_action_type (manager, GSD_POWER_ACTION_SUSPEND);
+-                        return;
+-                }
+-        }
++        /* play a sound, using sounds from the naming spec */
++        ca_context_play (manager->priv->canberra_context, 0,
++                         CA_PROP_EVENT_ID, "lid-open",
++                         /* TRANSLATORS: this is the sound description */
++                         CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"),
++                         NULL);
+ 
+-        /* ensure we turn the panel back on after resume */
++        /* ensure we turn the panel back on after lid open */
+         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
+-                                             GNOME_RR_DPMS_OFF,
++                                             GNOME_RR_DPMS_ON,
+                                              &error);
+         if (!ret) {
+-                g_warning ("failed to turn the panel off after lid close: %s",
++                g_warning ("failed to turn the panel on after lid open: %s",
+                            error->message);
+                 g_clear_error (&error);
+         }
+ 
+-        /* only toggle keyboard if present and not already toggled */
+-        if (manager->priv->upower_kdb_proxy &&
+-            manager->priv->kbd_brightness_old == -1) {
++        /* only toggle keyboard if present and already toggled off */
++        if (manager->priv->upower_kdb_proxy != NULL &&
++            manager->priv->kbd_brightness_old != -1) {
+                 ret = upower_kbd_toggle (manager, &error);
+                 if (!ret) {
+-                        g_warning ("failed to turn the kbd backlight off: %s",
++                        g_warning ("failed to turn the kbd backlight on: %s",
+                                    error->message);
+                         g_error_free (error);
+                 }
+         }
+-
+-        do_power_action_type (manager, action_type);
+ }
+ 
+ static void
+ do_lid_closed_action (GsdPowerManager *manager)
+ {
++        gboolean ret;
++        GError *error = NULL;
++
+         /* play a sound, using sounds from the naming spec */
+         ca_context_play (manager->priv->canberra_context, 0,
+                          CA_PROP_EVENT_ID, "lid-close",
+@@ -2310,21 +2297,22 @@ do_lid_closed_action (GsdPowerManager *manager)
+                          CA_PROP_EVENT_DESCRIPTION, _("Lid has been closed"),
+                          NULL);
+ 
++        /* turn the panel off if the lid is closed (mainly for Dells...) */
++        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
++                                             GNOME_RR_DPMS_OFF,
++                                             &error);
++        if (!ret) {
++                g_warning ("failed to turn the panel off after lid close: %s",
++                           error->message);
++                g_error_free (error);
++        }
++
+         /* refresh RANDR so we get an accurate view of what monitors are plugged in when the lid is closed */
+         gnome_rr_screen_refresh (manager->priv->x11_screen, NULL); /* NULL-GError */
+ 
+-        /* perform policy action */
+-        if (g_settings_get_boolean (manager->priv->settings, "lid-close-suspend-with-external-monitor")
+-            || non_laptop_outputs_are_all_off (manager->priv->x11_screen)) {
+-                g_debug ("lid is closed; suspending or hibernating");
+-                suspend_with_lid_closed (manager);
+-        } else {
+-                g_debug ("lid is closed; not suspending nor hibernating since some external monitor outputs are still active");
+-                setup_lid_close_safety_timer (manager);
+-        }
++        restart_inhibit_lid_switch_timer (manager);
+ }
+ 
+-
+ static void
+ up_client_changed_cb (UpClient *client, GsdPowerManager *manager)
+ {
+@@ -2344,6 +2332,7 @@ up_client_changed_cb (UpClient *client, GsdPowerManager *manager)
+         if (manager->priv->lid_is_closed == tmp)
+                 return;
+         manager->priv->lid_is_closed = tmp;
++        g_debug ("up changed: lid is now %s", tmp ? "closed" : "open");
+ 
+         /* fake a keypress */
+         if (tmp)
+@@ -3302,30 +3291,6 @@ gsd_power_manager_class_init (GsdPowerManagerClass *klass)
+ }
+ 
+ static void
+-sleep_cb_screensaver_proxy_ready_cb (GObject *source_object,
+-                            GAsyncResult *res,
+-                            gpointer user_data)
+-{
+-        GError *error = NULL;
+-        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
+-
+-        manager->priv->screensaver_proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
+-        if (manager->priv->screensaver_proxy == NULL) {
+-                g_warning ("Could not connect to gnome-screensaver: %s",
+-                           error->message);
+-                g_error_free (error);
+-                return;
+-        }
+-
+-        /* Finish the upower_notify_sleep_cb() call by locking the screen */
+-        g_debug ("gnome-screensaver activated, doing gnome-screensaver lock");
+-        g_dbus_proxy_call (manager->priv->screensaver_proxy,
+-                           "Lock",
+-                           NULL, G_DBUS_CALL_FLAGS_NONE, -1,
+-                           NULL, NULL, NULL);
+-}
+-
+-static void
+ idle_dbus_signal_cb (GDBusProxy *proxy,
+                      const gchar *sender_name,
+                      const gchar *signal_name,
+@@ -3477,75 +3442,38 @@ out:
+ }
+ 
+ static void
+-lock_screensaver (GsdPowerManager *manager)
++lock_screensaver (GsdPowerManager *manager,
++                  GSourceFunc      done_cb)
+ {
+         gboolean do_lock;
+ 
+         do_lock = g_settings_get_boolean (manager->priv->settings_screensaver,
+                                           "lock-enabled");
+-        if (!do_lock)
++        if (!do_lock && done_cb) {
++                done_cb (manager);
+                 return;
+-
+-        if (manager->priv->screensaver_proxy != NULL) {
+-                g_debug ("doing gnome-screensaver lock");
+-                g_dbus_proxy_call (manager->priv->screensaver_proxy,
+-                                   "Lock",
+-                                   NULL, G_DBUS_CALL_FLAGS_NONE, -1,
+-                                   NULL, NULL, NULL);
+-        } else {
+-                /* connect to the screensaver first */
+-                g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
+-                                          G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+-                                          NULL,
+-                                          GS_DBUS_NAME,
+-                                          GS_DBUS_PATH,
+-                                          GS_DBUS_INTERFACE,
+-                                          NULL,
+-                                          sleep_cb_screensaver_proxy_ready_cb,
+-                                          manager);
+-        }
+-}
+-
+-static void
+-upower_notify_sleep_cb (UpClient *client,
+-                        UpSleepKind sleep_kind,
+-                        GsdPowerManager *manager)
+-{
+-        lock_screensaver (manager);
+-}
+-
+-static void
+-upower_notify_resume_cb (UpClient *client,
+-                         UpSleepKind sleep_kind,
+-                         GsdPowerManager *manager)
+-{
+-        gboolean ret;
+-        GError *error = NULL;
+-
+-        /* this displays the unlock dialogue so the user doesn't have
+-         * to move the mouse or press any key before the window comes up */
+-        if (manager->priv->screensaver_proxy != NULL) {
+-                g_dbus_proxy_call (manager->priv->screensaver_proxy,
+-                                   "SimulateUserActivity",
+-                                   NULL,
+-                                   G_DBUS_CALL_FLAGS_NONE,
+-                                   -1, NULL, NULL, NULL);
+         }
+ 
+-        /* close existing notifications on resume, the system power
+-         * state is probably different now */
+-        notify_close_if_showing (manager->priv->notification_low);
+-        notify_close_if_showing (manager->priv->notification_discharging);
+-
+-        /* ensure we turn the panel back on after resume */
+-        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
+-                                             GNOME_RR_DPMS_ON,
+-                                             &error);
+-        if (!ret) {
+-                g_warning ("failed to turn the panel on after resume: %s",
+-                           error->message);
+-                g_error_free (error);
+-        }
++        g_dbus_connection_call (manager->priv->connection,
++                                GS_DBUS_NAME,
++                                GS_DBUS_PATH,
++                                GS_DBUS_INTERFACE,
++                                "Lock",
++                                NULL, NULL,
++                                G_DBUS_CALL_FLAGS_NONE, -1,
++                                NULL, NULL, NULL);
++
++        /* Wait until gnome-shell shield animation is done
++         *
++         * FIXME: the shell should mark the lock as active
++         * when the shield is down, then we could wait for
++         * that. This would also fix the problem that we wait
++         * needlessly when the shell has already locked the
++         * screen because it is initiating the suspend.
++         *
++         * https://bugzilla.gnome.org/show_bug.cgi?id=685053
++         */
++        g_timeout_add (500, done_cb, manager);
+ }
+ 
+ static void
+@@ -3755,6 +3683,287 @@ out:
+         return ret;
+ }
+ 
++static void
++inhibit_lid_switch_done (GObject      *source,
++                         GAsyncResult *result,
++                         gpointer      user_data)
++{
++        GDBusProxy *proxy = G_DBUS_PROXY (source);
++        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
++        GError *error = NULL;
++        GVariant *res;
++        GUnixFDList *fd_list = NULL;
++        gint idx;
++
++        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
++        if (res == NULL) {
++                g_warning ("Unable to inhibit lid switch: %s", error->message);
++                g_error_free (error);
++        } else {
++                g_variant_get (res, "(h)", &idx);
++                manager->priv->inhibit_lid_switch_fd = g_unix_fd_list_get (fd_list, idx, &error);
++                if (manager->priv->inhibit_lid_switch_fd == -1) {
++                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
++                        g_error_free (error);
++                }
++                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_lid_switch_fd);
++                g_object_unref (fd_list);
++                g_variant_unref (res);
++        }
++}
++
++static void
++inhibit_lid_switch (GsdPowerManager *manager)
++{
++        GVariant *params;
++
++        if (manager->priv->inhibit_lid_switch_taken) {
++                g_debug ("already inhibited lid-switch");
++                return;
++        }
++        g_debug ("Adding lid switch system inhibitor");
++        manager->priv->inhibit_lid_switch_taken = TRUE;
++
++        params = g_variant_new ("(ssss)",
++                                "handle-lid-switch",
++                                g_get_user_name (),
++                                "Multiple displays attached",
++                                "block");
++        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
++                                             "Inhibit",
++                                             params,
++                                             0,
++                                             G_MAXINT,
++                                             NULL,
++                                             NULL,
++                                             inhibit_lid_switch_done,
++                                             manager);
++}
++
++static void
++uninhibit_lid_switch (GsdPowerManager *manager)
++{
++        if (manager->priv->inhibit_lid_switch_fd == -1) {
++                g_debug ("no lid-switch inhibitor");
++                return;
++        }
++        g_debug ("Removing lid switch system inhibitor");
++        close (manager->priv->inhibit_lid_switch_fd);
++        manager->priv->inhibit_lid_switch_fd = -1;
++        manager->priv->inhibit_lid_switch_taken = FALSE;
++}
++
++static void
++inhibit_suspend_done (GObject      *source,
++                      GAsyncResult *result,
++                      gpointer      user_data)
++{
++        GDBusProxy *proxy = G_DBUS_PROXY (source);
++        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
++        GError *error = NULL;
++        GVariant *res;
++        GUnixFDList *fd_list = NULL;
++        gint idx;
++
++        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
++        if (res == NULL) {
++                g_warning ("Unable to inhibit suspend: %s", error->message);
++                g_error_free (error);
++        } else {
++                g_variant_get (res, "(h)", &idx);
++                manager->priv->inhibit_suspend_fd = g_unix_fd_list_get (fd_list, idx, &error);
++                if (manager->priv->inhibit_suspend_fd == -1) {
++                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
++                        g_error_free (error);
++                }
++                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_suspend_fd);
++                g_object_unref (fd_list);
++                g_variant_unref (res);
++        }
++}
++
++/* We take a delay inhibitor here, which causes logind to send a
++ * PrepareToSleep signal, which gives us a chance to lock the screen
++ * and do some other preparations.
++ */
++static void
++inhibit_suspend (GsdPowerManager *manager)
++{
++        if (manager->priv->inhibit_suspend_taken) {
++                g_debug ("already inhibited lid-switch");
++                return;
++        }
++        g_debug ("Adding suspend delay inhibitor");
++        manager->priv->inhibit_suspend_taken = TRUE;
++        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
++                                             "Inhibit",
++                                             g_variant_new ("(ssss)",
++                                                            "sleep",
++                                                            g_get_user_name (),
++                                                            "GNOME needs to lock the screen",
++                                                            "delay"),
++                                             0,
++                                             G_MAXINT,
++                                             NULL,
++                                             NULL,
++                                             inhibit_suspend_done,
++                                             manager);
++}
++
++static void
++uninhibit_suspend (GsdPowerManager *manager)
++{
++        if (manager->priv->inhibit_suspend_fd == -1) {
++                g_debug ("no suspend delay inhibitor");
++                return;
++        }
++        g_debug ("Removing suspend delay inhibitor");
++        close (manager->priv->inhibit_suspend_fd);
++        manager->priv->inhibit_suspend_fd = -1;
++        manager->priv->inhibit_suspend_taken = FALSE;
++}
++
++static gboolean
++randr_output_is_on (GnomeRROutput *output)
++{
++	GnomeRRCrtc *crtc;
++
++	crtc = gnome_rr_output_get_crtc (output);
++	if (!crtc)
++		return FALSE;
++	return gnome_rr_crtc_get_current_mode (crtc) != NULL;
++}
++
++static gboolean
++external_monitor_is_connected (GnomeRRScreen *screen)
++{
++        GnomeRROutput **outputs;
++        guint i;
++
++        if (g_file_test ("/tmp/external_connected", G_FILE_TEST_EXISTS))
++                return TRUE;
++
++        /* see if we have more than one screen plugged in */
++        outputs = gnome_rr_screen_list_outputs (screen);
++        for (i = 0; outputs[i] != NULL; i++) {
++                if (randr_output_is_on (outputs[i]) &&
++                    !gnome_rr_output_is_laptop (outputs[i]))
++                        return TRUE;
++        }
++
++        return FALSE;
++}
++
++static void
++on_randr_event (GnomeRRScreen *screen, gpointer user_data)
++{
++        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
++
++        /* when a second monitor is plugged in, we take the
++         * handle-lid-switch inhibitor lock of logind to prevent
++         * it from suspending.
++         *
++         * Uninhibiting is done in the inhibit_lid_switch_timer,
++         * since we want to give users a few seconds when unplugging
++         * and replugging an external monitor, not suspend right away.
++         */
++        if (external_monitor_is_connected (screen) &&
++            !g_settings_get_boolean (manager->priv->settings,
++                                     "lid-close-suspend-with-external-monitor")) {
++                inhibit_lid_switch (manager);
++                setup_inhibit_lid_switch_timer (manager);
++        }
++        else {
++                restart_inhibit_lid_switch_timer (manager);
++        }
++}
++
++static gboolean
++screen_lock_done_cb (gpointer data)
++{
++        GsdPowerManager *manager = data;
++
++        /* lift the delay inhibit, so logind can proceed */
++        uninhibit_suspend (manager);
++
++        return FALSE;
++}
++
++static void
++handle_suspend_actions (GsdPowerManager *manager)
++{
++        gboolean ret;
++        GError *error = NULL;
++
++        /* ensure we turn the panel back on after resume */
++        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
++                                             GNOME_RR_DPMS_ON,
++                                             &error);
++        if (!ret) {
++                g_warning ("failed to turn the panel on after resume: %s",
++                           error->message);
++                g_error_free (error);
++        }
++
++        lock_screensaver (manager, screen_lock_done_cb);
++}
++
++static void
++handle_resume_actions (GsdPowerManager *manager)
++{
++        gboolean ret;
++        GError *error = NULL;
++
++        /* this displays the unlock dialogue so the user doesn't have
++         * to move the mouse or press any key before the window comes up */
++        g_dbus_connection_call (manager->priv->connection,
++                                GS_DBUS_NAME,
++                                GS_DBUS_PATH,
++                                GS_DBUS_INTERFACE,
++                                "SimulateUserActivity",
++                                NULL, NULL,
++                                G_DBUS_CALL_FLAGS_NONE, -1,
++                                NULL, NULL, NULL);
++
++        /* close existing notifications on resume, the system power
++         * state is probably different now */
++        notify_close_if_showing (manager->priv->notification_low);
++        notify_close_if_showing (manager->priv->notification_discharging);
++
++        /* ensure we turn the panel back on after resume */
++        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
++                                             GNOME_RR_DPMS_ON,
++                                             &error);
++        if (!ret) {
++                g_warning ("failed to turn the panel on after resume: %s",
++                           error->message);
++                g_error_free (error);
++        }
++
++        /* set up the delay again */
++        inhibit_suspend (manager);
++}
++
++static void
++logind_proxy_signal_cb (GDBusProxy  *proxy,
++                        const gchar *sender_name,
++                        const gchar *signal_name,
++                        GVariant    *parameters,
++                        gpointer     user_data)
++{
++        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
++        gboolean is_about_to_suspend;
++
++        if (g_strcmp0 (signal_name, "PrepareForSleep") != 0)
++                return;
++        g_variant_get (parameters, "(b)", &is_about_to_suspend);
++        if (is_about_to_suspend) {
++                handle_suspend_actions (manager);
++        } else {
++                handle_resume_actions (manager);
++        }
++}
++
+ gboolean
+ gsd_power_manager_start (GsdPowerManager *manager,
+                          GError **error)
+@@ -3764,6 +3973,25 @@ gsd_power_manager_start (GsdPowerManager *manager,
+         g_debug ("Starting power manager");
+         gnome_settings_profile_start (NULL);
+ 
++        manager->priv->logind_proxy =
++                g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
++                                               0,
++                                               NULL,
++                                               SYSTEMD_DBUS_NAME,
++                                               SYSTEMD_DBUS_PATH,
++                                               SYSTEMD_DBUS_INTERFACE,
++                                               NULL,
++                                               error);
++        if (manager->priv->logind_proxy == NULL) {
++                g_warning ("no systemd support");
++                return FALSE;
++        }
++        g_signal_connect (manager->priv->logind_proxy, "g-signal",
++                          G_CALLBACK (logind_proxy_signal_cb),
++                          manager);
++        /* Set up a delay inhibitor to be informed about suspend attempts */
++        inhibit_suspend (manager);
++
+         /* track the active session */
+         manager->priv->session = gnome_settings_session_new ();
+         g_signal_connect (manager->priv->session, "notify::state",
+@@ -3778,10 +4006,6 @@ gsd_power_manager_start (GsdPowerManager *manager,
+                           G_CALLBACK (engine_settings_key_changed_cb), manager);
+         manager->priv->settings_screensaver = g_settings_new ("org.gnome.desktop.screensaver");
+         manager->priv->up_client = up_client_new ();
+-        g_signal_connect (manager->priv->up_client, "notify-sleep",
+-                          G_CALLBACK (upower_notify_sleep_cb), manager);
+-        g_signal_connect (manager->priv->up_client, "notify-resume",
+-                          G_CALLBACK (upower_notify_resume_cb), manager);
+         manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client);
+         g_signal_connect (manager->priv->up_client, "device-added",
+                           G_CALLBACK (engine_device_added_cb), manager);
+@@ -3895,6 +4119,9 @@ gsd_power_manager_start (GsdPowerManager *manager,
+         manager->priv->x11_screen = gnome_rr_screen_new (gdk_screen_get_default (), error);
+         if (manager->priv->x11_screen == NULL)
+                 return FALSE;
++        g_signal_connect (manager->priv->x11_screen, "changed", G_CALLBACK (on_randr_event), manager);
++        /* set up initial state */
++        on_randr_event (manager->priv->x11_screen, manager);
+ 
+         /* ensure the default dpms timeouts are cleared */
+         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
+@@ -3927,6 +4154,11 @@ gsd_power_manager_stop (GsdPowerManager *manager)
+ {
+         g_debug ("Stopping power manager");
+ 
++        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
++                g_source_remove (manager->priv->inhibit_lid_switch_timer_id);
++                manager->priv->inhibit_lid_switch_timer_id = 0;
++        }
++
+         if (manager->priv->bus_cancellable != NULL) {
+                 g_cancellable_cancel (manager->priv->bus_cancellable);
+                 g_object_unref (manager->priv->bus_cancellable);
+@@ -3938,8 +4170,6 @@ gsd_power_manager_stop (GsdPowerManager *manager)
+                 manager->priv->introspection_data = NULL;
+         }
+ 
+-        kill_lid_close_safety_timer (manager);
+-
+         g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager);
+ 
+         g_clear_object (&manager->priv->connection);
+@@ -3947,6 +4177,19 @@ gsd_power_manager_stop (GsdPowerManager *manager)
+         g_clear_object (&manager->priv->settings);
+         g_clear_object (&manager->priv->settings_screensaver);
+         g_clear_object (&manager->priv->up_client);
++
++        if (manager->priv->inhibit_lid_switch_fd != -1) {
++                close (manager->priv->inhibit_lid_switch_fd);
++                manager->priv->inhibit_lid_switch_fd = -1;
++                manager->priv->inhibit_lid_switch_taken = FALSE;
++        }
++        if (manager->priv->inhibit_suspend_fd != -1) {
++                close (manager->priv->inhibit_suspend_fd);
++                manager->priv->inhibit_suspend_fd = -1;
++                manager->priv->inhibit_suspend_taken = FALSE;
++        }
++
++        g_clear_object (&manager->priv->logind_proxy);
+         g_clear_object (&manager->priv->x11_screen);
+ 
+         g_ptr_array_unref (manager->priv->devices_array);
+@@ -3980,6 +4223,8 @@ static void
+ gsd_power_manager_init (GsdPowerManager *manager)
+ {
+         manager->priv = GSD_POWER_MANAGER_GET_PRIVATE (manager);
++        manager->priv->inhibit_lid_switch_fd = -1;
++        manager->priv->inhibit_suspend_fd = -1;
+ }
+ 
+ static void
+-- 
+1.8.0
+
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index 062fc1d8e..6ee46d6b9 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,32 +1,36 @@
-# $Id: PKGBUILD 159086 2012-05-15 13:54:36Z ibiru $
+# $Id: PKGBUILD 170991 2012-11-14 14:29:35Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-settings-daemon
-pkgver=3.4.2
-pkgrel=1
+pkgver=3.6.3
+pkgrel=2
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('colord' 'dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libgnomekbd' 'libnotify'
+depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify'
          'libsystemd' 'libwacom' 'nss' 'pulseaudio' 'pulseaudio-alsa' 'upower')
-makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 'xf86-input-wacom')
+makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl')
 options=('!emptydirs' '!libtool')
 install=gnome-settings-daemon.install
 url="http://www.gnome.org"
 groups=('gnome')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        systemd-fallback.patch)
-sha256sums=('00499118c80474981f3389ef518e2d001f1b1a3b1fb78e54859d59f3bee38ff4'
-            '3af86d4b341d5ca7c94cc814b250b122309d38f48be0bf0581d0c77e763a8008')
+        0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch)
+sha256sums=('606aaaba9cc7f51035702aead46c8bb595917a09cb947b396a579ea443328cdc'
+            'c4aab9b45346fbae18808358346208f989cce8bf9c9eb753e2af7eca73715109')
 
 build() {
   cd $pkgname-$pkgver
 
-  patch -Np1 -i ../systemd-fallback.patch
+  # logind key handling FS#31801, patch from Fedora
+  # rebased onto screensaver.patch
+  patch -Np1 -i ../0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
+  aclocal
+  automake
 
-  gnome-autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \
-      --enable-systemd
+      --enable-systemd --disable-ibus
 
   #https://bugzilla.gnome.org/show_bug.cgi?id=656231
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
@@ -37,4 +41,9 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
+
+  # Plugins that aren't installed still have schema references
+  # and cause gsettings errors - remove the references we're not using
+  sed -i '/org\.gnome\.settings-daemon\.plugins\.updates/d' \
+    "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.gschema.xml"
 }
diff --git a/extra/gnome-settings-daemon/screensaver.patch b/extra/gnome-settings-daemon/screensaver.patch
new file mode 100644
index 000000000..bbcfe3430
--- /dev/null
+++ b/extra/gnome-settings-daemon/screensaver.patch
@@ -0,0 +1,145 @@
+From b47e4019a12ac84fba31e1c631d878ce03fa3808 Mon Sep 17 00:00:00 2001
+From: Rui Matos <tiagomatos@gmail.com>
+Date: Wed, 17 Oct 2012 22:44:54 +0000
+Subject: power: Add a watchdog to keep X's builtin screen saver disabled
+
+X's builtin screen saver may activate DPMS. Since we want to activate
+DPMS ourselves according to our own policy we must make sure that X's
+screen saver remains disabled.
+
+This code is a copy of the original found in gs-watcher-x11.c from
+gnome-screensaver which stopped being used in GNOME 3.6.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686339
+---
+diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
+index 0e06495..070cf32 100644
+--- a/plugins/power/gsd-power-manager.c
++++ b/plugins/power/gsd-power-manager.c
+@@ -27,6 +27,7 @@
+ #include <stdio.h>
+ #include <sys/wait.h>
+ #include <glib/gi18n.h>
++#include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
+ #include <libupower-glib/upower.h>
+ #include <libnotify/notify.h>
+@@ -80,6 +81,8 @@
+ /* Keep this in sync with gnome-shell */
+ #define SCREENSAVER_FADE_TIME                           10 /* seconds */
+ 
++#define XSCREENSAVER_WATCHDOG_TIMEOUT                   120 /* seconds */
++
+ enum {
+         GSD_POWER_IDLETIME_NULL_ID,
+         GSD_POWER_IDLETIME_DIM_ID,
+@@ -197,6 +200,7 @@ struct GsdPowerManagerPrivate
+         GsdPowerIdleMode         current_idle_mode;
+         guint                    lid_close_safety_timer_id;
+         GtkStatusIcon           *status_icon;
++        guint                    xscreensaver_watchdog_timer_id;
+ };
+ 
+ enum {
+@@ -3621,6 +3625,77 @@ engine_session_active_changed_cb (GnomeSettingsSession *session,
+         idle_set_mode (manager, GSD_POWER_IDLE_MODE_NORMAL);
+ }
+ 
++/* This timer goes off every few minutes, whether the user is idle or not,
++   to try and clean up anything that has gone wrong.
++
++   It calls disable_builtin_screensaver() so that if xset has been used,
++   or some other program (like xlock) has messed with the XSetScreenSaver()
++   settings, they will be set back to sensible values (if a server extension
++   is in use, messing with xlock can cause the screensaver to never get a wakeup
++   event, and could cause monitor power-saving to occur, and all manner of
++   heinousness.)
++
++   This code was originally part of gnome-screensaver, see
++   http://git.gnome.org/browse/gnome-screensaver/tree/src/gs-watcher-x11.c?id=fec00b12ec46c86334cfd36b37771cc4632f0d4d#n530
++ */
++static gboolean
++disable_builtin_screensaver (gpointer unused)
++{
++        int current_server_timeout, current_server_interval;
++        int current_prefer_blank,   current_allow_exp;
++        int desired_server_timeout, desired_server_interval;
++        int desired_prefer_blank,   desired_allow_exp;
++
++        XGetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
++                         &current_server_timeout,
++                         &current_server_interval,
++                         &current_prefer_blank,
++                         &current_allow_exp);
++
++        desired_server_timeout  = current_server_timeout;
++        desired_server_interval = current_server_interval;
++        desired_prefer_blank    = current_prefer_blank;
++        desired_allow_exp       = current_allow_exp;
++
++        desired_server_interval = 0;
++
++        /* I suspect (but am not sure) that DontAllowExposures might have
++           something to do with powering off the monitor as well, at least
++           on some systems that don't support XDPMS?  Who know... */
++        desired_allow_exp = AllowExposures;
++
++        /* When we're not using an extension, set the server-side timeout to 0,
++           so that the server never gets involved with screen blanking, and we
++           do it all ourselves.  (However, when we *are* using an extension,
++           we tell the server when to notify us, and rather than blanking the
++           screen, the server will send us an X event telling us to blank.)
++        */
++        desired_server_timeout = 0;
++
++        if (desired_server_timeout     != current_server_timeout
++            || desired_server_interval != current_server_interval
++            || desired_prefer_blank    != current_prefer_blank
++            || desired_allow_exp       != current_allow_exp) {
++
++                g_debug ("disabling server builtin screensaver:"
++                         " (xset s %d %d; xset s %s; xset s %s)",
++                         desired_server_timeout,
++                         desired_server_interval,
++                         (desired_prefer_blank ? "blank" : "noblank"),
++                         (desired_allow_exp ? "expose" : "noexpose"));
++
++                XSetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
++                                 desired_server_timeout,
++                                 desired_server_interval,
++                                 desired_prefer_blank,
++                                 desired_allow_exp);
++
++                XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
++        }
++
++        return TRUE;
++}
++
+ gboolean
+ gsd_power_manager_start (GsdPowerManager *manager,
+                          GError **error)
+@@ -3778,6 +3853,9 @@ gsd_power_manager_start (GsdPowerManager *manager,
+         /* set the initial dim time that can adapt for the user */
+         refresh_idle_dim_settings (manager);
+ 
++        manager->priv->xscreensaver_watchdog_timer_id = g_timeout_add_seconds (XSCREENSAVER_WATCHDOG_TIMEOUT,
++                                                                               disable_builtin_screensaver,
++                                                                               NULL);
+         gnome_settings_profile_end (NULL);
+         return TRUE;
+ }
+@@ -3829,6 +3907,11 @@ gsd_power_manager_stop (GsdPowerManager *manager)
+ 
+         g_clear_object (&manager->priv->idletime);
+         g_clear_object (&manager->priv->status_icon);
++
++        if (manager->priv->xscreensaver_watchdog_timer_id > 0) {
++                g_source_remove (manager->priv->xscreensaver_watchdog_timer_id);
++                manager->priv->xscreensaver_watchdog_timer_id = 0;
++        }
+ }
+ 
+ static void
+--
+cgit v0.9.0.2
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index f753620bb..73da1e385 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,28 +1,26 @@
-# $Id: PKGBUILD 163901 2012-07-21 19:28:49Z ibiru $
+# $Id: PKGBUILD 170877 2012-11-12 21:32:36Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
-pkgver=3.4.2
+pkgver=3.6.2
 pkgrel=1
 pkgdesc="The next generation GNOME Shell"
-arch=('i686' 'x86_64' 'mips64el')
+arch=(i686 x86_64 mips64el)
 url="http://live.gnome.org/GnomeShell"
-license=('GPL2')
-depends=('caribou' 'folks' 'gcr' 'gjs' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libcroco' 'libpulse' 'mutter' 'nautilus' 'networkmanager' 'telepathy-logger' 'telepathy-mission-control' 'unzip')
-makedepends=('intltool' 'gnome-doc-utils')
+license=(GPL2)
+depends=(caribou folks gcr gjs gnome-bluetooth gnome-desktop gnome-menus libcroco libpulse mutter
+         nautilus networkmanager telepathy-logger telepathy-mission-control unzip gdm)
+makedepends=(intltool gnome-doc-utils docbook-xsl)
 optdepends=('network-manager-applet: shell integration for networkmanager')
 options=('!libtool' '!emptydirs')
 install=gnome-shell.install
 groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        recorder.patch)
-sha256sums=('3807f7882968d032f8f5c64b0e0af51c0d016f2e1c4fd1576203c9350e412720'
-            'b00589e867c0ae63b47982145cb4ab366afec84a568e66867f51fa8da13027f1')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('86cff93ade1bf6a67ebd339c017d567c7dc849ff8b256a3803306f44c24b44f0')
 
 build() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../recorder.patch
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-shell \
       --localstatedir=/var --disable-static \
diff --git a/extra/gnome-system-log/PKGBUILD b/extra/gnome-system-log/PKGBUILD
index b42f3d9c3..a952afe35 100644
--- a/extra/gnome-system-log/PKGBUILD
+++ b/extra/gnome-system-log/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 156851 2012-04-23 09:07:33Z ibiru $
+# $Id: PKGBUILD 170903 2012-11-12 22:38:11Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-system-log
-pkgver=3.4.1
-pkgrel=1.1
+pkgver=3.6.1
+pkgrel=1
 pkgdesc="View your system logs"
 arch=(i686 x86_64 mips64el)
 url="http://gnome.org"
 license=('GPL2')
 depends=('dconf' 'gtk3')
-makedepends=('intltool' 'gnome-doc-utils')
+makedepends=('intltool' 'itstool' 'docbook-xsl')
 groups=('gnome-extra')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('288bb4db72d5e86874198f3a879a89cd0ddec373db9838d8ea772df1c5267736')
+sha256sums=('7b20e59ca271c755400f68446f1f818d4ee3cc7e7e8fa7ba67a843a4eabdecc1')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD
index 6de6c4946..969afef75 100644
--- a/extra/gnome-system-monitor/PKGBUILD
+++ b/extra/gnome-system-monitor/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 156853 2012-04-23 09:07:36Z ibiru $
+# $Id: PKGBUILD 169915 2012-10-30 22:34:53Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-system-monitor
-pkgver=3.4.1
+pkgver=3.6.0
 pkgrel=1
 pkgdesc="A system monitor for GNOME"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'libsystemd')
-makedepends=('gnome-doc-utils' 'intltool')
+makedepends=('itstool' 'docbook-xsl' 'intltool')
 options=(!emptydirs)
 url="http://www.gnome.org"
 groups=('gnome-extra')
 install=gnome-system-monitor.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('60f53f1b37c717b2f12502bf6f3b4b43c8e8f3d2fb1198ba66bf933ec4c3130b')
+sha256sums=('5e427d6c7dbe3cfb87afe3feb93882485f79ce71556e5b855152055d8a6080ab')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD
index 26083793c..f729dc60d 100644
--- a/extra/gnome-terminal/PKGBUILD
+++ b/extra/gnome-terminal/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 156855 2012-04-23 09:07:39Z ibiru $
+# $Id: PKGBUILD 169916 2012-10-30 22:34:57Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-terminal
-pkgver=3.4.1.1
+pkgver=3.6.0
 pkgrel=1
 pkgdesc="The GNOME Terminal Emulator"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gconf' 'vte3' 'gsettings-desktop-schemas' 'libsm')
-makedepends=('gnome-doc-utils' 'intltool' 'gtk2')
+makedepends=('gnome-doc-utils' 'intltool' 'gtk2' 'itstool' 'docbook-xsl')
 options=('!emptydirs')
 url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-terminal.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('14d4a252fcbadf0a5fff89f1ff65f0a84d02f5e51c42f8fc14cee73eabc43fdd')
+sha256sums=('5ee068ca7f4d0e410aabbddee3937559138163d84c00e5bef1e9050beb7409cd')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD
index 703592460..0ba082bec 100644
--- a/extra/gnome-themes-standard/PKGBUILD
+++ b/extra/gnome-themes-standard/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 159060 2012-05-15 11:23:35Z heftig $
+# $Id: PKGBUILD 170909 2012-11-12 22:44:40Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-themes-standard
-pkgver=3.4.2
+pkgver=3.6.2
 pkgrel=1
 pkgdesc="Default themes for the GNOME desktop"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ replaces=('gnome-themes')
 conflicts=('gnome-themes')
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('aa29d23708e3357775fb7ea2de14b90551a2c732fce297f3372dae005374c3a8')
+sha256sums=('c41503d0e18e17188c4fd1be5f6a7e90b08564e2a19d9a318b145a56d4455352')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD
index 60a63e175..7074505b1 100644
--- a/extra/gnome-user-share/PKGBUILD
+++ b/extra/gnome-user-share/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166593 2012-09-12 17:59:25Z jgc $
+# $Id: PKGBUILD 169920 2012-10-30 22:35:10Z heftig $
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-user-share
-pkgver=3.0.3
+pkgver=3.0.4
 pkgrel=1
 pkgdesc="Easy to use user-level file sharing for GNOME."
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'nautilus' 'itstool' 'docbook-xsl')
 options=('!emptydirs' '!libtool')
 install=gnome-user-share.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('0196c22fd339922922b2f2558942ef5aac1a0896e7327cf5ab4399ad9f1f1347')
+sha256sums=('e1c8ca73163bf77ce7ca1b92db94cd9c4680a24b940d620996c9331ab79edeb8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnu-efi-libs/PKGBUILD b/extra/gnu-efi-libs/PKGBUILD
index 2799ac0d9..6432177d1 100644
--- a/extra/gnu-efi-libs/PKGBUILD
+++ b/extra/gnu-efi-libs/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 168460 2012-10-12 06:35:15Z tpowa $
+# $Id: PKGBUILD 170836 2012-11-12 13:59:20Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer : Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 _pkgver="3.0"
 pkgname="gnu-efi-libs"
-pkgver="${_pkgver}r"
-pkgrel="1"
+pkgver="${_pkgver}s"
+pkgrel="2"
 pkgdesc="Library for building x86_64 and i386 UEFI Applications using GNU toolchain"
 url="http://sourceforge.net/projects/gnu-efi/"
 license=('GPL')
@@ -19,7 +19,9 @@ conflicts=('gnu-efi')
 provides=('gnu-efi')
 replaces=('gnu-efi')
 options=('!strip' '!makeflags')
-source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz"         gnu-efi-libs-x86_64-call-fix.patch)
+source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz"         
+         gnu-efi-libs-x86_64-call-fix.patch
+         disable-ms_abi-flag.patch)
 
 _build_gnu-efi-libs-x86_64() {	
 	cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-x86_64"
@@ -38,7 +40,9 @@ _build_gnu-efi-libs-i386() {
 build() {
         cd ${srcdir}/gnu-efi-${_pkgver}
         # fix http://sourceforge.net/tracker/?func=detail&aid=3576537&group_id=163609&atid=828423
-        patch -Np1 -i ../gnu-efi-libs-x86_64-call-fix.patch	
+        patch -Np1 -i ../gnu-efi-libs-x86_64-call-fix.patch
+        # fix broken ms_abi flags, causing weird issues with bootloaders
+        patch -Np1 -i ../disable-ms_abi-flag.patch
 	## Fix Makefiles to enable compile for both UEFI arch
 	sed 's|INSTALLROOT=/usr/local|INSTALLROOT ?= /usr/lib|g' -i Make.defaults
 	sed 's|LIBDIR=lib|LIBDIR ?= lib|g' -i Make.defaults
@@ -75,5 +79,6 @@ package() {
 		_package_gnu-efi-libs-i386
 	fi	
 }
-md5sums=('c5081850414bec34d3e254e8e970811b'
-         '4b5428c51af1981d3eb158d924d6bf85')
+md5sums=('11f63d52071f7382f56c9e81d0aece91'
+         '4b5428c51af1981d3eb158d924d6bf85'
+         '6295a103438cace5c40606b083c739fd')
diff --git a/extra/gnu-efi-libs/disable-ms_abi-flag.patch b/extra/gnu-efi-libs/disable-ms_abi-flag.patch
new file mode 100644
index 000000000..2fb61a1d7
--- /dev/null
+++ b/extra/gnu-efi-libs/disable-ms_abi-flag.patch
@@ -0,0 +1,16 @@
+diff --git a/Make.defaults b/Make.defaults
+index 38da180..aa1f4de 100644
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -54,9 +54,9 @@ GCCNEWENOUGH := $(shell ([ $(GCCVERSION) -gt "4" ] || ([ $(GCCVERSION) -eq "4" ]
+ 
+ CPPFLAGS   = -DCONFIG_$(ARCH)
+ ifeq ($(GCCNEWENOUGH),1)
+-CPPFLAGS   += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args
++CPPFLAGS   += -maccumulate-outgoing-args
+ endif
+-CFLAGS	   = $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants
++CFLAGS	   = $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-stack-protector -fno-merge-constants
+ ASFLAGS    = $(ARCH3264)
+ LDFLAGS	   = -nostdlib
+ INSTALL	   = install
diff --git a/extra/gnu-efi/PKGBUILD b/extra/gnu-efi/PKGBUILD
deleted file mode 100644
index 35e433aaf..000000000
--- a/extra/gnu-efi/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 160800 2012-06-06 10:29:37Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer : Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-
-_pkgname="gnu-efi"
-_ver="3.0"
-_pkgver="${_ver}q"
-pkgname="${_pkgname}"
-pkgver="${_pkgver}"
-pkgrel=1
-pkgdesc="Library for building UEFI Applications using GNU toolchain"
-url="http://sourceforge.net/projects/gnu-efi/"
-license=('GPL')
-arch=('i686' 'x86_64')
-makedepends=()
-depends=('pciutils')
-source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz")
-options=(!strip !makeflags)
-
-build() {
-	cd "${srcdir}/gnu-efi-${_ver}"	
-	sed 's|-fno-strict-aliasing|-fno-strict-aliasing -fno-stack-protector|g' -i "${srcdir}/gnu-efi-${_ver}/Make.defaults" || true
-	CFLAGS="" make
-	make -C apps clean all
-}
-
-package() {	
-	cd "${srcdir}/gnu-efi-${_ver}"
-	make INSTALLROOT="${pkgdir}/usr/" install
-	install -d "${pkgdir}/usr/share/gnu-efi/"
-	install -D -m0644 "${srcdir}/gnu-efi-${_ver}/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/"
-}
-md5sums=('698d93490e0c0171aa0e2a8eda44209f')
diff --git a/extra/gnuchess/PKGBUILD b/extra/gnuchess/PKGBUILD
deleted file mode 100644
index ccd178813..000000000
--- a/extra/gnuchess/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 152136 2012-03-04 23:43:24Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=gnuchess
-pkgver=6.0.2
-pkgrel=1.1
-pkgdesc="Lets most modern computers play a full game of chess"
-url="http://www.gnu.org/software/chess/chess.html"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('glibc' 'ncurses' 'readline')
-source=(ftp://ftp.gnu.org/pub/gnu/chess/$pkgname-$pkgver.tar.gz{,.sig})
-md5sums=('566a145479c47f2f9d7d9b7b8119e1b0'
-         '044487606aa14ecb29ab9613f83918d9')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make  
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr install
-}
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 2ac6e32f0..2efa71065 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD 168527 2012-10-13 06:38:44Z andyrtr $
+# $Id: PKGBUILD 171957 2012-11-25 10:16:20Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.1.3
+pkgver=3.1.5
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,12 +11,12 @@ license=('GPL3' 'LGPL')
 url="http://www.gnu.org/software/gnutls/"
 install=gnutls.install
 options=('!libtool' '!zipman')
-depends=('gcc-libs>=4.7.1-5' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12')
-makedepends=('strace')
+depends=('gcc-libs>=4.7.1-5' 'libtasn1>=3.0' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12')
+makedepends=('strace' 'datefudge')
 [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind')
 source=(http://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('8a7b47456f65ffa8c01c58461fed1388'
-         'ecd7bfe70612f88afd117124e18444df')
+md5sums=('cd4e5a5382b0e0c76c6cffe30d48bbb6'
+         '3a8526473e0d47401f88d05727949fc9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,13 +24,14 @@ build() {
 	--with-zlib \
 	--disable-static \
 	--disable-guile \
-	--disable-valgrind-tests
+	--disable-valgrind-tests #	--disable-libdane \
   make
 }
 
 check() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make -k check # passes all  || /bin/true
+  #make -k check || /bin/true # some new tests are broken
 }
 
 package() {
diff --git a/extra/gobject-introspection/PKGBUILD b/extra/gobject-introspection/PKGBUILD
index 3f3a13519..e04c2e419 100644
--- a/extra/gobject-introspection/PKGBUILD
+++ b/extra/gobject-introspection/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 157399 2012-04-28 09:26:41Z allan $
+# $Id: PKGBUILD 170882 2012-11-12 22:03:02Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gobject-introspection
-pkgver=1.32.1
-pkgrel=2
+pkgver=1.34.2
+pkgrel=1
 pkgdesc="Introspection system for GObject-based libraries"
-url="http://live.gnome.org/GObjectInstrospection"
+url="https://live.gnome.org/GObjectIntrospection"
 arch=('x86_64' 'i686' 'mips64el')
 license=('LGPL' 'GPL')
-depends=('glib2' 'python2')
+depends=('glib2' 'python2' 'python2-mako')
 makedepends=('cairo')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('44f3fb933f76e4728818cc360cb5f9e2edcbdf9bc8a8f9aded99b3e3ef5cb858')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('bc7948a35ce2218922dfb0806679cad21060715cc0c340cf7823eb633cc03429')
 
 build() {
   cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static --enable-doctool
   make
 }
 
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index c1721cde7..39f5dbf42 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 168428 2012-10-11 16:00:51Z giovanni $
+# $Id: PKGBUILD 172015 2012-11-26 14:36:27Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gparted
 pkgver=0.14.0
-pkgrel=1
+pkgrel=3
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gparted.sourceforge.net"
@@ -18,7 +18,7 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions'
             'reiserfsprogs: for reiser partitions'
             'xfsprogs: for xfs partitions'
             'nilfs-utils: for nilfs2 support'
-            'polkit: to run gparted directly from menu'
+            'polkit-gnome: to run gparted directly from menu'
             'gpart: for recovering corrupt partition tables'
             'mtools')
 install=gparted.install
diff --git a/extra/gperftools/PKGBUILD b/extra/gperftools/PKGBUILD
index c8ad827ae..723950d15 100644
--- a/extra/gperftools/PKGBUILD
+++ b/extra/gperftools/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=gperftools
 pkgver=2.0
 pkgrel=4
 pkgdesc="Fast, multi-threaded malloc() and nifty performance analysis tools"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/gperftools/"
 license=('BSD')
 depends=('perl')
diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD
index 18c75f327..4dad37328 100644
--- a/extra/gpsd/PKGBUILD
+++ b/extra/gpsd/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 163966 2012-07-23 03:02:55Z allan $
+# $Id: PKGBUILD 169832 2012-10-30 19:50:10Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Giacomo Rizzo <alt@free-os.it>
 
 pkgname=gpsd
-pkgver=3.6
-pkgrel=2
+pkgver=3.7
+pkgrel=1
 pkgdesc="GPS daemon and library to support USB/serial GPS devices"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://catb.org/gpsd/"
@@ -77,7 +77,7 @@ package() {
 
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-md5sums=('064a5ad75593f8c3ea3fe85010647832'
-         '6473da46f6bad52d38f88670f84cd92b'
+md5sums=('52d9785eaf1a51298bb8900dbde88f98'
+         '07fa4bf23aa998dcb951790b63dbebff'
          '6602d04bb037bc500424f00f24f58837'
          '3e963df3f9f7ef3572ecc648ae829315')
diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD
index 116afdcd6..fff033be4 100644
--- a/extra/gptfdisk/PKGBUILD
+++ b/extra/gptfdisk/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 160220 2012-05-31 03:41:30Z foutrelis $
+# $Id: PKGBUILD 171514 2012-11-18 10:27:45Z andyrtr $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Hokum <hokum_at_mail_dot_ru>
 
 pkgname=gptfdisk
 pkgver=0.8.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rodsbooks.com/gdisk/"
diff --git a/extra/gqview/PKGBUILD b/extra/gqview/PKGBUILD
deleted file mode 100644
index 4e2138782..000000000
--- a/extra/gqview/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 138174 2011-09-18 07:14:08Z eric $
-# Maintainer: dorphell <dorphell@archlinux.org>
-
-pkgname=gqview
-pkgver=2.0.4
-pkgrel=4.1
-pkgdesc="An image browser and viewer"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://gqview.sourceforge.net/"
-license=('GPL')
-depends=('gtk2' 'desktop-file-utils')
-install=gqview.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('7196deab04db94cec2167637cddc02f9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/gqview/gqview.install b/extra/gqview/gqview.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/extra/gqview/gqview.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/extra/grantlee/PKGBUILD b/extra/grantlee/PKGBUILD
index 1afc3ed0a..fd5284709 100644
--- a/extra/grantlee/PKGBUILD
+++ b/extra/grantlee/PKGBUILD
@@ -1,21 +1,19 @@
-# $Id: PKGBUILD 142010 2011-11-03 23:27:16Z andrea $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 170108 2012-11-02 08:45:56Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=grantlee
-pkgver=0.2.0
-pkgrel=1.1
+pkgver=0.3.0
+pkgrel=1
 pkgdesc="A string template engine based on the Django template system and written in Qt"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gitorious.org/grantlee/pages/Home"
 license=('LGPL3')
 depends=('qt')
-makedepends=('cmake')
+makedepends=('cmake' 'doxygen')
 source=("http://downloads.grantlee.org/${pkgname}-${pkgver}.tar.gz")
-md5sums=('0622ed30630a44b5fac0bfa7e176d3fe')
+md5sums=('195763a3238f51f8885881fc8012cd83')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -25,6 +23,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
-} 
+}
diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD
index b6cb37a16..ddfa6d60d 100644
--- a/extra/grilo-plugins/PKGBUILD
+++ b/extra/grilo-plugins/PKGBUILD
@@ -1,38 +1,34 @@
-# $Id: PKGBUILD 156867 2012-04-23 09:07:54Z ibiru $
+# $Id: PKGBUILD 170557 2012-11-08 17:08:27Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=grilo-plugins
-pkgver=0.1.18
-pkgrel=3
+pkgver=0.2.3
+pkgrel=1
 pkgdesc="Plugins for Grilo"
 url="http://www.gnome.org"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-depends=('grilo')
-makedepends=('gupnp-av' 'libgdata' 'libquvi' 'sqlite3' 'gmime' 'libgcrypt'
-             'rest' 'libtracker-sparql' 'gnome-common')
+depends=('grilo' 'sqlite' 'libgcrypt')
+makedepends=(gupnp-av libgdata libquvi gmime rest libtracker-sparql totem-plparser libdmapsharing
+             json-glib)
 optdepends=('gupnp-av: uPnP plugin'
             'libgdata: Youtube plugin'
             'libquvi: Youtube plugin'
-            'sqlite3: Podcasts plugin'
+            'sqlite: Podcasts plugin'
             'gmime: Podcasts plugin'
-            'sqlite3: Bookmarks plugin'
-            'sqlite3: Metadata store plugin'
-            'libgcrypt: Vimeo plugin'
             'rest: Blip.tv plugin'
-            'libtracker-sparql: Tracker plugin')
+            'libtracker-sparql: Tracker plugin'
+            'totem-plparser: Optical media plugin'
+            'libdmapsharing: DMAP sharing plugin'
+            'json-glib: TMDb plugin')
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
-        tracker-0.14.patch)
-sha256sums=('7e382f402119f4f270380627a2f49b30a6c43a47ecd645bf5ffe4e0cd99a1c79'
-            'c48201ed1633e2b0eb5132ef823d7b060e9c2cddb808c6981fb546133cd4ea63')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('2d70b7f148c29fde365cac1afcbfdd77b7f5fc0f65e60f3790c702121c65d7c8')
 
 build() {
   cd $pkgname-$pkgver
   
-  patch -Np1 -i ../tracker-0.14.patch
-
-  gnome-autogen.sh --prefix=/usr --sysconfdir=/etc --disable-static \
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
     --enable-shoutcast
   make
 }
diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD
index f0ebbf1d2..66fb9879e 100644
--- a/extra/grilo/PKGBUILD
+++ b/extra/grilo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 144926 2011-12-10 21:23:58Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 170546 2012-11-08 15:26:24Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=grilo
-pkgver=0.1.18
-pkgrel=1.1
+pkgver=0.2.3
+pkgrel=1
 pkgdesc="Framework that provides access to various sources of multimedia content"
 url="http://www.gnome.org"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,11 +13,12 @@ makedepends=('gobject-introspection' 'gtk-doc' 'vala')
 optdepends=('grilo-plugins: Plugins for grilo')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('dc5bc1ea74ed3d47c4ec2d94886234346671509bdc63ce181f98824e7178ae83')
+sha256sums=('6a800c98731a93cc2b204abceeb37c55bb5529724115f5d4c4f91bd1ade67d42')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-static --disable-debug \
+    --libdir=/usr/lib
   make
 }
 
diff --git a/extra/gsasl/PKGBUILD b/extra/gsasl/PKGBUILD
new file mode 100644
index 000000000..b6c52f6d7
--- /dev/null
+++ b/extra/gsasl/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 170167 2012-11-04 02:30:50Z eric $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Orivej Desh <smpuj@bk.ru>
+# Maintainer: Orivej Desh <smpuj@bk.ru>
+
+pkgname=gsasl
+pkgver=1.8.0
+pkgrel=2
+pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms"
+arch=("i686" "x86_64" "mips64el")
+url="http://josefsson.org/gsasl/"
+license=("GPL")
+depends=('gnutls' 'libidn' 'krb5' 'libgcrypt')
+source=("ftp://ftp.gnu.org/gnu/gsasl/$pkgname-$pkgver.tar.gz")
+md5sums=('982fe54a20016aa46a871c084c990c36')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --with-gssapi-impl=mit
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  rm "$pkgdir/usr/share/info/dir" "$pkgdir/usr/lib/libgsasl.la"
+}
diff --git a/extra/gsl/PKGBUILD b/extra/gsl/PKGBUILD
index 6d49066a9..70ac01816 100644
--- a/extra/gsl/PKGBUILD
+++ b/extra/gsl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151402 2012-02-26 10:25:31Z pierre $
+# $Id: PKGBUILD 171358 2012-11-17 09:32:49Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Juergen Hoetzel <juergen.archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -19,12 +19,17 @@ sha1sums=('d914f84b39a5274b0a589d9b83a66f44cd17ca8e')
 build() {
     unset LDFLAGS
 
-    cd ${srcdir}/${pkgname}-${pkgver}
+    cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure --prefix=/usr
     make
 }
 
+check() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make check
+}
+
 package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make DESTDIR=${pkgdir} install
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD
index 6db3eb9b8..f3f45a312 100644
--- a/extra/gssdp/PKGBUILD
+++ b/extra/gssdp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157078 2012-04-23 13:10:28Z heftig $
+# $Id: PKGBUILD 169927 2012-10-30 22:45:20Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gssdp
-pkgver=0.12.1
+pkgver=0.12.2.1
 pkgrel=1
 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ depends=('libsoup')
 makedepends=('gobject-introspection' 'gtk2' 'gtk-doc')
 optdepends=('gtk2: gssdp-device-sniffer')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('16acb4cc5249836ebe0e1758b75b85b8d529b51f72d9f68d8e4ae524d55f3347')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('928aa257815d044fdbfc740f5799530d41897947b5d7854173f636b36d728414')
 
 build() {
   cd $pkgname-$pkgver
@@ -23,6 +23,11 @@ build() {
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD
new file mode 100644
index 000000000..aa1e6950c
--- /dev/null
+++ b/extra/gst-libav/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 171701 2012-11-21 14:49:21Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gst-libav
+pkgver=1.0.3
+pkgrel=1
+pkgdesc="Gstreamer libav Plugin"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+url="http://gstreamer.freedesktop.org/"
+depends=('gst-plugins-base-libs' 'bzip2')
+makedepends=('yasm')
+options=(!libtool !emptydirs)
+provides=("gst-ffmpeg=$pkgver-pkgrel")
+source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
+sha256sums=('5193f158e2554a9450325dbb0c60e8f4b6b8a9244ae10ea07d0f7418a0e07959')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static --with-libav-extra-configure="--enable-runtime-cpudetect" \
+    --with-package-name="GStreamer libav Plugin (Archlinux)" \
+    --with-package-origin="http://www.archlinux.org/"
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/gst-plugins-base/PKGBUILD b/extra/gst-plugins-base/PKGBUILD
new file mode 100644
index 000000000..145af5915
--- /dev/null
+++ b/extra/gst-plugins-base/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 171697 2012-11-21 14:46:10Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=gst-plugins-base
+pkgname=('gst-plugins-base-libs' 'gst-plugins-base')
+pkgver=1.0.3
+pkgrel=1
+pkgdesc="GStreamer Multimedia Framework Base Plugins"
+arch=('i686' 'x86_64' 'mips64el')
+license=('LGPL')
+makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection')
+options=(!libtool !emptydirs)
+url="http://gstreamer.freedesktop.org/"
+source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz)
+sha256sums=('066ba8a7fa709a25ad291f7b21329b73f513637aafceee00396e588e723d7f9e')
+
+build() {
+  cd $pkgbase-$pkgver
+  sed -i '/AC_PATH_XTRA/d' configure.ac
+  autoreconf
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static --enable-experimental \
+    --with-package-name="GStreamer Base Plugins (Archlinux)" \
+    --with-package-origin="http://www.archlinux.org/"
+  make
+  sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile
+}
+
+check() {
+  cd $pkgbase-$pkgver
+  # Testsuite fails on one test. Some refcount leak
+  #make check
+}
+
+package_gst-plugins-base-libs() {
+  pkgdesc="GStreamer Multimedia Framework Base Plugin libraries"
+  depends=('gstreamer' 'orc' 'libxv')
+
+  cd $pkgbase-$pkgver
+  make DESTDIR="${pkgdir}" install
+}
+
+package_gst-plugins-base() {
+  depends=("gst-plugins-base-libs=$pkgver" 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango')
+
+  cd $pkgbase-$pkgver
+  make -C gst-libs DESTDIR="${pkgdir}" install
+  make -C ext DESTDIR="${pkgdir}" install
+  make -C gst-libs DESTDIR="${pkgdir}" uninstall
+}
diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD
new file mode 100644
index 000000000..c9b589016
--- /dev/null
+++ b/extra/gst-plugins-good/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 171698 2012-11-21 14:46:59Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gst-plugins-good
+pkgver=1.0.3
+pkgrel=1
+pkgdesc="GStreamer Multimedia Framework Good Plugins"
+arch=('i686' 'x86_64' 'mips64el')
+license=('LGPL')
+url="http://gstreamer.freedesktop.org/"
+depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883' 'libxdamage' 'v4l-utils')
+makedepends=('gstreamer' 'speex' 'flac' 'libraw1394')
+options=(!libtool !emptydirs)
+source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
+md5sums=('5cfc3f18dede15d60f0af8666f68193e')
+
+build() {
+  cd $pkgname-$pkgver
+  sed -i '/AC_PATH_XTRA/d' configure.ac
+  autoreconf
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static --enable-experimental \
+    --with-package-name="GStreamer Good Plugins (Archlinux)" \
+    --with-package-origin="http://www.archlinux.org/"
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+}
diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD
new file mode 100644
index 000000000..eb752099d
--- /dev/null
+++ b/extra/gst-plugins-ugly/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 171700 2012-11-21 14:48:27Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gst-plugins-ugly
+pkgver=1.0.3
+pkgrel=1
+pkgdesc="GStreamer Multimedia Framework Ugly Plugins"
+arch=('i686' 'x86_64' 'mips64el')
+license=('LGPL')
+url="http://gstreamer.freedesktop.org/"
+depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
+options=(!libtool !emptydirs)
+source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
+sha256sums=('b8f4cfef12201f19c53a4cde7bc4fef995740c566ea45921d4473f3714e4d8c0')
+
+build() {
+  cd $pkgname-$pkgver
+  sed -i '/AC_PATH_XTRA/d' configure.ac
+  autoreconf
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static --enable-experimental \
+    --with-package-name="GStreamer Ugly Plugins (Archlinux)" \
+    --with-package-origin="http://www.archlinux.org/"
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD
new file mode 100644
index 000000000..fe470fd26
--- /dev/null
+++ b/extra/gstreamer/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 171696 2012-11-21 14:45:21Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gstreamer
+pkgver=1.0.3
+pkgrel=1
+pkgdesc="GStreamer Multimedia Framework"
+arch=('i686' 'x86_64' 'mips64el')
+license=('LGPL')
+url="http://gstreamer.freedesktop.org/"
+depends=('libxml2' 'glib2')
+optdepends=('sh: feedback script')
+makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
+options=('!libtool')
+source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz)
+sha256sums=('69ac49e2ae9cd2ea5f789de641aeb338bb8731961acfced08ae1c76a797fe6b1')
+
+build() {
+  cd "${srcdir}/gstreamer-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
+    --with-package-name="GStreamer (Archlinux)" \
+    --with-package-origin="http://www.archlinux.org/" \
+    --enable-gtk-doc --disable-static
+  make
+}
+
+check() {
+  cd "${srcdir}/gstreamer-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/gstreamer-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD
index b0331ca82..aa92ed560 100644
--- a/extra/gstreamer0.10-ugly/PKGBUILD
+++ b/extra/gstreamer0.10-ugly/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163150 2012-07-08 09:31:14Z ibiru $
+# $Id: PKGBUILD 171265 2012-11-16 23:35:43Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gstreamer0.10-ugly
 pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
 pkgver=0.10.19
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD
index 5a8958b76..9d64c1f43 100644
--- a/extra/gthumb/PKGBUILD
+++ b/extra/gthumb/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 164836 2012-08-06 23:07:31Z andrea $
+# $Id: PKGBUILD 169934 2012-10-30 22:45:37Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=gthumb
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.1.2
+pkgrel=1
 pkgdesc="Image browser and viewer for the GNOME Desktop"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://live.gnome.org/gthumb"
 depends=('desktop-file-utils' 'hicolor-icon-theme' 'dconf' 'librsvg' 'clutter-gtk'
-         'gstreamer0.10-base' 'gsettings-desktop-schemas')
+         'gstreamer0.10-base' 'gsettings-desktop-schemas' 'libwebp')
 makedepends=('intltool' 'gnome-doc-utils' 'libchamplain' 'libopenraw' 'exiv2' 'libsoup-gnome'
              'brasero' 'librsvg' 'libopenraw' 'liboauth')
 optdepends=('libopenraw: read RAW files'
@@ -23,7 +23,7 @@ optdepends=('libopenraw: read RAW files'
 options=('!libtool' '!emptydirs')
 install=gthumb.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1fb2939e4896a012c7d0320a31e3c6139214218e9f6ec39c6370febeda94725c')
+sha256sums=('5e7f80b3ffa8a6e06b9f1bf0cfa869f772af4163b842a7f457c9dc68ff7e6f8f')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index 42ecdcf50..78c720d81 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 163899 2012-07-21 19:20:27Z ibiru $
+# $Id: PKGBUILD 170745 2012-11-10 22:04:15Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
-pkgver=3.4.4
+pkgver=3.6.2
 pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 install=gtk3.install
-depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord')
+depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord' 'at-spi2-atk')
 makedepends=('gobject-introspection')
 options=('!libtool')
 backup=(etc/gtk-3.0/settings.ini)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
         settings.ini wacom.patch)
-sha256sums=('f154e460075034da4c0ce89c320025dcd459da2a1fdf32d92a09522eaca242c7'
+sha256sums=('aaccf2e1576338acf37816290578e8f19888935f381665b3847076be25fe513c'
             'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
             '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5')
 build() {
@@ -29,8 +29,10 @@ build() {
         --localstatedir=/var \
         --enable-gtk2-dependency \
         --disable-schemas-compile
+
     #https://bugzilla.gnome.org/show_bug.cgi?id=655517
     sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
     make
 }
 
diff --git a/extra/gtk3/git-fixes.patch b/extra/gtk3/git-fixes.patch
new file mode 100644
index 000000000..06041e326
--- /dev/null
+++ b/extra/gtk3/git-fixes.patch
@@ -0,0 +1,8346 @@
+diff --git a/configure.ac b/configure.ac
+index 9e24e90..00f38b0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -714,7 +714,6 @@ AM_PATH_GLIB_2_0(glib_required_version, :,
+ *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
+   gobject gmodule-no-export)
+ 
+-dnl
+ dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
+ dnl
+ gtk_save_LIBS=$LIBS
+@@ -748,6 +747,19 @@ else
+     AC_MSG_RESULT([no])
+ fi
+ 
++#
++# Disable deprecation checks for all libraries we depend on on stable branches.
++# This is so newer versions of those libraries don't cause more warnings with
++# a stable GTK version.
++# We don't ever want to turn off deprecation warnings for master however, because
++# that's where we get rid of deprecated API we use.
++#
++if test m4_eval(gtk_minor_version % 2) = 0 ; then
++  AC_DEFINE_UNQUOTED(GLIB_DISABLE_DEPRECATION_WARNINGS, 1,
++                     [Disable deprecation warnings from glib])
++fi
++
++dnl
+ saved_cflags="$CFLAGS"
+ saved_ldflags="$LDFLAGS"
+ 
+diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
+index 712f232..5d04cdb 100644
+--- a/gdk/quartz/gdkevents-quartz.c
++++ b/gdk/quartz/gdkevents-quartz.c
+@@ -1439,7 +1439,8 @@ gdk_event_translate (GdkEvent *event,
+         if (dx != 0.0 || dy != 0.0)
+           {
+ #ifdef AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
+-	    if (gdk_quartz_osx_version() >= GDK_OSX_LION &[nsevent hasPreciseScrollingDeltas])
++	    if (gdk_quartz_osx_version() >= GDK_OSX_LION &&
++		[nsevent hasPreciseScrollingDeltas])
+               {
+                 GdkEvent *emulated_event;
+ 
+diff --git a/gtk/a11y/gtktextcellaccessible.c b/gtk/a11y/gtktextcellaccessible.c
+index ce5777a..7088780 100644
+--- a/gtk/a11y/gtktextcellaccessible.c
++++ b/gtk/a11y/gtktextcellaccessible.c
+@@ -552,7 +552,6 @@ gtk_text_cell_accessible_get_character_extents (AtkText      *text,
+   gail_renderer = GTK_RENDERER_CELL_ACCESSIBLE (text);
+   g_object_get (gail_renderer, "renderer", &gtk_renderer, NULL);
+   g_object_get (gtk_renderer, "text", &renderer_text, NULL);
+-  g_object_unref (gtk_renderer);
+   if (renderer_text == NULL)
+     {
+       g_object_unref (gtk_renderer);
+diff --git a/gtk/gtk-default.css b/gtk/gtk-default.css
+index 2e21518..d084828 100644
+--- a/gtk/gtk-default.css
++++ b/gtk/gtk-default.css
+@@ -715,5 +715,17 @@ GtkCalendar.button:hover {
+ }
+ 
+ .spinner:active {
++   background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
++                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
++                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
++                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
++                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
++                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
++                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
++                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
++                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
++                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
++                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
++                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
+   animation: spinner 1s infinite linear;
+ }
+diff --git a/gtk/gtkcsscomputedvalues.c b/gtk/gtkcsscomputedvalues.c
+index 94115a5..b522948 100644
+--- a/gtk/gtkcsscomputedvalues.c
++++ b/gtk/gtkcsscomputedvalues.c
+@@ -499,6 +499,8 @@ gtk_css_computed_values_create_css_animations (GtkCssComputedValues    *values,
+                                               _gtk_css_play_state_value_get (_gtk_css_array_value_get_nth (play_states, i)),
+                                               _gtk_css_fill_mode_value_get (_gtk_css_array_value_get_nth (fill_modes, i)),
+                                               _gtk_css_number_value_get (_gtk_css_array_value_get_nth (iteration_counts, i), 100));
++
++          _gtk_css_keyframes_unref (keyframes);
+         }
+       values->animations = g_slist_prepend (values->animations, animation);
+     }
+diff --git a/gtk/gtkcssimagegradient.c b/gtk/gtkcssimagegradient.c
+index a241733..8497339 100644
+--- a/gtk/gtkcssimagegradient.c
++++ b/gtk/gtkcssimagegradient.c
+@@ -79,7 +79,7 @@ fade_pattern (cairo_pattern_t *pattern,
+       cairo_pattern_add_color_stop_rgba (result, o, r, g, b, a * opacity);
+     }
+ 
+-  return pattern;
++  return result;
+ }
+ 
+ static cairo_pattern_t *
+@@ -102,7 +102,7 @@ transition_pattern (cairo_pattern_t *start,
+     {
+     case CAIRO_PATTERN_TYPE_LINEAR:
+       cairo_pattern_get_linear_points (start, &sx0, &sy0, &sx1, &sy1);
+-      cairo_pattern_get_linear_points (start, &ex0, &ey0, &ex1, &ey1);
++      cairo_pattern_get_linear_points (end, &ex0, &ey0, &ex1, &ey1);
+       result = cairo_pattern_create_linear ((1 - progress) * sx0 + progress * ex0,
+                                             (1 - progress) * sx1 + progress * ex1,
+                                             (1 - progress) * sy0 + progress * ey0,
+@@ -110,7 +110,7 @@ transition_pattern (cairo_pattern_t *start,
+       break;
+     case CAIRO_PATTERN_TYPE_RADIAL:
+       cairo_pattern_get_radial_circles (start, &sx0, &sy0, &sr0, &sx1, &sy1, &sr1);
+-      cairo_pattern_get_radial_circles (start, &ex0, &ey0, &er0, &ex1, &ey1, &er1);
++      cairo_pattern_get_radial_circles (end, &ex0, &ey0, &er0, &ex1, &ey1, &er1);
+       result = cairo_pattern_create_radial ((1 - progress) * sx0 + progress * ex0,
+                                             (1 - progress) * sy0 + progress * ey0,
+                                             (1 - progress) * sr0 + progress * er0,
+@@ -128,7 +128,7 @@ transition_pattern (cairo_pattern_t *start,
+       double so, sr, sg, sb, sa, eo, er, eg, eb, ea;
+ 
+       cairo_pattern_get_color_stop_rgba (start, i, &so, &sr, &sg, &sb, &sa);
+-      cairo_pattern_get_color_stop_rgba (start, i, &eo, &er, &eg, &eb, &ea);
++      cairo_pattern_get_color_stop_rgba (end, i, &eo, &er, &eg, &eb, &ea);
+ 
+       cairo_pattern_add_color_stop_rgba (result,
+                                          (1 - progress) * so + progress * eo,
+diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
+index dbc14f0..2f4bd28 100644
+--- a/gtk/gtkentrycompletion.c
++++ b/gtk/gtkentrycompletion.c
+@@ -656,8 +656,7 @@ gtk_entry_completion_set_property (GObject      *object,
+         break;
+ 
+       case PROP_TEXT_COLUMN:
+-	gtk_entry_completion_set_text_column (completion,
+-					      g_value_get_int (value));
++        priv->text_column = g_value_get_int (value);
+         break;
+ 
+       case PROP_INLINE_COMPLETION:
+diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
+index dab06c3..09d6303 100644
+--- a/gtk/gtkfilechooserdefault.c
++++ b/gtk/gtkfilechooserdefault.c
+@@ -6798,7 +6798,7 @@ file_system_model_got_thumbnail (GObject *object, GAsyncResult *res, gpointer da
+   copy_attribute (info, queried, G_FILE_ATTRIBUTE_THUMBNAILING_FAILED);
+   copy_attribute (info, queried, G_FILE_ATTRIBUTE_STANDARD_ICON);
+ 
+-  _gtk_file_system_model_update_file (model, file, info, FALSE);
++  _gtk_file_system_model_update_file (model, file, info);
+ 
+   g_object_unref (info);
+ 
+diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
+index 1e5ffe3..132902b 100644
+--- a/gtk/gtkfilesystemmodel.c
++++ b/gtk/gtkfilesystemmodel.c
+@@ -42,6 +42,9 @@
+  *      the special kind of usage for "search" and "recent-files", where the file chooser gives the model the
+  *      files to be displayed.
+  *
++ * Internal data structure
++ * -----------------------
++ *
+  * Each file is kept in a FileModelNode structure.  Each FileModelNode holds a GFile* and other data.  All the
+  * node structures have the same size, determined at runtime, depending on the number of columns that were passed
+  * to _gtk_file_system_model_new() or _gtk_file_system_model_new_for_directory() (that is, the size of a node is
+@@ -66,7 +69,14 @@
+  *
+  * Each FileModelNode has a node->visible field, which indicates whether the node is visible in the GtkTreeView.
+  * A node may be invisible if, for example, it corresponds to a hidden file and the file chooser is not showing
+- * hidden files.
++ * hidden files.  Also, a file filter may be explicitly set onto the model, for example, to only show files that
++ * match "*.jpg".  In this case, node->filtered_out says whether the node failed the filter.  The ultimate
++ * decision on whether a node is visible or not in the treeview is distilled into the node->visible field.
++ * The reason for having a separate node->filtered_out field is so that the file chooser can query whether
++ * a (filtered-out) folder should be made sensitive in the GUI.
++ *
++ * Visible rows vs. possibly-invisible nodes
++ * -----------------------------------------
+  *
+  * Since not all nodes in the model->files array may be visible, we need a way to map visible row indexes from
+  * the treeview to array indexes in our array of files.  And thus we introduce a bit of terminology:
+@@ -95,6 +105,16 @@
+  *
+  * You never access a node->row directly.  Instead, call node_get_tree_row().  That function will validate the nodes
+  * up to the sought one if the node is not valid yet, and it will return a proper 0-based row.
++ *
++ * Sorting
++ * -------
++ *
++ * The model implements the GtkTreeSortable interface.  To avoid re-sorting
++ * every time a node gets added (which would lead to O(n^2) performance during
++ * the initial population of the model), the model can freeze itself (with
++ * freeze_updates()) during the intial population process.  When the model is
++ * frozen, sorting will not happen.  The model will sort itself when the freeze
++ * count goes back to zero, via corresponding calls to thaw_updates().
+  */
+ 
+ /*** DEFINES ***/
+@@ -184,6 +204,12 @@ struct _GtkFileSystemModelClass
+   void (*finished_loading) (GtkFileSystemModel *model, GError *error);
+ };
+ 
++static void freeze_updates (GtkFileSystemModel *model);
++static void thaw_updates (GtkFileSystemModel *model);
++
++static guint node_get_for_file (GtkFileSystemModel *model,
++				GFile              *file);
++
+ static void add_file (GtkFileSystemModel *model,
+ 		      GFile              *file,
+ 		      GFileInfo          *info);
+@@ -263,13 +289,13 @@ node_invalidate_index (GtkFileSystemModel *model, guint id)
+ }
+ 
+ static GtkTreePath *
+-gtk_tree_path_new_from_node (GtkFileSystemModel *model, guint id)
++tree_path_new_from_node (GtkFileSystemModel *model, guint id)
+ {
+-  guint i = node_get_tree_row (model, id);
++  guint r = node_get_tree_row (model, id);
+ 
+-  g_assert (i < model->files->len);
++  g_assert (r < model->files->len);
+ 
+-  return gtk_tree_path_new_from_indices (i, -1);
++  return gtk_tree_path_new_from_indices (r, -1);
+ }
+ 
+ static void
+@@ -278,7 +304,7 @@ emit_row_inserted_for_node (GtkFileSystemModel *model, guint id)
+   GtkTreePath *path;
+   GtkTreeIter iter;
+ 
+-  path = gtk_tree_path_new_from_node (model, id);
++  path = tree_path_new_from_node (model, id);
+   ITER_INIT_FROM_INDEX (model, &iter, id);
+   gtk_tree_model_row_inserted (GTK_TREE_MODEL (model), path, &iter);
+   gtk_tree_path_free (path);
+@@ -290,7 +316,7 @@ emit_row_changed_for_node (GtkFileSystemModel *model, guint id)
+   GtkTreePath *path;
+   GtkTreeIter iter;
+ 
+-  path = gtk_tree_path_new_from_node (model, id);
++  path = tree_path_new_from_node (model, id);
+   ITER_INIT_FROM_INDEX (model, &iter, id);
+   gtk_tree_model_row_changed (GTK_TREE_MODEL (model), path, &iter);
+   gtk_tree_path_free (path);
+@@ -570,7 +596,7 @@ gtk_file_system_model_get_path (GtkTreeModel *tree_model,
+       
+   g_return_val_if_fail (ITER_IS_VALID (model, iter), NULL);
+ 
+-  return gtk_tree_path_new_from_node (model, ITER_INDEX (iter));
++  return tree_path_new_from_node (model, ITER_INDEX (iter));
+ }
+ 
+ static void
+@@ -1097,7 +1123,7 @@ thaw_func (gpointer data)
+ {
+   GtkFileSystemModel *model = data;
+ 
+-  _gtk_file_system_model_thaw_updates (model);
++  thaw_updates (model);
+   model->dir_thaw_source = 0;
+ 
+   return FALSE;
+@@ -1119,7 +1145,7 @@ gtk_file_system_model_got_files (GObject *object, GAsyncResult *res, gpointer da
+     {
+       if (model->dir_thaw_source == 0)
+         {
+-          _gtk_file_system_model_freeze_updates (model);
++          freeze_updates (model);
+           model->dir_thaw_source = gdk_threads_add_timeout_full (IO_PRIORITY + 1,
+                                                                  50,
+                                                                  thaw_func,
+@@ -1168,7 +1194,7 @@ gtk_file_system_model_got_files (GObject *object, GAsyncResult *res, gpointer da
+             {
+               g_source_remove (model->dir_thaw_source);
+               model->dir_thaw_source = 0;
+-              _gtk_file_system_model_thaw_updates (model);
++              thaw_updates (model);
+             }
+ 
+           g_signal_emit (model, file_system_model_signals[FINISHED_LOADING], 0, error);
+@@ -1189,13 +1215,19 @@ gtk_file_system_model_query_done (GObject *     object,
+   GtkFileSystemModel *model = data; /* only a valid pointer if not cancelled */
+   GFile *file = G_FILE (object);
+   GFileInfo *info;
++  guint id;
+ 
+   info = g_file_query_info_finish (file, res, NULL);
+   if (info == NULL)
+     return;
+ 
+   gdk_threads_enter ();
+-  _gtk_file_system_model_update_file (model, file, info, TRUE);
++
++  _gtk_file_system_model_update_file (model, file, info);
++
++  id = node_get_for_file (model, file);
++  gtk_file_system_model_sort_node (model, id);
++
+   gdk_threads_leave ();
+ }
+ 
+@@ -1433,14 +1465,14 @@ gtk_file_system_model_refilter_all (GtkFileSystemModel *model)
+       return;
+     }
+ 
+-  _gtk_file_system_model_freeze_updates (model);
++  freeze_updates (model);
+ 
+   /* start at index 1, don't change the editable */
+   for (i = 1; i < model->files->len; i++)
+     node_compute_visibility_and_filters (model, i);
+ 
+   model->filter_on_thaw = FALSE;
+-  _gtk_file_system_model_thaw_updates (model);
++  thaw_updates (model);
+ }
+ 
+ /**
+@@ -1775,6 +1807,33 @@ _gtk_file_system_model_get_iter_for_file (GtkFileSystemModel *model,
+   return TRUE;
+ }
+ 
++/* When an element is added or removed to the model->files array, we need to
++ * update the model->file_lookup mappings of (node, index), as the indexes
++ * change.  This function adds the specified increment to the index in that pair
++ * if the index is equal or after the specified id.  We use this to slide the
++ * mappings up or down when a node is added or removed, respectively.
++ */
++static void
++adjust_file_lookup (GtkFileSystemModel *model, guint id, int increment)
++{
++  GHashTableIter iter;
++  gpointer key;
++  gpointer value;
++
++  g_hash_table_iter_init (&iter, model->file_lookup);
++
++  while (g_hash_table_iter_next (&iter, &key, &value))
++    {
++      guint index = GPOINTER_TO_UINT (value);
++
++      if (index >= id)
++	{
++	  index += increment;
++	  g_hash_table_iter_replace (&iter, GUINT_TO_POINTER (index));
++	}
++    }
++}
++
+ /**
+  * add_file:
+  * @model: the model
+@@ -1825,6 +1884,7 @@ remove_file (GtkFileSystemModel *model,
+ {
+   FileModelNode *node;
+   guint id;
++  guint row;
+ 
+   g_return_if_fail (GTK_IS_FILE_SYSTEM_MODEL (model));
+   g_return_if_fail (G_IS_FILE (file));
+@@ -1834,17 +1894,22 @@ remove_file (GtkFileSystemModel *model,
+     return;
+ 
+   node = get_node (model, id);
+-  node_set_visible_and_filtered_out (model, id, FALSE, FALSE);
++  row = node_get_tree_row (model, id);
++
++  node_invalidate_index (model, id);
+ 
+   g_hash_table_remove (model->file_lookup, file);
+   g_object_unref (node->file);
++  adjust_file_lookup (model, id, -1);
+ 
+   if (node->info)
+     g_object_unref (node->info);
+ 
+   g_array_remove_index (model->files, id);
+-  g_hash_table_remove_all (model->file_lookup);
+-  /* We don't need to resort, as removing a row doesn't change the sorting order */
++
++  /* We don't need to resort, as removing a row doesn't change the sorting order of the other rows */
++
++  emit_row_deleted_for_row (model, row);
+ }
+ 
+ /**
+@@ -1852,7 +1917,6 @@ remove_file (GtkFileSystemModel *model,
+  * @model: the model
+  * @file: the file
+  * @info: the new file info
+- * @requires_resort: FIXME: get rid of this argument
+  *
+  * Tells the file system model that the file changed and that the 
+  * new @info should be used for it now.  If the file is not part of 
+@@ -1861,8 +1925,7 @@ remove_file (GtkFileSystemModel *model,
+ void
+ _gtk_file_system_model_update_file (GtkFileSystemModel *model,
+                                     GFile              *file,
+-                                    GFileInfo          *info,
+-                                    gboolean            requires_resort)
++                                    GFileInfo          *info)
+ {
+   FileModelNode *node;
+   guint i, id;
+@@ -1894,9 +1957,6 @@ _gtk_file_system_model_update_file (GtkFileSystemModel *model,
+ 
+   if (node->visible)
+     emit_row_changed_for_node (model, id);
+-
+-  if (requires_resort)
+-    gtk_file_system_model_sort_node (model, id);
+ }
+ 
+ /**
+@@ -1967,17 +2027,16 @@ _gtk_file_system_model_remove_editable (GtkFileSystemModel *model)
+ }
+ 
+ /**
+- * _gtk_file_system_model_freeze_updates:
++ * freeze_updates:
+  * @model: a #GtkFileSystemModel
+  *
+- * Freezes most updates on the model, so that performing multiple 
+- * operations on the files in the model do not cause any events.
+- * Use _gtk_file_system_model_thaw_updates() to resume proper 
+- * operations. It is fine to call this function multiple times as
+- * long as freeze and thaw calls are balanced.
++ * Freezes most updates on the model, so that performing multiple operations on
++ * the files in the model do not cause any events.  Use thaw_updates() to resume
++ * proper operations. It is fine to call this function multiple times as long as
++ * freeze and thaw calls are balanced.
+  **/
+-void
+-_gtk_file_system_model_freeze_updates (GtkFileSystemModel *model)
++static void
++freeze_updates (GtkFileSystemModel *model)
+ {
+   g_return_if_fail (GTK_IS_FILE_SYSTEM_MODEL (model));
+ 
+@@ -1985,14 +2044,13 @@ _gtk_file_system_model_freeze_updates (GtkFileSystemModel *model)
+ }
+ 
+ /**
+- * _gtk_file_system_model_thaw_updates:
++ * thaw_updates:
+  * @model: a #GtkFileSystemModel
+  *
+- * Undoes the effect of a previous call to
+- * _gtk_file_system_model_freeze_updates() 
++ * Undoes the effect of a previous call to freeze_updates() 
+  **/
+-void
+-_gtk_file_system_model_thaw_updates (GtkFileSystemModel *model)
++static void
++thaw_updates (GtkFileSystemModel *model)
+ {
+   gboolean stuff_added;
+ 
+diff --git a/gtk/gtkfilesystemmodel.h b/gtk/gtkfilesystemmodel.h
+index 2264fcf..575cc23 100644
+--- a/gtk/gtkfilesystemmodel.h
++++ b/gtk/gtkfilesystemmodel.h
+@@ -71,8 +71,7 @@ void                _gtk_file_system_model_add_and_query_file (GtkFileSystemMode
+                                                              const char         *attributes);
+ void                _gtk_file_system_model_update_file      (GtkFileSystemModel *model,
+                                                              GFile              *file,
+-                                                             GFileInfo          *info,
+-                                                             gboolean            requires_resort);
++                                                             GFileInfo          *info);
+ 
+ void                _gtk_file_system_model_set_show_hidden  (GtkFileSystemModel *model,
+ 							     gboolean            show_hidden);
+@@ -82,8 +81,6 @@ void                _gtk_file_system_model_set_show_files   (GtkFileSystemModel
+ 							     gboolean            show_files);
+ void                _gtk_file_system_model_set_filter_folders (GtkFileSystemModel *model,
+ 							     gboolean            show_folders);
+-void                _gtk_file_system_model_freeze_updates   (GtkFileSystemModel *model);
+-void                _gtk_file_system_model_thaw_updates     (GtkFileSystemModel *model);
+ void                _gtk_file_system_model_clear_cache      (GtkFileSystemModel *model,
+                                                              int                 column);
+ 
+diff --git a/gtk/gtkgradient.c b/gtk/gtkgradient.c
+index 3c16fca..8c779d8 100644
+--- a/gtk/gtkgradient.c
++++ b/gtk/gtkgradient.c
+@@ -327,6 +327,7 @@ _gtk_gradient_resolve_full (GtkGradient             *gradient,
+         {
+           rgba = *_gtk_css_rgba_value_get_rgba (val);
+           *dependencies = _gtk_css_dependencies_union (*dependencies, stop_deps);
++          _gtk_css_value_unref (val);
+         }
+       else
+         {
+@@ -467,7 +468,7 @@ gtk_gradient_fade (GtkGradient *gradient,
+ 
+       stop = &g_array_index (gradient->stops, ColorStop, i);
+       color = gtk_symbolic_color_new_alpha (stop->color, opacity);
+-      gtk_gradient_add_color_stop (gradient, stop->offset, color);
++      gtk_gradient_add_color_stop (faded, stop->offset, color);
+       gtk_symbolic_color_unref (color);
+     }
+ 
+diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
+index 6f23914..49ee9bc 100644
+--- a/gtk/gtkiconhelper.c
++++ b/gtk/gtkiconhelper.c
+@@ -20,6 +20,7 @@
+ #include "config.h"
+ 
+ #include "gtkiconhelperprivate.h"
++#include "string.h"
+ 
+ G_DEFINE_TYPE (GtkIconHelper, _gtk_icon_helper, G_TYPE_OBJECT)
+ 
+@@ -466,7 +467,8 @@ _gtk_icon_helper_set_stock_id (GtkIconHelper *self,
+ {
+   _gtk_icon_helper_clear (self);
+ 
+-  if (stock_id != NULL)
++  if (stock_id != NULL &&
++      g_strcmp0 (stock_id, "") != 0)
+     {
+       self->priv->storage_type = GTK_IMAGE_STOCK;
+       self->priv->stock_id = g_strdup (stock_id);
+diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c
+index b46dd3a..ef8f3cd 100644
+--- a/gtk/gtkmenubutton.c
++++ b/gtk/gtkmenubutton.c
+@@ -806,6 +806,23 @@ gtk_menu_button_get_menu_model (GtkMenuButton *menu_button)
+   return menu_button->priv->model;
+ }
+ 
++static void
++set_align_widget_pointer (GtkMenuButton *menu_button,
++                          GtkWidget     *align_widget)
++{
++  GtkMenuButtonPrivate *priv;
++
++  priv = menu_button->priv;
++
++  if (priv->align_widget)
++    g_object_remove_weak_pointer (G_OBJECT (priv->align_widget), (gpointer *) &priv->align_widget);
++
++  priv->align_widget = align_widget;
++
++  if (align_widget)
++    g_object_add_weak_pointer (G_OBJECT (priv->align_widget), (gpointer *) &priv->align_widget);
++}
++
+ /**
+  * gtk_menu_button_set_align_widget:
+  * @menu_button: a #GtkMenuButton
+@@ -832,10 +849,7 @@ gtk_menu_button_set_align_widget (GtkMenuButton *menu_button,
+   if (priv->align_widget == align_widget)
+     return;
+ 
+-  priv->align_widget = align_widget;
+-
+-  if (priv->align_widget)
+-    g_object_add_weak_pointer (G_OBJECT (priv->align_widget), (gpointer *) &priv->align_widget);
++  set_align_widget_pointer (menu_button, align_widget);
+ 
+   g_object_notify (G_OBJECT (menu_button), "align-widget");
+ }
+@@ -926,8 +940,11 @@ gtk_menu_button_dispose (GObject *object)
+                                             menu_deactivate_cb,
+                                             object);
+       gtk_menu_detach (GTK_MENU (priv->popup));
++      priv->popup = NULL;
+     }
+ 
++  set_align_widget_pointer (GTK_MENU_BUTTON (object), NULL);
++
+   g_clear_object (&priv->model);
+ 
+   G_OBJECT_CLASS (gtk_menu_button_parent_class)->dispose (object);
+diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
+index 25c5a44..be388c9 100644
+--- a/gtk/gtkscale.c
++++ b/gtk/gtkscale.c
+@@ -221,6 +221,21 @@ gtk_scale_notify (GObject    *object,
+     G_OBJECT_CLASS (gtk_scale_parent_class)->notify (object, pspec);
+ }
+ 
++static void
++gtk_scale_update_style (GtkScale *scale)
++{
++  gint slider_length;
++  GtkRange *range;
++
++  range = GTK_RANGE (scale);
++
++  gtk_widget_style_get (GTK_WIDGET (scale),
++                        "slider-length", &slider_length,
++                        NULL);
++
++  gtk_range_set_min_slider_size (range, slider_length);
++  _gtk_scale_clear_layout (scale);
++}
+ 
+ #define add_slider_binding(binding_set, keyval, mask, scroll)              \
+   gtk_binding_entry_add_signal (binding_set, keyval, mask,                 \
+@@ -492,6 +507,7 @@ gtk_scale_init (GtkScale *scale)
+ 
+   context = gtk_widget_get_style_context (GTK_WIDGET (scale));
+   gtk_style_context_add_class (context, GTK_STYLE_CLASS_SCALE);
++  gtk_scale_update_style (scale);
+ }
+ 
+ static void
+@@ -1020,18 +1036,7 @@ gtk_scale_get_mark_label_size (GtkScale        *scale,
+ static void
+ gtk_scale_style_updated (GtkWidget *widget)
+ {
+-  gint slider_length;
+-  GtkRange *range;
+-
+-  range = GTK_RANGE (widget);
+-  
+-  gtk_widget_style_get (widget,
+-                        "slider-length", &slider_length,
+-                        NULL);
+-
+-  gtk_range_set_min_slider_size (range, slider_length);
+-
+-  _gtk_scale_clear_layout (GTK_SCALE (widget));
++  gtk_scale_update_style (GTK_SCALE (widget));
+ 
+   GTK_WIDGET_CLASS (gtk_scale_parent_class)->style_updated (widget);
+ }
+diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c
+index 541acc3..9062118 100644
+--- a/gtk/gtkscrollbar.c
++++ b/gtk/gtkscrollbar.c
+@@ -115,21 +115,13 @@ gtk_scrollbar_class_init (GtkScrollbarClass *class)
+ }
+ 
+ static void
+-gtk_scrollbar_init (GtkScrollbar *scrollbar)
+-{
+-  GtkStyleContext *context;
+-
+-  context = gtk_widget_get_style_context (GTK_WIDGET (scrollbar));
+-  gtk_style_context_add_class (context, GTK_STYLE_CLASS_SCROLLBAR);
+-}
+-
+-static void
+-gtk_scrollbar_style_updated (GtkWidget *widget)
++gtk_scrollbar_update_style (GtkScrollbar *scrollbar)
+ {
+-  GtkRange *range = GTK_RANGE (widget);
+   gint slider_length;
+   gboolean fixed_size;
+   gboolean has_a, has_b, has_c, has_d;
++  GtkRange *range = GTK_RANGE (scrollbar);
++  GtkWidget *widget = GTK_WIDGET (scrollbar);
+ 
+   gtk_widget_style_get (widget,
+                         "min-slider-length", &slider_length,
+@@ -144,7 +136,22 @@ gtk_scrollbar_style_updated (GtkWidget *widget)
+   gtk_range_set_slider_size_fixed (range, fixed_size);
+   _gtk_range_set_steppers (range,
+                            has_a, has_b, has_c, has_d);
++}
+ 
++static void
++gtk_scrollbar_init (GtkScrollbar *scrollbar)
++{
++  GtkStyleContext *context;
++
++  context = gtk_widget_get_style_context (GTK_WIDGET (scrollbar));
++  gtk_style_context_add_class (context, GTK_STYLE_CLASS_SCROLLBAR);
++  gtk_scrollbar_update_style (scrollbar);
++}
++
++static void
++gtk_scrollbar_style_updated (GtkWidget *widget)
++{
++  gtk_scrollbar_update_style (GTK_SCROLLBAR (widget));
+   GTK_WIDGET_CLASS (gtk_scrollbar_parent_class)->style_updated (widget);
+ }
+ 
+diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
+index a18c4cf..7929863 100644
+--- a/gtk/gtkscrolledwindow.c
++++ b/gtk/gtkscrolledwindow.c
+@@ -274,9 +274,6 @@ static void  gtk_scrolled_window_realize               (GtkWidget           *wid
+ static void  gtk_scrolled_window_unrealize             (GtkWidget           *widget);
+ static void  gtk_scrolled_window_map                   (GtkWidget           *widget);
+ static void  gtk_scrolled_window_unmap                 (GtkWidget           *widget);
+-static void  gtk_scrolled_window_state_flags_changed   (GtkWidget           *widget,
+-                                                        GtkStateFlags        previous_state);
+-static void  gtk_scrolled_window_style_updated         (GtkWidget           *widget);
+ 
+ static void  gtk_scrolled_window_grab_notify           (GtkWidget           *widget,
+                                                         gboolean             was_grabbed);
+@@ -352,8 +349,6 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
+   widget_class->unrealize = gtk_scrolled_window_unrealize;
+   widget_class->map = gtk_scrolled_window_map;
+   widget_class->unmap = gtk_scrolled_window_unmap;
+-  widget_class->state_flags_changed = gtk_scrolled_window_state_flags_changed;
+-  widget_class->style_updated = gtk_scrolled_window_style_updated;
+   widget_class->grab_notify = gtk_scrolled_window_grab_notify;
+ 
+   container_class->add = gtk_scrolled_window_add;
+@@ -3379,14 +3374,13 @@ gtk_scrolled_window_realize (GtkWidget *widget)
+   attributes.wclass = GDK_INPUT_OUTPUT;
+   attributes.visual = gtk_widget_get_visual (widget);
+   attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK |
+-    GDK_BUTTON_MOTION_MASK | GDK_TOUCH_MASK;
++    GDK_BUTTON_MOTION_MASK | GDK_TOUCH_MASK | GDK_EXPOSURE_MASK;
+ 
+   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
+ 
+   scrolled_window->priv->overshoot_window =
+     gdk_window_new (gtk_widget_get_parent_window (widget),
+                     &attributes, attributes_mask);
+-
+   gdk_window_set_user_data (scrolled_window->priv->overshoot_window, widget);
+ 
+   child_widget = gtk_bin_get_child (GTK_BIN (widget));
+@@ -3433,37 +3427,6 @@ gtk_scrolled_window_unmap (GtkWidget *widget)
+ }
+ 
+ static void
+-_gtk_scrolled_window_update_background (GtkScrolledWindow *scrolled_window)
+-{
+-  GtkWidget *widget = GTK_WIDGET (scrolled_window);
+-
+-  if (gtk_widget_get_realized (widget))
+-    {
+-      GtkStyleContext *context;
+-
+-      context = gtk_widget_get_style_context (widget);
+-      gtk_style_context_set_background (context, scrolled_window->priv->overshoot_window);
+-    }
+-}
+-
+-static void
+-gtk_scrolled_window_state_flags_changed (GtkWidget     *widget,
+-                                         GtkStateFlags  previous_state)
+-{
+-  _gtk_scrolled_window_update_background (GTK_SCROLLED_WINDOW (widget));
+-  gtk_widget_queue_draw (widget);
+-}
+-
+-static void
+-gtk_scrolled_window_style_updated (GtkWidget *widget)
+-{
+-  GTK_WIDGET_CLASS (gtk_scrolled_window_parent_class)->style_updated (widget);
+-
+-  _gtk_scrolled_window_update_background (GTK_SCROLLED_WINDOW (widget));
+-  gtk_widget_queue_draw (widget);
+-}
+-
+-static void
+ gtk_scrolled_window_grab_notify (GtkWidget *widget,
+                                  gboolean   was_grabbed)
+ {
+diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
+index 5939e88..4b9e1e5 100644
+--- a/gtk/gtksettings.c
++++ b/gtk/gtksettings.c
+@@ -1848,6 +1848,9 @@ gtk_settings_notify (GObject    *object,
+       if (settings_update_fontconfig (settings))
+         gtk_style_context_reset_widgets (priv->screen);
+       break;
++    case PROP_ENABLE_ANIMATIONS:
++      gtk_style_context_reset_widgets (priv->screen);
++      break;
+     case PROP_CURSOR_THEME_NAME:
+     case PROP_CURSOR_THEME_SIZE:
+       settings_update_cursor_theme (settings);
+diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
+index b5b043d..091505a 100644
+--- a/gtk/gtksizegroup.c
++++ b/gtk/gtksizegroup.c
+@@ -746,6 +746,11 @@ compute_dimension (GtkWidget        *widget,
+ 		  min_dimension = *minimum;
+ 		  nat_dimension = *natural;
+ 		}
++              else if (!gtk_widget_get_mapped (tmp_widget) && priv->ignore_hidden)
++		{
++		  min_dimension = 0;
++		  nat_dimension = 0;
++		}
+ 	      else
+ 		{
+ 		  if (mode == GTK_SIZE_GROUP_HORIZONTAL)
+@@ -754,11 +759,8 @@ compute_dimension (GtkWidget        *widget,
+ 		    gtk_widget_get_preferred_height (tmp_widget, &min_dimension, &nat_dimension);
+ 		}
+ 
+-	      if (gtk_widget_get_mapped (tmp_widget) || !priv->ignore_hidden)
+-		{
+-		  min_result = MAX (min_result, min_dimension);
+-		  nat_result = MAX (nat_result, nat_dimension);
+-		}
++              min_result = MAX (min_result, min_dimension);
++              nat_result = MAX (nat_result, nat_dimension);
+ 
+ 	      tmp_list = tmp_list->next;
+ 	    }
+diff --git a/gtk/gtktexthandle.c b/gtk/gtktexthandle.c
+index 3738d02..3d06ee4 100644
+--- a/gtk/gtktexthandle.c
++++ b/gtk/gtktexthandle.c
+@@ -122,49 +122,43 @@ _gtk_text_handle_draw (GtkTextHandle         *handle,
+ }
+ 
+ static void
+-_gtk_text_handle_update_shape (GtkTextHandle *handle,
+-                               GdkWindow     *window)
++_gtk_text_handle_update_shape (GtkTextHandle         *handle,
++                               GdkWindow             *window,
++                               GtkTextHandlePosition  pos)
+ {
+   GtkTextHandlePrivate *priv;
++  cairo_surface_t *surface;
++  cairo_region_t *region;
++  cairo_t *cr;
+ 
+   priv = handle->priv;
+ 
++  surface =
++    gdk_window_create_similar_surface (window,
++                                       CAIRO_CONTENT_COLOR_ALPHA,
++                                       gdk_window_get_width (window),
++                                       gdk_window_get_height (window));
++
++  cr = cairo_create (surface);
++  _gtk_text_handle_draw (handle, cr, pos);
++  cairo_destroy (cr);
++
++  region = gdk_cairo_region_create_from_surface (surface);
++
+   if (gtk_widget_is_composited (priv->parent))
+     gdk_window_shape_combine_region (window, NULL, 0, 0);
+   else
+-    {
+-      GtkTextHandlePosition pos;
+-      cairo_surface_t *surface;
+-      cairo_region_t *region;
+-      cairo_t *cr;
+-
+-      if (window == priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_START].window)
+-        pos = GTK_TEXT_HANDLE_POSITION_SELECTION_START;
+-      else if (window == priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_END].window)
+-        pos = GTK_TEXT_HANDLE_POSITION_SELECTION_END;
+-      else
+-        return;
++    gdk_window_shape_combine_region (window, region, 0, 0);
+ 
+-      surface =
+-        gdk_window_create_similar_surface (window,
+-                                           CAIRO_CONTENT_COLOR_ALPHA,
+-                                           gdk_window_get_width (window),
+-                                           gdk_window_get_height (window));
++  gdk_window_input_shape_combine_region (window, region, 0, 0);
+ 
+-      cr = cairo_create (surface);
+-      _gtk_text_handle_draw (handle, cr, pos);
+-      cairo_destroy (cr);
+-
+-      region = gdk_cairo_region_create_from_surface (surface);
+-      gdk_window_shape_combine_region (window, region, 0, 0);
+-
+-      cairo_surface_destroy (surface);
+-      cairo_region_destroy (region);
+-    }
++  cairo_surface_destroy (surface);
++  cairo_region_destroy (region);
+ }
+ 
+ static GdkWindow *
+-_gtk_text_handle_create_window (GtkTextHandle *handle)
++_gtk_text_handle_create_window (GtkTextHandle         *handle,
++                                GtkTextHandlePosition  pos)
+ {
+   GtkTextHandlePrivate *priv;
+   GdkRGBA bg = { 0, 0, 0, 0 };
+@@ -200,7 +194,7 @@ _gtk_text_handle_create_window (GtkTextHandle *handle)
+   gdk_window_set_user_data (window, priv->parent);
+   gdk_window_set_background_rgba (window, &bg);
+ 
+-  _gtk_text_handle_update_shape (handle, window);
++  _gtk_text_handle_update_shape (handle, window, pos);
+ 
+   return window;
+ }
+@@ -307,7 +301,7 @@ _gtk_text_handle_update_window (GtkTextHandle         *handle,
+   gdk_window_destroy (handle_window->window);
+ 
+   /* Create new window and apply old state */
+-  handle_window->window = _gtk_text_handle_create_window (handle);
++  handle_window->window = _gtk_text_handle_create_window (handle, pos);
+ 
+   if (visible)
+     {
+@@ -531,9 +525,9 @@ _gtk_text_handle_set_relative_to (GtkTextHandle *handle,
+     {
+       priv->relative_to = g_object_ref (window);
+       priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_START].window =
+-        _gtk_text_handle_create_window (handle);
++        _gtk_text_handle_create_window (handle, GTK_TEXT_HANDLE_POSITION_SELECTION_START);
+       priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_END].window =
+-        _gtk_text_handle_create_window (handle);
++        _gtk_text_handle_create_window (handle, GTK_TEXT_HANDLE_POSITION_SELECTION_END);
+       priv->realized = TRUE;
+     }
+   else
+@@ -580,6 +574,10 @@ _gtk_text_handle_set_mode (GtkTextHandle     *handle,
+     }
+ 
+   priv->mode = mode;
++
++  _gtk_text_handle_update_shape (handle,
++                                 priv->windows[GTK_TEXT_HANDLE_POSITION_CURSOR].window,
++                                 GTK_TEXT_HANDLE_POSITION_CURSOR);
+ }
+ 
+ GtkTextHandleMode
+diff --git a/po/ga.po b/po/ga.po
+index d0faad3..8d66617 100644
+--- a/po/ga.po
++++ b/po/ga.po
+@@ -4,14 +4,14 @@
+ # Seán Ó Ceallaigh <soc@users.sourceforge.net>, 1999.
+ # Alastair McKinstry <mckinstry@computer.org>, 2004.
+ # Alan Horkan <horkan@maths.tcd.ie>, 2005.
+-# Seán de Búrca <leftmostcat@gmail.com>, 2007, 2008, 2009, 2010.
++# Seán de Búrca <leftmostcat@gmail.com>, 2007, 2008, 2009, 2010, 2012.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gtk+.master\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2010-10-01 15:41-0400\n"
+-"PO-Revision-Date: 2010-06-08 12:30-0600\n"
++"POT-Creation-Date: 2012-11-02 03:00-0600\n"
++"PO-Revision-Date: 2012-11-02 03:16-0600\n"
+ "Last-Translator: Seán de Búrca <leftmostcat@gmail.com>\n"
+ "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
+ "Language: ga\n"
+@@ -20,303 +20,436 @@ msgstr ""
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=5; plural=n==1 ? 0 : (n%10==1 || n%10==2) ? 1 : (n"
+ "%10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n"
++"X-Generator: Gtranslator 2.91.5\n"
+ 
+-#: gdk/gdk.c:103
++#: ../gdk/gdk.c:155
+ #, c-format
+ msgid "Error parsing option --gdk-debug"
+ msgstr "Earráid agus rogha --gdk-debug á parsáil"
+ 
+-#: gdk/gdk.c:123
++#: ../gdk/gdk.c:175
+ #, c-format
+ msgid "Error parsing option --gdk-no-debug"
+ msgstr "Earráid agus rogha --gdk-no-debug á parsáil"
+ 
+ #. Description of --class=CLASS in --help output
+-#: gdk/gdk.c:151
++#: ../gdk/gdk.c:203
+ msgid "Program class as used by the window manager"
+ msgstr "Aicme chláir mar úsáidte leis an mbainisteoir fuinneoga"
+ 
+ #. Placeholder in --class=CLASS in --help output
+-#: gdk/gdk.c:152
++#: ../gdk/gdk.c:204
+ msgid "CLASS"
+ msgstr "AICME"
+ 
+ #. Description of --name=NAME in --help output
+-#: gdk/gdk.c:154
++#: ../gdk/gdk.c:206
+ msgid "Program name as used by the window manager"
+ msgstr "Ainm cláir mar úsáidte leis an mbainisteoir fuinneoga"
+ 
+ #. Placeholder in --name=NAME in --help output
+-#: gdk/gdk.c:155
++#: ../gdk/gdk.c:207
+ msgid "NAME"
+ msgstr "AINM"
+ 
+ #. Description of --display=DISPLAY in --help output
+-#: gdk/gdk.c:157
++#: ../gdk/gdk.c:209
+ msgid "X display to use"
+ msgstr "Taispeáint X le húsáid"
+ 
+ #. Placeholder in --display=DISPLAY in --help output
+-#: gdk/gdk.c:158
++#: ../gdk/gdk.c:210
+ msgid "DISPLAY"
+ msgstr "TAISPEÁINT"
+ 
+-#. Description of --screen=SCREEN in --help output
+-#: gdk/gdk.c:160
+-msgid "X screen to use"
+-msgstr "Scáileán X le húsáid"
+-
+-#. Placeholder in --screen=SCREEN in --help output
+-#: gdk/gdk.c:161
+-msgid "SCREEN"
+-msgstr "SCÁILEÁN"
+-
+ #. Description of --gdk-debug=FLAGS in --help output
+-#: gdk/gdk.c:164
+-#, fuzzy
++#: ../gdk/gdk.c:213
+ msgid "GDK debugging flags to set"
+-msgstr "Bratacha dífhabhtaithe GTK+ a shocrú"
++msgstr "Bratacha dífhabhtaithe GTK+ le socrú"
+ 
+ #. Placeholder in --gdk-debug=FLAGS in --help output
+ #. Placeholder in --gdk-no-debug=FLAGS in --help output
+ #. Placeholder in --gtk-debug=FLAGS in --help output
+ #. Placeholder in --gtk-no-debug=FLAGS in --help output
+-#: gdk/gdk.c:165 gdk/gdk.c:168 gtk/gtkmain.c:533 gtk/gtkmain.c:536
++#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:454 ../gtk/gtkmain.c:457
+ msgid "FLAGS"
+ msgstr "BRATACHA"
+ 
+ #. Description of --gdk-no-debug=FLAGS in --help output
+-#: gdk/gdk.c:167
+-#, fuzzy
++#: ../gdk/gdk.c:216
+ msgid "GDK debugging flags to unset"
+-msgstr "Bratacha dífhabhtaithe GTK+ a dhíshocrú"
++msgstr "Bratacha dífhabhtaithe GTK+ le díshocrú"
+ 
+-#: gdk/keyname-table.h:3940
++#.
++#. * Translators, the strings in the 'keyboard label' context are
++#. * display names for keyboard keys. Some of them have prefixes like
++#. * XF86 or ISO_ - these should be removed in the translation. Similarly,
++#. * underscores should be replaced by spaces. The prefix 'KP_' stands
++#. * for 'key pad' and you may want to include that in your translation.
++#. * Here are some examples of English translations:
++#. * XF86AudioMute - Audio mute
++#. * Scroll_lock   - Scroll lock
++#. * KP_Space      - Space (keypad)
++#. * Page_Up       - Page up
++#.
++#: ../gdk/keyname-table.h:3952
+ msgctxt "keyboard label"
+ msgid "BackSpace"
+ msgstr "BackSpace"
+ 
+-#: gdk/keyname-table.h:3941
++#: ../gdk/keyname-table.h:3953
+ msgctxt "keyboard label"
+ msgid "Tab"
+ msgstr "Tab"
+ 
+-#: gdk/keyname-table.h:3942
++#: ../gdk/keyname-table.h:3954
+ msgctxt "keyboard label"
+ msgid "Return"
+ msgstr "Return"
+ 
+-#: gdk/keyname-table.h:3943
++#: ../gdk/keyname-table.h:3955
+ msgctxt "keyboard label"
+ msgid "Pause"
+ msgstr "Pause"
+ 
+-#: gdk/keyname-table.h:3944
++#: ../gdk/keyname-table.h:3956
+ msgctxt "keyboard label"
+ msgid "Scroll_Lock"
+ msgstr "Scroll_Lock"
+ 
+-#: gdk/keyname-table.h:3945
++#: ../gdk/keyname-table.h:3957
+ msgctxt "keyboard label"
+ msgid "Sys_Req"
+ msgstr "Sys_Req"
+ 
+-#: gdk/keyname-table.h:3946
++#: ../gdk/keyname-table.h:3958
+ msgctxt "keyboard label"
+ msgid "Escape"
+ msgstr "Escape"
+ 
+-#: gdk/keyname-table.h:3947
++#: ../gdk/keyname-table.h:3959
+ msgctxt "keyboard label"
+ msgid "Multi_key"
+ msgstr "Multi_key"
+ 
+-#: gdk/keyname-table.h:3948
++#: ../gdk/keyname-table.h:3960
+ msgctxt "keyboard label"
+ msgid "Home"
+ msgstr "Home"
+ 
+-#: gdk/keyname-table.h:3949
++#: ../gdk/keyname-table.h:3961
+ msgctxt "keyboard label"
+ msgid "Left"
+ msgstr "Left"
+ 
+-#: gdk/keyname-table.h:3950
++#: ../gdk/keyname-table.h:3962
+ msgctxt "keyboard label"
+ msgid "Up"
+ msgstr "Up"
+ 
+-#: gdk/keyname-table.h:3951
++#: ../gdk/keyname-table.h:3963
+ msgctxt "keyboard label"
+ msgid "Right"
+ msgstr "Right"
+ 
+-#: gdk/keyname-table.h:3952
++#: ../gdk/keyname-table.h:3964
+ msgctxt "keyboard label"
+ msgid "Down"
+ msgstr "Down"
+ 
+-#: gdk/keyname-table.h:3953
++#: ../gdk/keyname-table.h:3965
+ msgctxt "keyboard label"
+ msgid "Page_Up"
+ msgstr "Page_Up"
+ 
+-#: gdk/keyname-table.h:3954
++#: ../gdk/keyname-table.h:3966
+ msgctxt "keyboard label"
+ msgid "Page_Down"
+ msgstr "Page_Down"
+ 
+-#: gdk/keyname-table.h:3955
++#: ../gdk/keyname-table.h:3967
+ msgctxt "keyboard label"
+ msgid "End"
+ msgstr "End"
+ 
+-#: gdk/keyname-table.h:3956
++#: ../gdk/keyname-table.h:3968
+ msgctxt "keyboard label"
+ msgid "Begin"
+ msgstr "Begin"
+ 
+-#: gdk/keyname-table.h:3957
++#: ../gdk/keyname-table.h:3969
+ msgctxt "keyboard label"
+ msgid "Print"
+ msgstr "Print"
+ 
+-#: gdk/keyname-table.h:3958
++#: ../gdk/keyname-table.h:3970
+ msgctxt "keyboard label"
+ msgid "Insert"
+ msgstr "Insert"
+ 
+-#: gdk/keyname-table.h:3959
++#: ../gdk/keyname-table.h:3971
+ msgctxt "keyboard label"
+ msgid "Num_Lock"
+ msgstr "Num_Lock"
+ 
+-#: gdk/keyname-table.h:3960
++#. Translators: KP_ means 'key pad' here
++#: ../gdk/keyname-table.h:3973
+ msgctxt "keyboard label"
+ msgid "KP_Space"
+ msgstr "KP_Space"
+ 
+-#: gdk/keyname-table.h:3961
++#: ../gdk/keyname-table.h:3974
+ msgctxt "keyboard label"
+ msgid "KP_Tab"
+ msgstr "KP_Tab"
+ 
+-#: gdk/keyname-table.h:3962
++#: ../gdk/keyname-table.h:3975
+ msgctxt "keyboard label"
+ msgid "KP_Enter"
+ msgstr "KP_Enter"
+ 
+-#: gdk/keyname-table.h:3963
++#: ../gdk/keyname-table.h:3976
+ msgctxt "keyboard label"
+ msgid "KP_Home"
+ msgstr "KP_Home"
+ 
+-#: gdk/keyname-table.h:3964
++#: ../gdk/keyname-table.h:3977
+ msgctxt "keyboard label"
+ msgid "KP_Left"
+ msgstr "KP_Left"
+ 
+-#: gdk/keyname-table.h:3965
++#: ../gdk/keyname-table.h:3978
+ msgctxt "keyboard label"
+ msgid "KP_Up"
+ msgstr "KP_Up"
+ 
+-#: gdk/keyname-table.h:3966
++#: ../gdk/keyname-table.h:3979
+ msgctxt "keyboard label"
+ msgid "KP_Right"
+ msgstr "KP_Right"
+ 
+-#: gdk/keyname-table.h:3967
++#: ../gdk/keyname-table.h:3980
+ msgctxt "keyboard label"
+ msgid "KP_Down"
+ msgstr "KP_Down"
+ 
+-#: gdk/keyname-table.h:3968
++#: ../gdk/keyname-table.h:3981
+ msgctxt "keyboard label"
+ msgid "KP_Page_Up"
+ msgstr "KP_Page_Up"
+ 
+-#: gdk/keyname-table.h:3969
++#: ../gdk/keyname-table.h:3982
+ msgctxt "keyboard label"
+ msgid "KP_Prior"
+ msgstr "KP_Prior"
+ 
+-#: gdk/keyname-table.h:3970
++#: ../gdk/keyname-table.h:3983
+ msgctxt "keyboard label"
+ msgid "KP_Page_Down"
+ msgstr "KP_Page_Down"
+ 
+-#: gdk/keyname-table.h:3971
++#: ../gdk/keyname-table.h:3984
+ msgctxt "keyboard label"
+ msgid "KP_Next"
+ msgstr "KP_Next"
+ 
+-#: gdk/keyname-table.h:3972
++#: ../gdk/keyname-table.h:3985
+ msgctxt "keyboard label"
+ msgid "KP_End"
+ msgstr "KP_End"
+ 
+-#: gdk/keyname-table.h:3973
++#: ../gdk/keyname-table.h:3986
+ msgctxt "keyboard label"
+ msgid "KP_Begin"
+ msgstr "KP_Begin"
+ 
+-#: gdk/keyname-table.h:3974
++#: ../gdk/keyname-table.h:3987
+ msgctxt "keyboard label"
+ msgid "KP_Insert"
+ msgstr "KP_Insert"
+ 
+-#: gdk/keyname-table.h:3975
++#: ../gdk/keyname-table.h:3988
+ msgctxt "keyboard label"
+ msgid "KP_Delete"
+ msgstr "KP_Delete"
+ 
+-#: gdk/keyname-table.h:3976
++#: ../gdk/keyname-table.h:3989
+ msgctxt "keyboard label"
+ msgid "Delete"
+ msgstr "Delete"
+ 
++#. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
++#: ../gdk/keyname-table.h:3991
++msgctxt "keyboard label"
++msgid "XF86MonBrightnessUp"
++msgstr "XF86MonBrightnessUp"
++
++#: ../gdk/keyname-table.h:3992
++msgctxt "keyboard label"
++msgid "XF86MonBrightnessDown"
++msgstr "XF86MonBrightnessDown"
++
++#: ../gdk/keyname-table.h:3993
++msgctxt "keyboard label"
++msgid "XF86AudioMute"
++msgstr "XF86AudioMute"
++
++#: ../gdk/keyname-table.h:3994
++msgctxt "keyboard label"
++msgid "XF86AudioLowerVolume"
++msgstr "XF86AudioLowerVolume"
++
++#: ../gdk/keyname-table.h:3995
++msgctxt "keyboard label"
++msgid "XF86AudioRaiseVolume"
++msgstr "XF86AudioRaiseVolume"
++
++#: ../gdk/keyname-table.h:3996
++msgctxt "keyboard label"
++msgid "XF86AudioPlay"
++msgstr "XF86AudioPlay"
++
++#: ../gdk/keyname-table.h:3997
++msgctxt "keyboard label"
++msgid "XF86AudioStop"
++msgstr "XF86AudioStop"
++
++#: ../gdk/keyname-table.h:3998
++msgctxt "keyboard label"
++msgid "XF86AudioNext"
++msgstr "XF86AudioNext"
++
++#: ../gdk/keyname-table.h:3999
++msgctxt "keyboard label"
++msgid "XF86AudioPrev"
++msgstr "XF86AudioPrev"
++
++#: ../gdk/keyname-table.h:4000
++msgctxt "keyboard label"
++msgid "XF86AudioRecord"
++msgstr "XF86AudioRecord"
++
++#: ../gdk/keyname-table.h:4001
++msgctxt "keyboard label"
++msgid "XF86AudioPause"
++msgstr "XF86AudioPause"
++
++#: ../gdk/keyname-table.h:4002
++msgctxt "keyboard label"
++msgid "XF86AudioRewind"
++msgstr "XF86AudioRewind"
++
++#: ../gdk/keyname-table.h:4003
++msgctxt "keyboard label"
++msgid "XF86AudioMedia"
++msgstr "XF86AudioMedia"
++
++#: ../gdk/keyname-table.h:4004
++msgctxt "keyboard label"
++msgid "XF86ScreenSaver"
++msgstr "XF86ScreenSaver"
++
++#: ../gdk/keyname-table.h:4005
++msgctxt "keyboard label"
++msgid "XF86Battery"
++msgstr "XF86Battery"
++
++#: ../gdk/keyname-table.h:4006
++msgctxt "keyboard label"
++msgid "XF86Launch1"
++msgstr "XF86Launch1"
++
++#: ../gdk/keyname-table.h:4007
++msgctxt "keyboard label"
++msgid "XF86Forward"
++msgstr "XF86Forward"
++
++#: ../gdk/keyname-table.h:4008
++msgctxt "keyboard label"
++msgid "XF86Back"
++msgstr "XF86Back"
++
++#: ../gdk/keyname-table.h:4009
++msgctxt "keyboard label"
++msgid "XF86Sleep"
++msgstr "XF86Sleep"
++
++#: ../gdk/keyname-table.h:4010
++msgctxt "keyboard label"
++msgid "XF86Hibernate"
++msgstr "XF86Hibernate"
++
++#: ../gdk/keyname-table.h:4011
++msgctxt "keyboard label"
++msgid "XF86WLAN"
++msgstr "XF86WLAN"
++
++#: ../gdk/keyname-table.h:4012
++msgctxt "keyboard label"
++msgid "XF86WebCam"
++msgstr "XF86WebCam"
++
++#: ../gdk/keyname-table.h:4013
++msgctxt "keyboard label"
++msgid "XF86Display"
++msgstr "XF86Display"
++
++#: ../gdk/keyname-table.h:4014
++msgctxt "keyboard label"
++msgid "XF86TouchpadToggle"
++msgstr "XF86TouchpadToggle"
++
++#: ../gdk/keyname-table.h:4015
++msgctxt "keyboard label"
++msgid "XF86WakeUp"
++msgstr "XF86WakeUp"
++
++#: ../gdk/keyname-table.h:4016
++msgctxt "keyboard label"
++msgid "XF86Suspend"
++msgstr "XF86Suspend"
++
+ #. Description of --sync in --help output
+-#: gdk/win32/gdkmain-win32.c:54
++#: ../gdk/win32/gdkmain-win32.c:53
+ msgid "Don't batch GDI requests"
+ msgstr "Ná baisc iarratais GDI"
+ 
+ #. Description of --no-wintab in --help output
+-#: gdk/win32/gdkmain-win32.c:56
++#: ../gdk/win32/gdkmain-win32.c:55
+ msgid "Don't use the Wintab API for tablet support"
+ msgstr "Ná húsáid an API Wintab le tacaíocht táibléid"
+ 
+ #. Description of --ignore-wintab in --help output
+-#: gdk/win32/gdkmain-win32.c:58
++#: ../gdk/win32/gdkmain-win32.c:57
+ msgid "Same as --no-wintab"
+ msgstr "Céanna le --no-wintab"
+ 
+ #. Description of --use-wintab in --help output
+-#: gdk/win32/gdkmain-win32.c:60
++#: ../gdk/win32/gdkmain-win32.c:59
+ msgid "Do use the Wintab API [default]"
+ msgstr "Úsáid an API Wintab [réamhshocrú]"
+ 
+ #. Description of --max-colors=COLORS in --help output
+-#: gdk/win32/gdkmain-win32.c:62
++#: ../gdk/win32/gdkmain-win32.c:61
+ msgid "Size of the palette in 8 bit mode"
+ msgstr "Méid an phailéid sa mhód 8-giotán"
+ 
+ #. Placeholder in --max-colors=COLORS in --help output
+-#: gdk/win32/gdkmain-win32.c:63
++#: ../gdk/win32/gdkmain-win32.c:62
+ msgid "COLORS"
+ msgstr "DATHANNA"
+ 
+-#: gdk/x11/gdkapplaunchcontext-x11.c:312
++#: ../gdk/x11/gdkapplaunchcontext-x11.c:292
+ #, c-format
+ msgid "Starting %s"
+ msgstr "%s á Thosú"
+ 
+-#: gdk/x11/gdkapplaunchcontext-x11.c:316
++#: ../gdk/x11/gdkapplaunchcontext-x11.c:305
+ #, c-format
+ msgid "Opening %s"
+ msgstr "%s á Oscailt"
+ 
+-#: gdk/x11/gdkapplaunchcontext-x11.c:321
++#: ../gdk/x11/gdkapplaunchcontext-x11.c:310
+ #, c-format
+ msgid "Opening %d Item"
+ msgid_plural "Opening %d Items"
+@@ -326,63 +459,245 @@ msgstr[2] "%d Mhír á Oscailt"
+ msgstr[3] "%d Mír á Oscailt"
+ msgstr[4] "%d Mír á Oscailt"
+ 
+-#. Description of --sync in --help output
+-#: gdk/x11/gdkmain-x11.c:96
+-msgid "Make X calls synchronous"
+-msgstr "Déan sioncronach glaonna X"
++#: ../gtk/a11y/gtkspinneraccessible.c:40
++msgctxt "throbbing progress animation widget"
++msgid "Spinner"
++msgstr ""
++
++#: ../gtk/a11y/gtkspinneraccessible.c:41
++msgid "Provides visual indication of progress"
++msgstr ""
++
++#: ../gtk/a11y/gtkswitchaccessible.c:63
++msgctxt "light switch widget"
++msgid "Switch"
++msgstr "Lasc"
++
++#: ../gtk/a11y/gtkswitchaccessible.c:64
++msgid "Switches between on and off states"
++msgstr ""
++
++#: ../gtk/deprecated/gtkcolorsel.c:425
++msgid ""
++"Select the color you want from the outer ring. Select the darkness or "
++"lightness of that color using the inner triangle."
++msgstr ""
++"Roghnaigh an dath atá uait ón bhfáinne amuigh. Roghnaigh dorchadas nó gile "
++"an datha sin leis an triantán istigh."
++
++#: ../gtk/deprecated/gtkcolorsel.c:451
++msgid ""
++"Click the eyedropper, then click a color anywhere on your screen to select "
++"that color."
++msgstr ""
++"Cliceáil an titimeán súile, agus ansin cliceáil dath áit ar bith ar do "
++"scáileán chun an dath sin a roghnú."
++
++#: ../gtk/deprecated/gtkcolorsel.c:461
++msgid "_Hue:"
++msgstr "_Lí:"
++
++#: ../gtk/deprecated/gtkcolorsel.c:462
++msgid "Position on the color wheel."
++msgstr "Ionad ar roth na ndathanna."
++
++#: ../gtk/deprecated/gtkcolorsel.c:464
++msgid "S_aturation:"
++msgstr "_Sáithiú:"
++
++#: ../gtk/deprecated/gtkcolorsel.c:465
++msgid "Intensity of the color."
++msgstr "Déine an datha."
++
++#: ../gtk/deprecated/gtkcolorsel.c:466
++msgid "_Value:"
++msgstr "L_uach:"
++
++#: ../gtk/deprecated/gtkcolorsel.c:467
++msgid "Brightness of the color."
++msgstr "Gile an datha."
++
++#: ../gtk/deprecated/gtkcolorsel.c:468
++msgid "_Red:"
++msgstr "_Dearg:"
++
++#: ../gtk/deprecated/gtkcolorsel.c:469
++msgid "Amount of red light in the color."
++msgstr "Méid sholais dhearg sa dath."
++
++#: ../gtk/deprecated/gtkcolorsel.c:470
++msgid "_Green:"
++msgstr "_Uaine:"
++
++#: ../gtk/deprecated/gtkcolorsel.c:471
++msgid "Amount of green light in the color."
++msgstr "Méid sholais uaine sa dath."
++
++#: ../gtk/deprecated/gtkcolorsel.c:472
++msgid "_Blue:"
++msgstr "_Gorm:"
++
++#: ../gtk/deprecated/gtkcolorsel.c:473
++msgid "Amount of blue light in the color."
++msgstr "Méid sholais ghorm sa dath."
++
++#: ../gtk/deprecated/gtkcolorsel.c:476
++msgid "Op_acity:"
++msgstr "Teimhne_acht:"
++
++#: ../gtk/deprecated/gtkcolorsel.c:484 ../gtk/deprecated/gtkcolorsel.c:494
++msgid "Transparency of the color."
++msgstr "Trédhearcacht an datha."
++
++#: ../gtk/deprecated/gtkcolorsel.c:501
++msgid "Color _name:"
++msgstr "Ai_nm datha:"
++
++#: ../gtk/deprecated/gtkcolorsel.c:516
++msgid ""
++"You can enter an HTML-style hexadecimal color value, or simply a color name "
++"such as 'orange' in this entry."
++msgstr ""
++"Is féidir leat luach datha heicsidheachúlach ar stíl HTML a iontráil, nó "
++"ainm datha mar shampla 'orange' a iontráil san iontráil seo."
++
++#: ../gtk/deprecated/gtkcolorsel.c:548
++msgid "_Palette:"
++msgstr "_Pailéad:"
++
++#: ../gtk/deprecated/gtkcolorsel.c:578
++msgid "Color Wheel"
++msgstr "Roth na nDathanna"
++
++#: ../gtk/deprecated/gtkcolorsel.c:1072
++msgid ""
++"The previously-selected color, for comparison to the color you're selecting "
++"now. You can drag this color to a palette entry, or select this color as "
++"current by dragging it to the other color swatch alongside."
++msgstr ""
++
++#: ../gtk/deprecated/gtkcolorsel.c:1078
++msgid ""
++"The color you've chosen. You can drag this color to a palette entry to save "
++"it for use in the future."
++msgstr ""
++"An dath atá roghnaithe agat. Is féidir leat an dath seo a tharraingt go "
++"hiontráil pailéid chun é a shábháil le haghaidh úsáide san am atá le teacht."
++
++#: ../gtk/deprecated/gtkcolorsel.c:1084
++msgid ""
++"The previously-selected color, for comparison to the color you're selecting "
++"now."
++msgstr ""
++
++#: ../gtk/deprecated/gtkcolorsel.c:1088
++msgid "The color you've chosen."
++msgstr "An dath atá roghnaithe agat."
++
++#: ../gtk/deprecated/gtkcolorsel.c:1491
++msgid "_Save color here"
++msgstr "_Sábháil dath anseo"
++
++#: ../gtk/deprecated/gtkcolorsel.c:1695
++msgid ""
++"Click this palette entry to make it the current color. To change this entry, "
++"drag a color swatch here or right-click it and select \"Save color here.\""
++msgstr ""
++
++#. We emit the response for the Select button manually,
++#. * since we want to save the color first
++#.
++#: ../gtk/deprecated/gtkcolorseldialog.c:201 ../gtk/gtkappchooserdialog.c:574
++#: ../gtk/gtkcolorchooserdialog.c:150 ../gtk/gtkfontchooserdialog.c:174
++#: ../gtk/gtkprinteroptionwidget.c:550
++msgid "_Select"
++msgstr "_Roghnaigh"
++
++#: ../gtk/deprecated/gtkcolorseldialog.c:219
++msgid "Color Selection"
++msgstr "Roghnú Datha"
++
++#. This is the default text shown in the preview entry, though the user
++#. can set it. Remember that some fonts only have capital letters.
++#: ../gtk/deprecated/gtkfontsel.c:124
++msgid "abcdefghijk ABCDEFGHIJK"
++msgstr "aábcdeéfghií AÁBCDEÉFGHIÍ"
++
++#: ../gtk/deprecated/gtkfontsel.c:393
++msgid "_Family:"
++msgstr "_Clann:"
++
++#: ../gtk/deprecated/gtkfontsel.c:400
++msgid "_Style:"
++msgstr "_Stíl:"
++
++#: ../gtk/deprecated/gtkfontsel.c:407
++msgid "Si_ze:"
++msgstr "_Méid:"
++
++#. create the text entry widget
++#: ../gtk/deprecated/gtkfontsel.c:584
++msgid "_Preview:"
++msgstr "_Réamhamharc:"
++
++#: ../gtk/deprecated/gtkfontsel.c:1720 ../gtk/gtkfontchooserdialog.c:183
++msgid "Font Selection"
++msgstr "Roghnú Cló"
+ 
+ #. Translators: this is the license preamble; the string at the end
+ #. * contains the URL of the license.
+ #.
+-#: gtk/gtkaboutdialog.c:101
++#: ../gtk/gtkaboutdialog.c:104
+ #, c-format
+-msgid "This program comes with ABSOLUTELY NO WARRANTY; for details, visit %s"
++msgid ""
++"This program comes with ABSOLUTELY NO WARRANTY;\n"
++"for details, visit <a href=\"%s\">%s</a>"
+ msgstr ""
+ 
+-#: gtk/gtkaboutdialog.c:339 gtk/gtkaboutdialog.c:2235
++#: ../gtk/gtkaboutdialog.c:357
+ msgid "License"
+ msgstr "Ceadúnas"
+ 
+-#: gtk/gtkaboutdialog.c:340
++#: ../gtk/gtkaboutdialog.c:358
+ msgid "The license of the program"
+ msgstr "Ceadúnas an chláir"
+ 
+ #. Add the credits button
+-#: gtk/gtkaboutdialog.c:621
++#: ../gtk/gtkaboutdialog.c:751
+ msgid "C_redits"
+ msgstr "_Admhálacha"
+ 
+ #. Add the license button
+-#: gtk/gtkaboutdialog.c:635
++#: ../gtk/gtkaboutdialog.c:764
+ msgid "_License"
+ msgstr "_Ceadúnas"
+ 
+-#: gtk/gtkaboutdialog.c:839
++#: ../gtk/gtkaboutdialog.c:980
+ msgid "Could not show link"
+ msgstr "Níorbh fhéidir nasc a thaispeáint"
+ 
+-#: gtk/gtkaboutdialog.c:932
++#: ../gtk/gtkaboutdialog.c:1017
++msgid "Homepage"
++msgstr "Leathanach Baile"
++
++#: ../gtk/gtkaboutdialog.c:1071
+ #, c-format
+ msgid "About %s"
+ msgstr "Maidir le %s"
+ 
+-#: gtk/gtkaboutdialog.c:2153
+-msgid "Credits"
+-msgstr "Admhálacha"
++#: ../gtk/gtkaboutdialog.c:2399
++msgid "Created by"
++msgstr "Cruthaithe ag"
+ 
+-#: gtk/gtkaboutdialog.c:2185
+-msgid "Written by"
+-msgstr "Scríofa ag"
+-
+-#: gtk/gtkaboutdialog.c:2188
++#: ../gtk/gtkaboutdialog.c:2402
+ msgid "Documented by"
+ msgstr "Doiciméadaithe ag"
+ 
+-#: gtk/gtkaboutdialog.c:2200
++#: ../gtk/gtkaboutdialog.c:2412
+ msgid "Translated by"
+ msgstr "Aistrithe ag"
+ 
+-#: gtk/gtkaboutdialog.c:2204
++#: ../gtk/gtkaboutdialog.c:2417
+ msgid "Artwork by"
+ msgstr "Maisiúchán le"
+ 
+@@ -391,7 +706,7 @@ msgstr "Maisiúchán le"
+ #. * translated on keyboards used for your language, don't translate
+ #. * this.
+ #.
+-#: gtk/gtkaccellabel.c:160
++#: ../gtk/gtkaccellabel.c:159
+ msgctxt "keyboard label"
+ msgid "Shift"
+ msgstr "Shift"
+@@ -401,7 +716,7 @@ msgstr "Shift"
+ #. * translated on keyboards used for your language, don't translate
+ #. * this.
+ #.
+-#: gtk/gtkaccellabel.c:166
++#: ../gtk/gtkaccellabel.c:165
+ msgctxt "keyboard label"
+ msgid "Ctrl"
+ msgstr "Ctrl"
+@@ -411,7 +726,7 @@ msgstr "Ctrl"
+ #. * translated on keyboards used for your language, don't translate
+ #. * this.
+ #.
+-#: gtk/gtkaccellabel.c:172
++#: ../gtk/gtkaccellabel.c:171
+ msgctxt "keyboard label"
+ msgid "Alt"
+ msgstr "Alt"
+@@ -421,7 +736,7 @@ msgstr "Alt"
+ #. * translated on keyboards used for your language, don't translate
+ #. * this.
+ #.
+-#: gtk/gtkaccellabel.c:770
++#: ../gtk/gtkaccellabel.c:805
+ msgctxt "keyboard label"
+ msgid "Super"
+ msgstr "Super"
+@@ -431,7 +746,7 @@ msgstr "Super"
+ #. * translated on keyboards used for your language, don't translate
+ #. * this.
+ #.
+-#: gtk/gtkaccellabel.c:783
++#: ../gtk/gtkaccellabel.c:818
+ msgctxt "keyboard label"
+ msgid "Hyper"
+ msgstr "Hyper"
+@@ -441,37 +756,162 @@ msgstr "Hyper"
+ #. * translated on keyboards used for your language, don't translate
+ #. * this.
+ #.
+-#: gtk/gtkaccellabel.c:797
++#: ../gtk/gtkaccellabel.c:832
+ msgctxt "keyboard label"
+ msgid "Meta"
+ msgstr "Meta"
+ 
+-#: gtk/gtkaccellabel.c:813
++#: ../gtk/gtkaccellabel.c:848
+ msgctxt "keyboard label"
+ msgid "Space"
+ msgstr "Space"
+ 
+-#: gtk/gtkaccellabel.c:816
++#: ../gtk/gtkaccellabel.c:851
+ msgctxt "keyboard label"
+ msgid "Backslash"
+ msgstr "Backslash"
+ 
+-#: gtk/gtkbuilderparser.c:343
++#: ../gtk/gtkappchooserbutton.c:290
++msgid "Other application..."
++msgstr "Feidhmchlár eile..."
++
++#: ../gtk/gtkappchooserdialog.c:137
++msgid "Failed to look for applications online"
++msgstr ""
++
++#: ../gtk/gtkappchooserdialog.c:188
++msgid "_Find applications online"
++msgstr ""
++
++#: ../gtk/gtkappchooserdialog.c:247
++#, fuzzy
++msgid "Could not run application"
++msgstr "Níorbh fhéidir liosta a ghlanadh"
++
++#: ../gtk/gtkappchooserdialog.c:260
++#, fuzzy, c-format
++msgid "Could not find '%s'"
++msgstr "Níorbh fhéidir %s a ghléasadh"
++
++#: ../gtk/gtkappchooserdialog.c:263
++#, fuzzy
++msgid "Could not find application"
++msgstr "Níorbh fhéidir nasc a thaispeáint"
++
++#. Translators: %s is a filename
++#: ../gtk/gtkappchooserdialog.c:397
++#, c-format
++msgid "Select an application to open \"%s\""
++msgstr ""
++
++#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:657
++#, c-format
++msgid "No applications available to open \"%s\""
++msgstr ""
++
++#. Translators: %s is a file type description
++#: ../gtk/gtkappchooserdialog.c:404
++#, c-format
++msgid "Select an application for \"%s\" files"
++msgstr ""
++
++#: ../gtk/gtkappchooserdialog.c:406
++#, c-format
++msgid "No applications available to open \"%s\" files"
++msgstr ""
++
++#: ../gtk/gtkappchooserdialog.c:422
++msgid ""
++"Click \"Show other applications\", for more options, or \"Find applications "
++"online\" to install a new application"
++msgstr ""
++
++#: ../gtk/gtkappchooserdialog.c:492
++#, fuzzy
++msgid "Forget association"
++msgstr "Déan _dearmad ar an bhfocal faire láithreach"
++
++#: ../gtk/gtkappchooserdialog.c:558
++msgid "Show other applications"
++msgstr "Taispeáin feidhmchláir eile"
++
++#: ../gtk/gtkappchooserwidget.c:606
++msgid "Default Application"
++msgstr "Feidhmchlár Réamhshocraithe"
++
++#: ../gtk/gtkappchooserwidget.c:744
++#, fuzzy
++msgid "Recommended Applications"
++msgstr "Feidhmchlár"
++
++#: ../gtk/gtkappchooserwidget.c:759
++#, fuzzy
++msgid "Related Applications"
++msgstr "Feidhmchlár"
++
++#: ../gtk/gtkappchooserwidget.c:773
++msgid "Other Applications"
++msgstr "Feidhmchláir Eile"
++
++#: ../gtk/gtkapplication.c:1558
++#, c-format
++msgid ""
++"%s cannot quit at this time:\n"
++"\n"
++"%s"
++msgstr ""
++
++#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:480
++#: ../gtk/gtkprintoperation-win32.c:1445
++msgid "Application"
++msgstr "Feidhmchlár"
++
++#: ../gtk/gtkassistant.c:1008
++#, fuzzy
++msgid "C_ontinue"
++msgstr "_Nasc"
++
++#: ../gtk/gtkassistant.c:1011
++#, fuzzy
++msgid "Go _Back"
++msgstr "Ar A_is"
++
++#: ../gtk/gtkassistant.c:1015
++#, fuzzy
++msgid "_Finish"
++msgstr "Críochnaithe"
++
++#: ../gtk/gtkbuilder-menus.c:220
++#, fuzzy, c-format
++msgid "Element <%s> not allowed inside <%s>"
++msgstr "Ní cheadaítear an eilimint <%s> faoi <%s>"
++
++#: ../gtk/gtkbuilder-menus.c:225
++#, fuzzy, c-format
++msgid "Element <%s> not allowed at toplevel"
++msgstr "Ní cheadaítear an eilimint <%s> faoi <%s>"
++
++#: ../gtk/gtkbuilder-menus.c:314
++#, c-format
++msgid "text may not appear inside <%s>"
++msgstr ""
++
++#: ../gtk/gtkbuilderparser.c:341
+ #, c-format
+ msgid "Invalid type function on line %d: '%s'"
+ msgstr "Feidhm chineáil neamhbhailí ar líne %d: '%s'"
+ 
+-#: gtk/gtkbuilderparser.c:407
++#: ../gtk/gtkbuilderparser.c:405
+ #, c-format
+ msgid "Duplicate object ID '%s' on line %d (previously on line %d)"
+ msgstr ""
+ 
+-#: gtk/gtkbuilderparser.c:859
++#: ../gtk/gtkbuilderparser.c:865
+ #, c-format
+ msgid "Invalid root element: '%s'"
+ msgstr "Fréamheilimint neamhbhailí: '%s'"
+ 
+-#: gtk/gtkbuilderparser.c:898
++#: ../gtk/gtkbuilderparser.c:906
+ #, c-format
+ msgid "Unhandled tag: '%s'"
+ msgstr "Clib gan láimhseáil: '%s'"
+@@ -486,7 +926,7 @@ msgstr "Clib gan láimhseáil: '%s'"
+ #. * text direction of RTL and specify "calendar:YM", then the year
+ #. * will appear to the right of the month.
+ #.
+-#: gtk/gtkcalendar.c:883
++#: ../gtk/gtkcalendar.c:872
+ msgid "calendar:MY"
+ msgstr "calendar:MY"
+ 
+@@ -494,7 +934,7 @@ msgstr "calendar:MY"
+ #. * first day of the week to calendar:week_start:1 if you want Monday
+ #. * to be the first day of the week, and so on.
+ #.
+-#: gtk/gtkcalendar.c:921
++#: ../gtk/gtkcalendar.c:910
+ msgid "calendar:week_start:0"
+ msgstr "calendar:week_start:0"
+ 
+@@ -503,7 +943,7 @@ msgstr "calendar:week_start:0"
+ #. *
+ #. * If you don't understand this, leave it as "2000"
+ #.
+-#: gtk/gtkcalendar.c:2006
++#: ../gtk/gtkcalendar.c:1910
+ msgctxt "year measurement template"
+ msgid "2000"
+ msgstr "2000"
+@@ -518,7 +958,7 @@ msgstr "2000"
+ #. * digits. That needs support from your system and locale definition
+ #. * too.
+ #.
+-#: gtk/gtkcalendar.c:2037 gtk/gtkcalendar.c:2719
++#: ../gtk/gtkcalendar.c:1941 ../gtk/gtkcalendar.c:2633
+ #, c-format
+ msgctxt "calendar:day:digits"
+ msgid "%d"
+@@ -534,7 +974,7 @@ msgstr "%d"
+ #. * digits. That needs support from your system and locale definition
+ #. * too.
+ #.
+-#: gtk/gtkcalendar.c:2069 gtk/gtkcalendar.c:2579
++#: ../gtk/gtkcalendar.c:1973 ../gtk/gtkcalendar.c:2499
+ #, c-format
+ msgctxt "calendar:week:digits"
+ msgid "%d"
+@@ -550,7 +990,7 @@ msgstr "%d"
+ #. *
+ #. * "%Y" is appropriate for most locales.
+ #.
+-#: gtk/gtkcalendar.c:2361
++#: ../gtk/gtkcalendar.c:2268
+ msgctxt "calendar year format"
+ msgid "%Y"
+ msgstr "%Y"
+@@ -558,7 +998,7 @@ msgstr "%Y"
+ #. This label is displayed in a treeview cell displaying
+ #. * a disabled accelerator key combination.
+ #.
+-#: gtk/gtkcellrendereraccel.c:272
++#: ../gtk/gtkcellrendereraccel.c:282
+ msgctxt "Accelerator"
+ msgid "Disabled"
+ msgstr "Díchumasaithe"
+@@ -567,7 +1007,7 @@ msgstr "Díchumasaithe"
+ #. * an accelerator key combination that is not valid according
+ #. * to gtk_accelerator_valid().
+ #.
+-#: gtk/gtkcellrendereraccel.c:282
++#: ../gtk/gtkcellrendereraccel.c:292
+ msgctxt "Accelerator"
+ msgid "Invalid"
+ msgstr "Neamhbhailí"
+@@ -576,155 +1016,290 @@ msgstr "Neamhbhailí"
+ #. * an accelerator when the cell is clicked to change the
+ #. * acelerator.
+ #.
+-#: gtk/gtkcellrendereraccel.c:418 gtk/gtkcellrendereraccel.c:675
++#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:747
+ msgid "New accelerator..."
+ msgstr "Aicearra nua..."
+ 
+-#: gtk/gtkcellrendererprogress.c:362 gtk/gtkcellrendererprogress.c:452
++#: ../gtk/gtkcellrendererprogress.c:372 ../gtk/gtkcellrendererprogress.c:462
+ #, c-format
+ msgctxt "progress bar label"
+ msgid "%d %%"
+ msgstr "%d %%"
+ 
+-#: gtk/gtkcolorbutton.c:176 gtk/gtkcolorbutton.c:445
++#: ../gtk/gtkcolorbutton.c:188 ../gtk/gtkcolorbutton.c:449
+ msgid "Pick a Color"
+ msgstr "Roghnaigh Dath"
+ 
+-#: gtk/gtkcolorbutton.c:336
+-msgid "Received invalid color data\n"
+-msgstr "Fuair sonraí datha neamhbhailí\n"
++#: ../gtk/gtkcolorchooserdialog.c:164
++msgid "Select a Color"
++msgstr "Roghnaigh Dath"
+ 
+-#: gtk/gtkcolorsel.c:384
+-msgid ""
+-"Select the color you want from the outer ring. Select the darkness or "
+-"lightness of that color using the inner triangle."
+-msgstr ""
+-"Roghnaigh an dath atá uait ón bhfáinne amuigh. Roghnaigh dorchadas nó gile "
+-"an datha sin leis an triantán istigh."
++#: ../gtk/gtkcolorchooserwidget.c:281
++#, c-format
++msgid "Red %d%%, Green %d%%, Blue %d%%, Alpha %d%%"
++msgstr "Dearg %d%%, Uaine %d%%, Gorm %d%%, Alfa %d%%"
+ 
+-#: gtk/gtkcolorsel.c:408
+-msgid ""
+-"Click the eyedropper, then click a color anywhere on your screen to select "
+-"that color."
++#: ../gtk/gtkcolorchooserwidget.c:287
++#, c-format
++msgid "Red %d%%, Green %d%%, Blue %d%%"
++msgstr "Dearg %d%%, Uaine %d%%, Gorm %d%%"
++
++#: ../gtk/gtkcolorchooserwidget.c:360
++#, c-format
++msgid "Color: %s"
++msgstr "Dath: %s"
++
++#: ../gtk/gtkcolorchooserwidget.c:419
++msgctxt "Color name"
++msgid "Light Scarlet Red"
+ msgstr ""
+-"Cliceáil an titimeán súile, agus ansin cliceáil dath áit ar bith ar do "
+-"scáileán chun an dath sin a roghnú."
+ 
+-#: gtk/gtkcolorsel.c:417
+-msgid "_Hue:"
+-msgstr "_Lí:"
++#: ../gtk/gtkcolorchooserwidget.c:420
++msgctxt "Color name"
++msgid "Scarlet Red"
++msgstr ""
+ 
+-#: gtk/gtkcolorsel.c:418
+-msgid "Position on the color wheel."
+-msgstr "Ionad ar roth na ndathanna."
++#: ../gtk/gtkcolorchooserwidget.c:421
++msgctxt "Color name"
++msgid "Dark Scarlet Red"
++msgstr ""
+ 
+-#: gtk/gtkcolorsel.c:420
+-msgid "_Saturation:"
+-msgstr "_Sáithiú:"
++#: ../gtk/gtkcolorchooserwidget.c:422
++msgctxt "Color name"
++msgid "Light Orange"
++msgstr ""
+ 
+-#: gtk/gtkcolorsel.c:421
++#: ../gtk/gtkcolorchooserwidget.c:423
+ #, fuzzy
+-msgid "Intensity of the color."
+-msgstr "Trédhearcacht an datha."
++msgctxt "Color name"
++msgid "Orange"
++msgstr "Raon"
+ 
+-#: gtk/gtkcolorsel.c:422
+-msgid "_Value:"
+-msgstr "L_uach:"
++#: ../gtk/gtkcolorchooserwidget.c:424
++msgctxt "Color name"
++msgid "Dark Orange"
++msgstr ""
+ 
+-#: gtk/gtkcolorsel.c:423
+-msgid "Brightness of the color."
+-msgstr "Gile an datha."
++#: ../gtk/gtkcolorchooserwidget.c:425
++msgctxt "Color name"
++msgid "Light Butter"
++msgstr ""
+ 
+-#: gtk/gtkcolorsel.c:424
+-msgid "_Red:"
+-msgstr "_Dearg:"
++#: ../gtk/gtkcolorchooserwidget.c:426
++msgctxt "Color name"
++msgid "Butter"
++msgstr ""
+ 
+-#: gtk/gtkcolorsel.c:425
+-msgid "Amount of red light in the color."
+-msgstr "Méid sholais dhearg sa dath."
++#: ../gtk/gtkcolorchooserwidget.c:427
++msgctxt "Color name"
++msgid "Dark Butter"
++msgstr ""
+ 
+-#: gtk/gtkcolorsel.c:426
+-msgid "_Green:"
+-msgstr "_Uaine:"
++#: ../gtk/gtkcolorchooserwidget.c:428
++msgctxt "Color name"
++msgid "Light Chameleon"
++msgstr ""
+ 
+-#: gtk/gtkcolorsel.c:427
+-msgid "Amount of green light in the color."
+-msgstr "Méid sholais uaine sa dath."
++#: ../gtk/gtkcolorchooserwidget.c:429
++msgctxt "Color name"
++msgid "Chameleon"
++msgstr ""
+ 
+-#: gtk/gtkcolorsel.c:428
+-msgid "_Blue:"
+-msgstr "_Gorm:"
++#: ../gtk/gtkcolorchooserwidget.c:430
++msgctxt "Color name"
++msgid "Dark Chameleon"
++msgstr ""
+ 
+-#: gtk/gtkcolorsel.c:429
+-msgid "Amount of blue light in the color."
+-msgstr "Méid sholais ghorm sa dath."
++#: ../gtk/gtkcolorchooserwidget.c:431
++msgctxt "Color name"
++msgid "Light Sky Blue"
++msgstr ""
+ 
+-#: gtk/gtkcolorsel.c:432
+-msgid "Op_acity:"
+-msgstr "Teimhne_acht:"
++#: ../gtk/gtkcolorchooserwidget.c:432
++msgctxt "Color name"
++msgid "Sky Blue"
++msgstr ""
+ 
+-#: gtk/gtkcolorsel.c:439 gtk/gtkcolorsel.c:449
+-msgid "Transparency of the color."
+-msgstr "Trédhearcacht an datha."
++#: ../gtk/gtkcolorchooserwidget.c:433
++msgctxt "Color name"
++msgid "Dark Sky Blue"
++msgstr ""
+ 
+-#: gtk/gtkcolorsel.c:456
+-msgid "Color _name:"
+-msgstr "Ai_nm datha:"
++#: ../gtk/gtkcolorchooserwidget.c:434
++msgctxt "Color name"
++msgid "Light Plum"
++msgstr ""
+ 
+-#: gtk/gtkcolorsel.c:470
+-msgid ""
+-"You can enter an HTML-style hexadecimal color value, or simply a color name "
+-"such as 'orange' in this entry."
++#: ../gtk/gtkcolorchooserwidget.c:435
++msgctxt "Color name"
++msgid "Plum"
+ msgstr ""
+-"Is féidir leat luach datha heicsidheachúlach ar stíl HTML a iontráil, nó "
+-"ainm datha mar shampla 'orange' a iontráil san iontráil seo."
+ 
+-#: gtk/gtkcolorsel.c:500
+-msgid "_Palette:"
+-msgstr "_Pailéad:"
++#: ../gtk/gtkcolorchooserwidget.c:436
++msgctxt "Color name"
++msgid "Dark Plum"
++msgstr ""
+ 
+-#: gtk/gtkcolorsel.c:529
+-msgid "Color Wheel"
+-msgstr "Roth na nDathanna"
++#: ../gtk/gtkcolorchooserwidget.c:437
++msgctxt "Color name"
++msgid "Light Chocolate"
++msgstr ""
+ 
+-#: gtk/gtkcolorsel.c:988
+-msgid ""
+-"The previously-selected color, for comparison to the color you're selecting "
+-"now. You can drag this color to a palette entry, or select this color as "
+-"current by dragging it to the other color swatch alongside."
++#: ../gtk/gtkcolorchooserwidget.c:438
++#, fuzzy
++msgctxt "Color name"
++msgid "Chocolate"
++msgstr "C_omhordaigh"
++
++#: ../gtk/gtkcolorchooserwidget.c:439
++msgctxt "Color name"
++msgid "Dark Chocolate"
+ msgstr ""
+ 
+-#: gtk/gtkcolorsel.c:991
+-msgid ""
+-"The color you've chosen. You can drag this color to a palette entry to save "
+-"it for use in the future."
++#: ../gtk/gtkcolorchooserwidget.c:440
++msgctxt "Color name"
++msgid "Light Aluminum 1"
+ msgstr ""
+-"An dath atá roghnaithe agat. Is féidir leat an dath seo a tharraingt go "
+-"hiontráil pailéid chun é a shábháil le haghaidh úsáide san am atá le teacht."
+ 
+-#: gtk/gtkcolorsel.c:996
+-msgid ""
+-"The previously-selected color, for comparison to the color you're selecting "
+-"now."
++#: ../gtk/gtkcolorchooserwidget.c:441
++msgctxt "Color name"
++msgid "Aluminum 1"
+ msgstr ""
+ 
+-#: gtk/gtkcolorsel.c:999
+-msgid "The color you've chosen."
+-msgstr "An dath atá roghnaithe agat."
++#: ../gtk/gtkcolorchooserwidget.c:442
++msgctxt "Color name"
++msgid "Dark Aluminum 1"
++msgstr ""
++
++#: ../gtk/gtkcolorchooserwidget.c:443
++msgctxt "Color name"
++msgid "Light Aluminum 2"
++msgstr ""
++
++#: ../gtk/gtkcolorchooserwidget.c:444
++msgctxt "Color name"
++msgid "Aluminum 2"
++msgstr ""
++
++#: ../gtk/gtkcolorchooserwidget.c:445
++msgctxt "Color name"
++msgid "Dark Aluminum 2"
++msgstr ""
++
++#: ../gtk/gtkcolorchooserwidget.c:459
++msgctxt "Color name"
++msgid "Black"
++msgstr "Dubh"
++
++#: ../gtk/gtkcolorchooserwidget.c:460
++msgctxt "Color name"
++msgid "Very Dark Gray"
++msgstr ""
++
++#: ../gtk/gtkcolorchooserwidget.c:461
++msgctxt "Color name"
++msgid "Darker Gray"
++msgstr ""
++
++#: ../gtk/gtkcolorchooserwidget.c:462
++msgctxt "Color name"
++msgid "Dark Gray"
++msgstr ""
++
++#: ../gtk/gtkcolorchooserwidget.c:463
++#, fuzzy
++msgctxt "Color name"
++msgid "Medium Gray"
++msgstr "Measartha"
++
++#: ../gtk/gtkcolorchooserwidget.c:464
++msgctxt "Color name"
++msgid "Light Gray"
++msgstr ""
++
++#: ../gtk/gtkcolorchooserwidget.c:465
++msgctxt "Color name"
++msgid "Lighter Gray"
++msgstr ""
++
++#: ../gtk/gtkcolorchooserwidget.c:466
++msgctxt "Color name"
++msgid "Very Light Gray"
++msgstr ""
++
++#: ../gtk/gtkcolorchooserwidget.c:467
++msgctxt "Color name"
++msgid "White"
++msgstr "Bán"
++
++#. translators: label for the custom section in the color chooser
++#: ../gtk/gtkcolorchooserwidget.c:516
++msgid "Custom"
++msgstr "Saincheaptha"
++
++#: ../gtk/gtkcolorchooserwidget.c:524
++#, fuzzy
++msgid "Create custom color"
++msgstr "Cruthaigh Fi_llteán"
+ 
+-#: gtk/gtkcolorsel.c:1396
+-msgid "_Save color here"
+-msgstr "_Sábháil dath anseo"
++#: ../gtk/gtkcolorchooserwidget.c:543
++#, fuzzy, c-format
++msgid "Custom color %d: %s"
++msgstr "%sx%s Saincheaptha"
+ 
+-#: gtk/gtkcolorsel.c:1601
+-msgid ""
+-"Click this palette entry to make it the current color. To change this entry, "
+-"drag a color swatch here or right-click it and select \"Save color here.\""
+-msgstr ""
++#: ../gtk/gtkcoloreditor.c:412
++msgid "Color Name"
++msgstr "Ainm Datha"
++
++#: ../gtk/gtkcoloreditor.c:457
++msgctxt "Color channel"
++msgid "Saturation"
++msgstr "Sáithiú"
++
++#: ../gtk/gtkcoloreditor.c:463
++msgctxt "Color channel"
++msgid "Value"
++msgstr "Luach"
++
++#: ../gtk/gtkcoloreditor.c:471
++msgctxt "Color channel"
++msgid "S"
++msgstr "S"
++
++#: ../gtk/gtkcoloreditor.c:473
++msgctxt "Color channel"
++msgid "V"
++msgstr "L"
++
++#: ../gtk/gtkcoloreditor.c:481 ../gtk/gtkcolorscale.c:301
++msgctxt "Color channel"
++msgid "Hue"
++msgstr "Lí"
++
++#: ../gtk/gtkcoloreditor.c:488
++msgctxt "Color channel"
++msgid "H"
++msgstr "Lí"
++
++#: ../gtk/gtkcoloreditor.c:496 ../gtk/gtkcolorscale.c:303
++msgctxt "Color channel"
++msgid "Alpha"
++msgstr "Alfa"
++
++#: ../gtk/gtkcoloreditor.c:503
++msgctxt "Color channel"
++msgid "A"
++msgstr "A"
++
++#: ../gtk/gtkcolorplane.c:438
++#, fuzzy
++msgid "Color Plane"
++msgstr "Ai_nm datha:"
+ 
+-#: gtk/gtkcolorseldialog.c:189
+-msgid "Color Selection"
+-msgstr "Roghnú Datha"
++#: ../gtk/gtkcolorswatch.c:447
++#, fuzzy
++msgid "_Customize"
++msgstr "Méid saincheaptha"
+ 
+ #. Translate to the default units to use for presenting
+ #. * lengths to the user. Translate to default:inch if you
+@@ -732,125 +1307,154 @@ msgstr "Roghnú Datha"
+ #. * Do *not* translate it to "predefinito:mm", if it
+ #. * it isn't default:mm or default:inch it will not work
+ #.
+-#: gtk/gtkcustompaperunixdialog.c:116
++#: ../gtk/gtkcustompaperunixdialog.c:115
+ msgid "default:mm"
+ msgstr "default:mm"
+ 
+ #. And show the custom paper dialog
+-#: gtk/gtkcustompaperunixdialog.c:374 gtk/gtkprintunixdialog.c:3233
++#: ../gtk/gtkcustompaperunixdialog.c:397 ../gtk/gtkprintunixdialog.c:3275
+ msgid "Manage Custom Sizes"
+ msgstr "Bainistigh Méideanna Saincheaptha"
+ 
+-#: gtk/gtkcustompaperunixdialog.c:534 gtk/gtkpagesetupunixdialog.c:790
++#: ../gtk/gtkcustompaperunixdialog.c:558 ../gtk/gtkpagesetupunixdialog.c:778
+ msgid "inch"
+ msgstr "orlach"
+ 
+-#: gtk/gtkcustompaperunixdialog.c:536 gtk/gtkpagesetupunixdialog.c:788
++#: ../gtk/gtkcustompaperunixdialog.c:560 ../gtk/gtkpagesetupunixdialog.c:776
+ msgid "mm"
+ msgstr "mm"
+ 
+-#: gtk/gtkcustompaperunixdialog.c:581
++#: ../gtk/gtkcustompaperunixdialog.c:605
+ msgid "Margins from Printer..."
+ msgstr "Imill ón bPrintéir"
+ 
+-#: gtk/gtkcustompaperunixdialog.c:747
++#: ../gtk/gtkcustompaperunixdialog.c:771
+ #, c-format
+ msgid "Custom Size %d"
+ msgstr "Méid Saincheaptha %d"
+ 
+-#: gtk/gtkcustompaperunixdialog.c:1059
++#: ../gtk/gtkcustompaperunixdialog.c:1109
+ msgid "_Width:"
+ msgstr "_Leithead:"
+ 
+-#: gtk/gtkcustompaperunixdialog.c:1071
++#: ../gtk/gtkcustompaperunixdialog.c:1120
+ msgid "_Height:"
+ msgstr "_Airde:"
+ 
+-#: gtk/gtkcustompaperunixdialog.c:1083
++#: ../gtk/gtkcustompaperunixdialog.c:1131
+ msgid "Paper Size"
+ msgstr "Méid Pháipéir"
+ 
+-#: gtk/gtkcustompaperunixdialog.c:1092
++#: ../gtk/gtkcustompaperunixdialog.c:1140
+ msgid "_Top:"
+ msgstr "Ba_rr:"
+ 
+-#: gtk/gtkcustompaperunixdialog.c:1104
++#: ../gtk/gtkcustompaperunixdialog.c:1151
+ msgid "_Bottom:"
+ msgstr "_Bun:"
+ 
+-#: gtk/gtkcustompaperunixdialog.c:1116
++#: ../gtk/gtkcustompaperunixdialog.c:1162
+ msgid "_Left:"
+ msgstr "Ar _Chlé:"
+ 
+-#: gtk/gtkcustompaperunixdialog.c:1128
++#: ../gtk/gtkcustompaperunixdialog.c:1173
+ msgid "_Right:"
+ msgstr "Ar _Dheis:"
+ 
+-#: gtk/gtkcustompaperunixdialog.c:1169
++#: ../gtk/gtkcustompaperunixdialog.c:1212
+ msgid "Paper Margins"
+ msgstr "Imill an Páipéar"
+ 
+-#: gtk/gtkentry.c:8601 gtk/gtktextview.c:8248
++#: ../gtk/gtkentry.c:9140 ../gtk/gtktextview.c:8583
+ msgid "Input _Methods"
+ msgstr "_Modhanna Ionchurtha"
+ 
+-#: gtk/gtkentry.c:8615 gtk/gtktextview.c:8262
++#: ../gtk/gtkentry.c:9154 ../gtk/gtktextview.c:8597
+ msgid "_Insert Unicode Control Character"
+ msgstr "_Ionsáigh Carachtar Rialú Unicode"
+ 
+-#: gtk/gtkentry.c:10015
+-msgid "Caps Lock and Num Lock are on"
+-msgstr ""
+-
+-#: gtk/gtkentry.c:10017
+-#, fuzzy
+-msgid "Num Lock is on"
+-msgstr "Tá Caps Lock ann"
+-
+-#: gtk/gtkentry.c:10019
++#: ../gtk/gtkentry.c:10107
+ msgid "Caps Lock is on"
+ msgstr "Tá Caps Lock ann"
+ 
++#. *
++#. * SECTION:gtkfilechooserbutton
++#. * @Short_description: A button to launch a file selection dialog
++#. * @Title: GtkFileChooserButton
++#. * @See_also:#GtkFileChooserDialog
++#. *
++#. * The #GtkFileChooserButton is a widget that lets the user select a
++#. * file.  It implements the #GtkFileChooser interface.  Visually, it is a
++#. * file name with a button to bring up a #GtkFileChooserDialog.
++#. * The user can then use that dialog to change the file associated with
++#. * that button.  This widget does not support setting the
++#. * #GtkFileChooser:select-multiple property to %TRUE.
++#. *
++#. * <example>
++#. * <title>Create a button to let the user select a file in /etc</title>
++#. * <programlisting>
++#. * {
++#. *   GtkWidget *button;
++#. *
++#. *   button = gtk_file_chooser_button_new (_("Select a file"),
++#. *                                         GTK_FILE_CHOOSER_ACTION_OPEN);
++#. *   gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (button),
++#. *                                        "/etc");
++#. * }
++#. * </programlisting>
++#. * </example>
++#. *
++#. * The #GtkFileChooserButton supports the #GtkFileChooserAction<!-- -->s
++#. * %GTK_FILE_CHOOSER_ACTION_OPEN and %GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER.
++#. *
++#. * <important>
++#. * The #GtkFileChooserButton will ellipsize the label,
++#. * and thus will thus request little horizontal space.  To give the button
++#. * more space, you should call gtk_widget_get_preferred_size(),
++#. * gtk_file_chooser_button_set_width_chars(), or pack the button in
++#. * such a way that other interface elements give space to the widget.
++#. * </important>
++#.
+ #. **************** *
+ #. *  Private Macros  *
+ #. * ****************
+-#: gtk/gtkfilechooserbutton.c:61
+-msgid "Select A File"
++#: ../gtk/gtkfilechooserbutton.c:104
++msgid "Select a File"
+ msgstr "Roghnaigh Comhad"
+ 
+-#: gtk/gtkfilechooserbutton.c:62 gtk/gtkfilechooserdefault.c:1812
++#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1819
+ msgid "Desktop"
+ msgstr "Deasc"
+ 
+-#: gtk/gtkfilechooserbutton.c:63
++#: ../gtk/gtkfilechooserbutton.c:106
+ msgid "(None)"
+ msgstr "(Neamhní)"
+ 
+-#: gtk/gtkfilechooserbutton.c:2005
++#: ../gtk/gtkfilechooserbutton.c:2046
+ msgid "Other..."
+ msgstr "Eile..."
+ 
+-#: gtk/gtkfilechooserdefault.c:148
++#: ../gtk/gtkfilechooserdefault.c:152
+ msgid "Type name of new folder"
+ msgstr "Clóscríobh ainm den fhillteán nua"
+ 
+-#: gtk/gtkfilechooserdefault.c:938
++#: ../gtk/gtkfilechooserdefault.c:970
+ msgid "Could not retrieve information about the file"
+ msgstr "Níorbh fhéidir eolas faoin gcomhad a fháil"
+ 
+-#: gtk/gtkfilechooserdefault.c:949
++#: ../gtk/gtkfilechooserdefault.c:981
+ msgid "Could not add a bookmark"
+ msgstr "Níorbh fhéidir leabharmharc a chur leis"
+ 
+-#: gtk/gtkfilechooserdefault.c:960
++#: ../gtk/gtkfilechooserdefault.c:992
+ msgid "Could not remove bookmark"
+ msgstr "Níorbh fhéidir leabharmharc a bhaint"
+ 
+-#: gtk/gtkfilechooserdefault.c:971
++#: ../gtk/gtkfilechooserdefault.c:1003
+ msgid "The folder could not be created"
+ msgstr "Níorbh fhéidir an fillteán a chruthú"
+ 
+-#: gtk/gtkfilechooserdefault.c:984
++#: ../gtk/gtkfilechooserdefault.c:1016
+ msgid ""
+ "The folder could not be created, as a file with the same name already "
+ "exists.  Try using a different name for the folder, or rename the file first."
+@@ -859,11 +1463,26 @@ msgstr ""
+ "an ainm céanna.  Bain triail as úsáid ainm difriúil don fhillteán, nó "
+ "athainmnigh an comhad ar dtús."
+ 
+-#: gtk/gtkfilechooserdefault.c:995
++#: ../gtk/gtkfilechooserdefault.c:1030
++msgid "You need to choose a valid filename."
++msgstr ""
++
++#: ../gtk/gtkfilechooserdefault.c:1033
++#, fuzzy, c-format
++msgid "Cannot create a file under %s as it is not a folder"
++msgstr "Ní féidir athrú go dtí an fillteán mar níl sé logánta"
++
++#: ../gtk/gtkfilechooserdefault.c:1045
++msgid ""
++"You may only select folders.  The item that you selected is not a folder; "
++"try using a different item."
++msgstr ""
++
++#: ../gtk/gtkfilechooserdefault.c:1055
+ msgid "Invalid file name"
+ msgstr "Ainm comhaid neamhbhailí"
+ 
+-#: gtk/gtkfilechooserdefault.c:1005
++#: ../gtk/gtkfilechooserdefault.c:1065
+ msgid "The folder contents could not be displayed"
+ msgstr "Níorbh fhéidir ábhair an fhillteáin a thaispeáint"
+ 
+@@ -871,201 +1490,212 @@ msgstr "Níorbh fhéidir ábhair an fhillteáin a thaispeáint"
+ #. * is a hostname. Nautilus and the panel contain the same string
+ #. * to translate.
+ #.
+-#: gtk/gtkfilechooserdefault.c:1555
++#: ../gtk/gtkfilechooserdefault.c:1591
+ #, c-format
+ msgid "%1$s on %2$s"
+ msgstr "%1$s ar %2$s"
+ 
+-#: gtk/gtkfilechooserdefault.c:1731
++#: ../gtk/gtkfilechooserdefault.c:1740
+ msgid "Search"
+ msgstr "Cuardaigh"
+ 
+-#: gtk/gtkfilechooserdefault.c:1755 gtk/gtkfilechooserdefault.c:9289
++#: ../gtk/gtkfilechooserdefault.c:1764 ../gtk/gtkfilechooserdefault.c:4990
+ msgid "Recently Used"
+ msgstr "Úsáidte le Déanaí"
+ 
+-#: gtk/gtkfilechooserdefault.c:2409
++#: ../gtk/gtkfilechooserdefault.c:2363
+ msgid "Select which types of files are shown"
+ msgstr "Roghnaigh an cineál comhad atá taispeánta"
+ 
+-#: gtk/gtkfilechooserdefault.c:2768
++#: ../gtk/gtkfilechooserdefault.c:2722
+ #, c-format
+ msgid "Add the folder '%s' to the bookmarks"
+ msgstr "Cuir an fillteán '%s' leis na leabharmharcanna"
+ 
+-#: gtk/gtkfilechooserdefault.c:2812
++#: ../gtk/gtkfilechooserdefault.c:2766
+ #, c-format
+ msgid "Add the current folder to the bookmarks"
+ msgstr "Cuir an fillteán reatha leis na leabharmharcanna"
+ 
+-#: gtk/gtkfilechooserdefault.c:2814
++#: ../gtk/gtkfilechooserdefault.c:2768
+ #, c-format
+ msgid "Add the selected folders to the bookmarks"
+ msgstr "Cuir na fillteáin roghnaithe leis na leabharmharcanna"
+ 
+-#: gtk/gtkfilechooserdefault.c:2852
++#: ../gtk/gtkfilechooserdefault.c:2806
+ #, c-format
+ msgid "Remove the bookmark '%s'"
+ msgstr "Bain an leabharmharc '%s'"
+ 
+-#: gtk/gtkfilechooserdefault.c:2854
++#: ../gtk/gtkfilechooserdefault.c:2808
+ #, c-format
+ msgid "Bookmark '%s' cannot be removed"
+ msgstr "Ní féidir leabharmharc '%s' a bhaint"
+ 
+-#: gtk/gtkfilechooserdefault.c:2861 gtk/gtkfilechooserdefault.c:3725
++#: ../gtk/gtkfilechooserdefault.c:2815 ../gtk/gtkfilechooserdefault.c:3701
+ msgid "Remove the selected bookmark"
+ msgstr "Bain an leabharmharc roghnaithe"
+ 
+-#: gtk/gtkfilechooserdefault.c:3421
++#: ../gtk/gtkfilechooserdefault.c:3379
+ msgid "Remove"
+ msgstr "Bain"
+ 
+-#: gtk/gtkfilechooserdefault.c:3430
++#: ../gtk/gtkfilechooserdefault.c:3388
+ msgid "Rename..."
+ msgstr "Athainmnigh..."
+ 
+ #. Accessible object name for the file chooser's shortcuts pane
+-#: gtk/gtkfilechooserdefault.c:3593
++#: ../gtk/gtkfilechooserdefault.c:3552
+ msgid "Places"
+ msgstr "Áiteanna"
+ 
+ #. Column header for the file chooser's shortcuts pane
+-#: gtk/gtkfilechooserdefault.c:3650
++#: ../gtk/gtkfilechooserdefault.c:3609
+ msgid "_Places"
+ msgstr "_Áiteanna"
+ 
+-#: gtk/gtkfilechooserdefault.c:3706
+-msgid "_Add"
+-msgstr "Cuir _Leis"
+-
+-#: gtk/gtkfilechooserdefault.c:3713
++#: ../gtk/gtkfilechooserdefault.c:3689
+ msgid "Add the selected folder to the Bookmarks"
+ msgstr "Cuir an fillteán roghnaithe leis na Leabharmharcanna"
+ 
+-#: gtk/gtkfilechooserdefault.c:3718
+-msgid "_Remove"
+-msgstr "_Bain"
+-
+-#: gtk/gtkfilechooserdefault.c:3860
++#: ../gtk/gtkfilechooserdefault.c:3950
+ msgid "Could not select file"
+ msgstr "Níorbh fhéidir comhad a roghnú"
+ 
+-#: gtk/gtkfilechooserdefault.c:4035
++#: ../gtk/gtkfilechooserdefault.c:4175
++msgid "_Visit this file"
++msgstr ""
++
++#: ../gtk/gtkfilechooserdefault.c:4178
++#, fuzzy
++msgid "_Copy file's location"
++msgstr "Cóipeái_l Suíomh"
++
++#: ../gtk/gtkfilechooserdefault.c:4181
+ msgid "_Add to Bookmarks"
+ msgstr "_Cuir le Leabharmharcanna"
+ 
+-#: gtk/gtkfilechooserdefault.c:4048
++#: ../gtk/gtkfilechooserdefault.c:4188
+ msgid "Show _Hidden Files"
+ msgstr "Taispeáin Com_haid Folaithe"
+ 
+-#: gtk/gtkfilechooserdefault.c:4055
++#: ../gtk/gtkfilechooserdefault.c:4191
+ msgid "Show _Size Column"
+ msgstr "Taispeáin Colún _Méide"
+ 
+-#: gtk/gtkfilechooserdefault.c:4281
++#: ../gtk/gtkfilechooserdefault.c:4416
+ msgid "Files"
+ msgstr "Comhaid"
+ 
+-#: gtk/gtkfilechooserdefault.c:4332
++#: ../gtk/gtkfilechooserdefault.c:4467
+ msgid "Name"
+ msgstr "Ainm"
+ 
+-#: gtk/gtkfilechooserdefault.c:4355
++#: ../gtk/gtkfilechooserdefault.c:4490
+ msgid "Size"
+ msgstr "Méid"
+ 
+-#: gtk/gtkfilechooserdefault.c:4369
++#: ../gtk/gtkfilechooserdefault.c:4504
+ msgid "Modified"
+ msgstr "Athraithe"
+ 
+ #. Label
+-#: gtk/gtkfilechooserdefault.c:4624 gtk/gtkprinteroptionwidget.c:801
++#: ../gtk/gtkfilechooserdefault.c:4597
+ msgid "_Name:"
+ msgstr "_Ainm:"
+ 
+-#: gtk/gtkfilechooserdefault.c:4667
+-msgid "_Browse for other folders"
+-msgstr "_Brabhsáil ar fhillteáin eile"
+-
+-#: gtk/gtkfilechooserdefault.c:4937
++#: ../gtk/gtkfilechooserdefault.c:4828
+ msgid "Type a file name"
+ msgstr "Clóscríobh ainm comhaid"
+ 
++#: ../gtk/gtkfilechooserdefault.c:4875 ../gtk/gtkfilechooserdefault.c:4886
++#, fuzzy
++msgid "Please select a folder below"
++msgstr "Roghnaigh fillteán"
++
++#: ../gtk/gtkfilechooserdefault.c:4881
++#, fuzzy
++msgid "Please type a file name"
++msgstr "Clóscríobh ainm comhaid"
++
+ #. Create Folder
+-#: gtk/gtkfilechooserdefault.c:4980
++#: ../gtk/gtkfilechooserdefault.c:4952
+ msgid "Create Fo_lder"
+ msgstr "Cruthaigh Fi_llteán"
+ 
+-#: gtk/gtkfilechooserdefault.c:4990
++#: ../gtk/gtkfilechooserdefault.c:5000
++msgid "Search:"
++msgstr "Cuardaigh:"
++
++#: ../gtk/gtkfilechooserdefault.c:5051
+ msgid "_Location:"
+ msgstr "_Suíomh:"
+ 
+-#: gtk/gtkfilechooserdefault.c:5194
++#: ../gtk/gtkfilechooserdefault.c:5502
+ msgid "Save in _folder:"
+ msgstr "Sábháil i bh_fillteán:"
+ 
+-#: gtk/gtkfilechooserdefault.c:5196
++#: ../gtk/gtkfilechooserdefault.c:5504
+ msgid "Create in _folder:"
+ msgstr "Cruthaigh i bh_fillteán:"
+ 
+-#: gtk/gtkfilechooserdefault.c:6248
++#: ../gtk/gtkfilechooserdefault.c:6591
+ #, c-format
+ msgid "Could not read the contents of %s"
+ msgstr "Níorbh fhéidir ábhair %s a léamh"
+ 
+-#: gtk/gtkfilechooserdefault.c:6252
++#: ../gtk/gtkfilechooserdefault.c:6595
+ msgid "Could not read the contents of the folder"
+ msgstr "Níorbh fhéidir ábhair an fhíllteáin a léamh"
+ 
+-#: gtk/gtkfilechooserdefault.c:6345 gtk/gtkfilechooserdefault.c:6413
+-#: gtk/gtkfilechooserdefault.c:6558
++#: ../gtk/gtkfilechooserdefault.c:6688 ../gtk/gtkfilechooserdefault.c:6756
++#: ../gtk/gtkfilechooserdefault.c:6936
+ msgid "Unknown"
+ msgstr "Anaithnid"
+ 
+-#: gtk/gtkfilechooserdefault.c:6360
++#: ../gtk/gtkfilechooserdefault.c:6703
+ msgid "%H:%M"
+ msgstr "%H:%M"
+ 
+-#: gtk/gtkfilechooserdefault.c:6362
++#: ../gtk/gtkfilechooserdefault.c:6705
+ msgid "Yesterday at %H:%M"
+ msgstr "Inné ar a %H:%M"
+ 
+-#: gtk/gtkfilechooserdefault.c:7028
++#: ../gtk/gtkfilechooserdefault.c:7407
+ msgid "Cannot change to folder because it is not local"
+ msgstr "Ní féidir athrú go dtí an fillteán mar níl sé logánta"
+ 
+-#: gtk/gtkfilechooserdefault.c:7625 gtk/gtkfilechooserdefault.c:7646
++#: ../gtk/gtkfilechooserdefault.c:8011 ../gtk/gtkfilechooserdefault.c:8032
+ #, c-format
+ msgid "Shortcut %s already exists"
+ msgstr "Tá aicearra %s ann cheana"
+ 
+-#: gtk/gtkfilechooserdefault.c:7736
++#: ../gtk/gtkfilechooserdefault.c:8122
+ #, c-format
+ msgid "Shortcut %s does not exist"
+ msgstr "Níl aicearra %s ann"
+ 
+-#: gtk/gtkfilechooserdefault.c:7997 gtk/gtkprintunixdialog.c:480
++#: ../gtk/gtkfilechooserdefault.c:8368 ../gtk/gtkprintunixdialog.c:548
+ #, c-format
+ msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+ msgstr "Tá comhad darbh ainm \"%s\" ann cheana. Ar mhaith leat é a athchur?"
+ 
+-#: gtk/gtkfilechooserdefault.c:8000 gtk/gtkprintunixdialog.c:484
++#: ../gtk/gtkfilechooserdefault.c:8371 ../gtk/gtkprintunixdialog.c:552
+ #, c-format
+ msgid ""
+ "The file already exists in \"%s\".  Replacing it will overwrite its contents."
+ msgstr ""
+ "Tá an comhad ann i \"%s\" cheana.  Forscríobhfar a ábhair má ionadaítear é."
+ 
+-#: gtk/gtkfilechooserdefault.c:8005 gtk/gtkprintunixdialog.c:491
++#: ../gtk/gtkfilechooserdefault.c:8376 ../gtk/gtkprintunixdialog.c:559
+ msgid "_Replace"
+ msgstr "_Ionadaigh"
+ 
+-#: gtk/gtkfilechooserdefault.c:8658
++#: ../gtk/gtkfilechooserdefault.c:9183
+ msgid "Could not start the search process"
+ msgstr "Níorbh fhéidir an próiseas cuardaigh a thosú"
+ 
+-#: gtk/gtkfilechooserdefault.c:8659
++#: ../gtk/gtkfilechooserdefault.c:9184
+ msgid ""
+ "The program was not able to create a connection to the indexer daemon.  "
+ "Please make sure it is running."
+@@ -1074,221 +1704,192 @@ msgstr ""
+ "innéacsóra.\n"
+ "Cinntigh go bhfuil sé á rith, le do thoil."
+ 
+-#: gtk/gtkfilechooserdefault.c:8673
++#: ../gtk/gtkfilechooserdefault.c:9198
+ msgid "Could not send the search request"
+ msgstr "Níorbh fhéidir an t-iarratas cuardaigh a sheoladh"
+ 
+-#: gtk/gtkfilechooserdefault.c:8861
+-msgid "Search:"
+-msgstr "Cuardaigh:"
+-
+-#: gtk/gtkfilechooserdefault.c:9466
++#: ../gtk/gtkfilechooserdefault.c:9808
+ #, c-format
+ msgid "Could not mount %s"
+ msgstr "Níorbh fhéidir %s a ghléasadh"
+ 
+-#. Translators: this is shown in the feedback for Tab-completion in a file
+-#. * chooser's text entry, when the user enters an invalid path.
+-#: gtk/gtkfilechooserentry.c:702 gtk/gtkfilechooserentry.c:1169
+-msgid "Invalid path"
+-msgstr "Conair neamhbhailí"
+-
+-#. translators: this text is shown when there are no completions
+-#. * for something the user typed in a file chooser entry
+-#.
+-#: gtk/gtkfilechooserentry.c:1101
+-msgid "No match"
+-msgstr "Gan rud comhoiriúnach"
+-
+-#. translators: this text is shown when there is exactly one completion
+-#. * for something the user typed in a file chooser entry
+-#.
+-#: gtk/gtkfilechooserentry.c:1112
+-msgid "Sole completion"
+-msgstr "An comhlánú amháin"
+-
+-#. translators: this text is shown when the text in a file chooser
+-#. * entry is a complete filename, but could be continued to find
+-#. * a longer match
+-#.
+-#: gtk/gtkfilechooserentry.c:1128
+-msgid "Complete, but not unique"
+-msgstr "Curtha i grích, ach nach uathúil"
+-
+-#. Translators: this text is shown while the system is searching
+-#. * for possible completions for filenames in a file chooser entry.
+-#: gtk/gtkfilechooserentry.c:1160
+-msgid "Completing..."
+-msgstr "Á chur i grích..."
+-
+-#. hostnames in a local_only file chooser?  user error
+-#. Translators: this is shown in the feedback for Tab-completion in a
+-#. * file chooser's text entry when the user enters something like
+-#. * "sftp://blahblah" in an app that only supports local filenames.
+-#: gtk/gtkfilechooserentry.c:1182 gtk/gtkfilechooserentry.c:1207
+-msgid "Only local files may be selected"
+-msgstr "Is féidir comhaid logánta amháin a roghnú"
+-
+-#. Another option is to complete the hostname based on the remote volumes that are mounted
+-#. Translators: this is shown in the feedback for Tab-completion in a
+-#. * file chooser's text entry when the user hasn't entered the first '/'
+-#. * after a hostname and yet hits Tab (such as "sftp://blahblah[Tab]")
+-#: gtk/gtkfilechooserentry.c:1191
+-msgid "Incomplete hostname; end it with '/'"
+-msgstr "Óstainm neamhiomlán; cuir '/' ag an deireadh"
+-
+-#. Translators: this is shown in the feedback for Tab-completion in a file
+-#. * chooser's text entry when the user enters a path that does not exist
+-#. * and then hits Tab
+-#: gtk/gtkfilechooserentry.c:1202
+-msgid "Path does not exist"
+-msgstr "Níl an conair sin ann"
+-
+-#: gtk/gtkfilechoosersettings.c:486
+-#, c-format
+-msgid "Error creating folder '%s': %s"
+-msgstr "Earráid agus fillteán '%s' á chruthú: %s"
+-
+ #. The pointers we return for a GtkFileSystemVolume are opaque tokens; they are
+ #. * really pointers to GDrive, GVolume or GMount objects.  We need an extra
+ #. * token for the fake "File System" volume.  So, we'll return a pointer to
+ #. * this particular string.
+ #.
+-#: gtk/gtkfilesystem.c:48
++#: ../gtk/gtkfilesystem.c:47
+ msgid "File System"
+ msgstr "Córas Comhaid"
+ 
+-#: gtk/gtkfontbutton.c:142 gtk/gtkfontbutton.c:266
+-msgid "Pick a Font"
+-msgstr "Roghnaigh Cló"
+-
+-#. Initialize fields
+-#: gtk/gtkfontbutton.c:260
++#: ../gtk/gtkfontbutton.c:354
+ msgid "Sans 12"
+ msgstr "Sans 12"
+ 
+-#: gtk/gtkfontbutton.c:785
++#: ../gtk/gtkfontbutton.c:436 ../gtk/gtkfontbutton.c:563
++msgid "Pick a Font"
++msgstr "Roghnaigh Cló"
++
++#: ../gtk/gtkfontbutton.c:1121
+ msgid "Font"
+ msgstr "Cló"
+ 
+-#. This is the default text shown in the preview entry, though the user
+-#. can set it. Remember that some fonts only have capital letters.
+-#: gtk/gtkfontsel.c:103
+-msgid "abcdefghijk ABCDEFGHIJK"
+-msgstr "aábcdeéfghií AÁBCDEÉFGHIÍ"
+-
+-#: gtk/gtkfontsel.c:370
+-msgid "_Family:"
+-msgstr "_Clann:"
+-
+-#: gtk/gtkfontsel.c:376
+-msgid "_Style:"
+-msgstr "_Stíl:"
+-
+-#: gtk/gtkfontsel.c:382
+-msgid "Si_ze:"
+-msgstr "_Méid:"
+-
+-#. create the text entry widget
+-#: gtk/gtkfontsel.c:559
+-msgid "_Preview:"
+-msgstr "_Réamhamharc:"
+-
+-#: gtk/gtkfontsel.c:1659
+-msgid "Font Selection"
+-msgstr "Roghnú Cló"
+-
+-#. Remove this icon source so we don't keep trying to
+-#. * load it.
+-#.
+-#: gtk/gtkiconfactory.c:1356
+-#, c-format
+-msgid "Error loading icon: %s"
+-msgstr "Earráid agus deilbhín á luchtú: %s"
++#: ../gtk/gtkfontchooserwidget.c:110
++msgid "No fonts matched your search. You can revise your search and try again."
++msgstr ""
+ 
+-#: gtk/gtkicontheme.c:1354
+-#, c-format
+-msgid ""
+-"Could not find the icon '%s'. The '%s' theme\n"
+-"was not found either, perhaps you need to install it.\n"
+-"You can get a copy from:\n"
+-"\t%s"
++#: ../gtk/gtkfontchooserwidget.c:557
++msgid "Search font name"
+ msgstr ""
+-"Níorbh fhéidir an deilbhín '%s' a aimsiú. Níor\n"
+-"aimsíodh an téama '%s' ach an oiread, b'fhéidir go\n"
+-"gcaithfidh tú é a shuiteáil.\n"
+-"Is féidir leat cóip a fháil ó:\n"
+-"\t%s"
+ 
+-#: gtk/gtkicontheme.c:1535
++#: ../gtk/gtkfontchooserwidget.c:891
++#, fuzzy
++msgid "Font Family"
++msgstr "_Clann:"
++
++#: ../gtk/gtkicontheme.c:1630
+ #, c-format
+ msgid "Icon '%s' not present in theme"
+ msgstr "Níl deilbhín '%s' ann sa téama"
+ 
+-#: gtk/gtkicontheme.c:3048
++#: ../gtk/gtkicontheme.c:3138
+ msgid "Failed to load icon"
+ msgstr "Theip ar luchtú deilbhín"
+ 
+-#: gtk/gtkimmodule.c:526
++#: ../gtk/gtkimmodule.c:515
+ msgid "Simple"
+ msgstr "Simplí"
+ 
+-#: gtk/gtkimmulticontext.c:588
++#: ../gtk/gtkimmulticontext.c:608
+ msgctxt "input method menu"
+ msgid "System"
+ msgstr "Córas"
+ 
+-#: gtk/gtkimmulticontext.c:598
++#: ../gtk/gtkimmulticontext.c:618
+ msgctxt "input method menu"
+ msgid "None"
+ msgstr "Neamhní"
+ 
+-#: gtk/gtkimmulticontext.c:681
++#: ../gtk/gtkimmulticontext.c:701
+ #, c-format
+ msgctxt "input method menu"
+ msgid "System (%s)"
+ msgstr "Córas (%s)"
+ 
+ #. Open Link
+-#: gtk/gtklabel.c:6202
++#: ../gtk/gtklabel.c:6224
+ msgid "_Open Link"
+ msgstr "_Oscail Nasc"
+ 
+ #. Copy Link Address
+-#: gtk/gtklabel.c:6214
++#: ../gtk/gtklabel.c:6236
+ msgid "Copy _Link Address"
+ msgstr "Cóipeáil Seoladh an _Naisc"
+ 
+-#: gtk/gtklinkbutton.c:449
++#: ../gtk/gtk-launch.c:73
++msgid "APPLICATION [URI...] - launch an APPLICATION with URI."
++msgstr ""
++
++#. Translators: this message will appear after the usage string
++#. and before the list of options.
++#: ../gtk/gtk-launch.c:77
++msgid ""
++"Launch specified application by its desktop file info\n"
++"optionally passing list of URIs as arguments."
++msgstr ""
++
++#: ../gtk/gtk-launch.c:89
++#, fuzzy, c-format
++msgid "Error parsing commandline options: %s\n"
++msgstr "Earráid agus deilbhín á luchtú: %s"
++
++#: ../gtk/gtk-launch.c:91 ../gtk/gtk-launch.c:104
++#, c-format
++msgid "Try \"%s --help\" for more information."
++msgstr ""
++
++#. Translators: the %s is the program name. This error message
++#. means the user is calling gtk-launch without any argument.
++#: ../gtk/gtk-launch.c:102
++#, c-format
++msgid "%s: missing application name"
++msgstr ""
++
++#: ../gtk/gtk-launch.c:123
++#, c-format
++msgid "Creating AppInfo from id not supported on non unix operating systems"
++msgstr ""
++
++#. Translators: the first %s is the program name, the second one
++#. is the application name.
++#: ../gtk/gtk-launch.c:131
++#, c-format
++msgid "%s: no such application %s"
++msgstr ""
++
++#. Translators: the first %s is the program name, the second one
++#. is the error message.
++#: ../gtk/gtk-launch.c:149
++#, fuzzy, c-format
++msgid "%s: error launching application: %s\n"
++msgstr "Earráid agus deilbhín á luchtú: %s"
++
++#: ../gtk/gtklinkbutton.c:499
+ msgid "Copy URL"
+ msgstr "Cóipeáil URL"
+ 
+-#: gtk/gtklinkbutton.c:601
++#: ../gtk/gtklinkbutton.c:665
+ msgid "Invalid URI"
+ msgstr "URI Neamhbhailí"
+ 
++#: ../gtk/gtklockbutton.c:290
++msgid "Lock"
++msgstr "Cuir Faoi Ghlas"
++
++#: ../gtk/gtklockbutton.c:299
++msgid "Unlock"
++msgstr "Díghlasáil"
++
++#: ../gtk/gtklockbutton.c:308
++msgid ""
++"Dialog is unlocked.\n"
++"Click to prevent further changes"
++msgstr ""
++
++#: ../gtk/gtklockbutton.c:317
++msgid ""
++"Dialog is locked.\n"
++"Click to make changes"
++msgstr ""
++
++#: ../gtk/gtklockbutton.c:326
++msgid ""
++"System policy prevents changes.\n"
++"Contact your system administrator"
++msgstr ""
++
+ #. Description of --gtk-module=MODULES in --help output
+-#: gtk/gtkmain.c:526
++#: ../gtk/gtkmain.c:447
+ msgid "Load additional GTK+ modules"
+ msgstr "Luchtaigh modúil GTK+ breise"
+ 
+ #. Placeholder in --gtk-module=MODULES in --help output
+-#: gtk/gtkmain.c:527
++#: ../gtk/gtkmain.c:448
+ msgid "MODULES"
+ msgstr "MODÚIL"
+ 
+ #. Description of --g-fatal-warnings in --help output
+-#: gtk/gtkmain.c:529
++#: ../gtk/gtkmain.c:450
+ msgid "Make all warnings fatal"
+ msgstr "Déan marfach gach rabhadh"
+ 
+ #. Description of --gtk-debug=FLAGS in --help output
+-#: gtk/gtkmain.c:532
++#: ../gtk/gtkmain.c:453
+ msgid "GTK+ debugging flags to set"
+ msgstr "Bratacha dífhabhtaithe GTK+ a shocrú"
+ 
+ #. Description of --gtk-no-debug=FLAGS in --help output
+-#: gtk/gtkmain.c:535
++#: ../gtk/gtkmain.c:456
+ msgid "GTK+ debugging flags to unset"
+ msgstr "Bratacha dífhabhtaithe GTK+ a dhíshocrú"
+ 
+@@ -1297,123 +1898,141 @@ msgstr "Bratacha dífhabhtaithe GTK+ a dhíshocrú"
+ #. * Do *not* translate it to "predefinito:LTR", if it
+ #. * it isn't default:LTR or default:RTL it will not work
+ #.
+-#: gtk/gtkmain.c:798
++#: ../gtk/gtkmain.c:704
+ msgid "default:LTR"
+ msgstr "default:LTR"
+ 
+-#: gtk/gtkmain.c:863
++#: ../gtk/gtkmain.c:772
+ #, c-format
+ msgid "Cannot open display: %s"
+ msgstr "Ní féidir taispeáint a oscailt: %s"
+ 
+-#: gtk/gtkmain.c:922
++#: ../gtk/gtkmain.c:838
+ msgid "GTK+ Options"
+ msgstr "Roghanna GTK+"
+ 
+-#: gtk/gtkmain.c:922
++#: ../gtk/gtkmain.c:838
+ msgid "Show GTK+ Options"
+ msgstr "Taispeáin Roghanna GTK+"
+ 
+-#: gtk/gtkmountoperation.c:491
++#: ../gtk/gtkmountoperation.c:535
+ msgid "Co_nnect"
+ msgstr "_Nasc"
+ 
+-#: gtk/gtkmountoperation.c:558
+-msgid "Connect _anonymously"
++#: ../gtk/gtkmountoperation.c:609
++#, fuzzy
++msgid "Connect As"
++msgstr "_Nasc"
++
++#: ../gtk/gtkmountoperation.c:618
++#, fuzzy
++msgid "_Anonymous"
+ msgstr "Nasc gan _ainm"
+ 
+-#: gtk/gtkmountoperation.c:567
+-msgid "Connect as u_ser:"
+-msgstr "Nasc mar ú_sáideoir:"
++#: ../gtk/gtkmountoperation.c:627
++msgid "Registered U_ser"
++msgstr ""
+ 
+-#: gtk/gtkmountoperation.c:605
+-msgid "_Username:"
++#: ../gtk/gtkmountoperation.c:638
++#, fuzzy
++msgid "_Username"
+ msgstr "_Ainm úsáideora:"
+ 
+-#: gtk/gtkmountoperation.c:610
+-msgid "_Domain:"
++#: ../gtk/gtkmountoperation.c:643
++#, fuzzy
++msgid "_Domain"
+ msgstr "F_earann:"
+ 
+-#: gtk/gtkmountoperation.c:616
+-msgid "_Password:"
++#: ../gtk/gtkmountoperation.c:649
++#, fuzzy
++msgid "_Password"
+ msgstr "_Focal faire:"
+ 
+-#: gtk/gtkmountoperation.c:634
++#: ../gtk/gtkmountoperation.c:671
+ msgid "Forget password _immediately"
+ msgstr "Déan _dearmad ar an bhfocal faire láithreach"
+ 
+-#: gtk/gtkmountoperation.c:644
++#: ../gtk/gtkmountoperation.c:681
+ msgid "Remember password until you _logout"
+ msgstr "Meabhraigh focal faire go dtí go _logálann tú amach"
+ 
+-#: gtk/gtkmountoperation.c:654
++#: ../gtk/gtkmountoperation.c:691
+ msgid "Remember _forever"
+ msgstr "Meabhraigh go d_eo"
+ 
+-#: gtk/gtkmountoperation.c:883
++#: ../gtk/gtkmountoperation.c:1080
+ #, fuzzy, c-format
+ msgid "Unknown Application (PID %d)"
+ msgstr "Feidhmchlár Anaithnid (pid %d)"
+ 
+-#: gtk/gtkmountoperation.c:1066
+-#, c-format
++#: ../gtk/gtkmountoperation.c:1263
+ msgid "Unable to end process"
+ msgstr "Ní féidir deireadh a chur leis an bpróiseas"
+ 
+-#: gtk/gtkmountoperation.c:1103
++#: ../gtk/gtkmountoperation.c:1300
+ msgid "_End Process"
+ msgstr "Cuir _Deireadh Leis an bPróiseas"
+ 
+-#: gtk/gtkmountoperation-stub.c:64
++#: ../gtk/gtkmountoperation-stub.c:62
+ #, fuzzy, c-format
+ msgid "Cannot kill process with PID %d. Operation is not implemented."
+ msgstr ""
+ "Ní féidir an próiseas le pid %d a mharú. Níl an oibríocht curtha i ngníomh."
+ 
+ #. translators: this string is a name for the 'less' command
+-#: gtk/gtkmountoperation-x11.c:862
++#: ../gtk/gtkmountoperation-x11.c:954
+ msgid "Terminal Pager"
+ msgstr "Brabhsálaí Teirminéil"
+ 
+-#: gtk/gtkmountoperation-x11.c:863
++#: ../gtk/gtkmountoperation-x11.c:955
+ msgid "Top Command"
+ msgstr "Ordú Top"
+ 
+-#: gtk/gtkmountoperation-x11.c:864
++#: ../gtk/gtkmountoperation-x11.c:956
+ msgid "Bourne Again Shell"
+ msgstr "Blaosc Bourne Again"
+ 
+-#: gtk/gtkmountoperation-x11.c:865
++#: ../gtk/gtkmountoperation-x11.c:957
+ msgid "Bourne Shell"
+ msgstr "Blaosc Bourne"
+ 
+-#: gtk/gtkmountoperation-x11.c:866
++#: ../gtk/gtkmountoperation-x11.c:958
+ msgid "Z Shell"
+ msgstr "Blaosc Z"
+ 
+-#: gtk/gtkmountoperation-x11.c:963
++#: ../gtk/gtkmountoperation-x11.c:1055
+ #, fuzzy, c-format
+ msgid "Cannot end process with PID %d: %s"
+ msgstr "Ní féidir deireadh a chur leis an bpróiseas le pid %d: %s"
+ 
+-#: gtk/gtknotebook.c:4619 gtk/gtknotebook.c:7170
++#: ../gtk/gtknotebook.c:5067 ../gtk/gtknotebook.c:7721
+ #, c-format
+ msgid "Page %u"
+ msgstr "Leathanach %u"
+ 
+-#: gtk/gtkpagesetup.c:596 gtk/gtkpapersize.c:838 gtk/gtkpapersize.c:880
++#. Translators: the format here is used to build the string that will be rendered
++#. * in the number emblem.
++#.
++#: ../gtk/gtknumerableicon.c:482
++#, c-format
++msgctxt "Number format"
++msgid "%d"
++msgstr "%d"
++
++#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:848
++#: ../gtk/gtkpapersize.c:888
+ msgid "Not a valid page setup file"
+ msgstr "Ní comhad socrú leathanaigh bailí é"
+ 
+-#: gtk/gtkpagesetupunixdialog.c:179
++#: ../gtk/gtkpagesetupunixdialog.c:167
+ msgid "Any Printer"
+ msgstr "Printéir ar Bith"
+ 
+-#: gtk/gtkpagesetupunixdialog.c:179
++#: ../gtk/gtkpagesetupunixdialog.c:167
+ msgid "For portable documents"
+ msgstr "Le haghaidh cáipéisí iniompartha"
+ 
+-#: gtk/gtkpagesetupunixdialog.c:809
++#: ../gtk/gtkpagesetupunixdialog.c:796
+ #, c-format
+ msgid ""
+ "Margins:\n"
+@@ -1428,239 +2047,229 @@ msgstr ""
+ " Barr: %s %s\n"
+ " Bun: %s %s"
+ 
+-#: gtk/gtkpagesetupunixdialog.c:858 gtk/gtkprintunixdialog.c:3284
++#: ../gtk/gtkpagesetupunixdialog.c:845 ../gtk/gtkprintunixdialog.c:3329
+ msgid "Manage Custom Sizes..."
+ msgstr "Bainistigh Méideanna Saincheaptha..."
+ 
+-#: gtk/gtkpagesetupunixdialog.c:909
++#: ../gtk/gtkpagesetupunixdialog.c:896
+ msgid "_Format for:"
+ msgstr "_Formáid le:"
+ 
+-#: gtk/gtkpagesetupunixdialog.c:931 gtk/gtkprintunixdialog.c:3456
++#: ../gtk/gtkpagesetupunixdialog.c:917 ../gtk/gtkprintunixdialog.c:3477
+ msgid "_Paper size:"
+ msgstr "Méid an _pháipéir:"
+ 
+-#: gtk/gtkpagesetupunixdialog.c:962
++#: ../gtk/gtkpagesetupunixdialog.c:946
+ msgid "_Orientation:"
+ msgstr "_Treoshuíomh:"
+ 
+-#: gtk/gtkpagesetupunixdialog.c:1026 gtk/gtkprintunixdialog.c:3518
++#: ../gtk/gtkpagesetupunixdialog.c:1006 ../gtk/gtkprintunixdialog.c:3531
+ msgid "Page Setup"
+ msgstr "Socrú Leathanaigh"
+ 
+-#: gtk/gtkpathbar.c:154
++#: ../gtk/gtkpathbar.c:159
+ msgid "Up Path"
+ msgstr "Conair Suas"
+ 
+-#: gtk/gtkpathbar.c:156
++#: ../gtk/gtkpathbar.c:161
+ msgid "Down Path"
+ msgstr "Conair Síos"
+ 
+-#: gtk/gtkpathbar.c:1497
++#: ../gtk/gtkpathbar.c:1644
+ msgid "File System Root"
+ msgstr "Fréamh Chóras Comhaid"
+ 
+-#: gtk/gtkprintbackend.c:749
++#: ../gtk/gtkprintbackend.c:750
+ msgid "Authentication"
+ msgstr "Fíordheimhniú"
+ 
+-#: gtk/gtkprinteroptionwidget.c:694
+-msgid "Not available"
+-msgstr "Níl ar fáil"
+-
+-#: gtk/gtkprinteroptionwidget.c:794
+-msgid "Select a folder"
++#: ../gtk/gtkprinteroptionwidget.c:546
++#, fuzzy
++msgid "Select a filename"
+ msgstr "Roghnaigh fillteán"
+ 
+-#: gtk/gtkprinteroptionwidget.c:813
+-msgid "_Save in folder:"
+-msgstr "_Sábháil i bhfillteán:"
++#: ../gtk/gtkprinteroptionwidget.c:770
++msgid "Not available"
++msgstr "Níl ar fáil"
+ 
+ #. translators: this string is the default job title for print
+ #. * jobs. %s gets replaced by the application name, %d gets replaced
+ #. * by the job number.
+ #.
+-#: gtk/gtkprintoperation.c:190
++#: ../gtk/gtkprintoperation.c:260
+ #, c-format
+ msgid "%s job #%d"
+ msgstr "%s jab #%d"
+ 
+-#: gtk/gtkprintoperation.c:1695
++#: ../gtk/gtkprintoperation.c:1777
+ msgctxt "print operation status"
+ msgid "Initial state"
+ msgstr "Staid tosaigh"
+ 
+-#: gtk/gtkprintoperation.c:1696
++#: ../gtk/gtkprintoperation.c:1778
+ msgctxt "print operation status"
+ msgid "Preparing to print"
+ msgstr "Priontáil á ullmhú"
+ 
+-#: gtk/gtkprintoperation.c:1697
++#: ../gtk/gtkprintoperation.c:1779
+ msgctxt "print operation status"
+ msgid "Generating data"
+ msgstr "Sonraí á nginiúint"
+ 
+-#: gtk/gtkprintoperation.c:1698
++#: ../gtk/gtkprintoperation.c:1780
+ msgctxt "print operation status"
+ msgid "Sending data"
+ msgstr "Sonraí á seoladh"
+ 
+-#: gtk/gtkprintoperation.c:1699
++#: ../gtk/gtkprintoperation.c:1781
+ msgctxt "print operation status"
+ msgid "Waiting"
+ msgstr "Ag feitheamh"
+ 
+-#: gtk/gtkprintoperation.c:1700
++#: ../gtk/gtkprintoperation.c:1782
+ msgctxt "print operation status"
+ msgid "Blocking on issue"
+ msgstr "Coiscthe mar gheall ar fhadhb"
+ 
+-#: gtk/gtkprintoperation.c:1701
++#: ../gtk/gtkprintoperation.c:1783
+ msgctxt "print operation status"
+ msgid "Printing"
+ msgstr "Á Phriontáil"
+ 
+-#: gtk/gtkprintoperation.c:1702
++#: ../gtk/gtkprintoperation.c:1784
+ msgctxt "print operation status"
+ msgid "Finished"
+ msgstr "Críochnaithe"
+ 
+-#: gtk/gtkprintoperation.c:1703
++#: ../gtk/gtkprintoperation.c:1785
+ msgctxt "print operation status"
+ msgid "Finished with error"
+ msgstr "Críochnaithe le hearráid"
+ 
+-#: gtk/gtkprintoperation.c:2270
++#: ../gtk/gtkprintoperation.c:2349
+ #, c-format
+ msgid "Preparing %d"
+ msgstr "%d á ullmhú"
+ 
+-#: gtk/gtkprintoperation.c:2272 gtk/gtkprintoperation.c:2902
+-#, c-format
++#: ../gtk/gtkprintoperation.c:2351 ../gtk/gtkprintoperation.c:2983
+ msgid "Preparing"
+ msgstr "Á ullmhú"
+ 
+-#: gtk/gtkprintoperation.c:2275
++#: ../gtk/gtkprintoperation.c:2354
+ #, c-format
+ msgid "Printing %d"
+ msgstr "%d á phriontáil"
+ 
+-#: gtk/gtkprintoperation.c:2932
+-#, c-format
++#: ../gtk/gtkprintoperation.c:3013
+ msgid "Error creating print preview"
+ msgstr "Earráid agus réamhamharc priontála á chruthú"
+ 
+-#: gtk/gtkprintoperation.c:2935
+-#, c-format
++#: ../gtk/gtkprintoperation.c:3016
+ msgid "The most probable reason is that a temporary file could not be created."
+ msgstr "Is dócha gur an chúis ná nárbh fhéidir comhad sealadach a chruthú."
+ 
+-#: gtk/gtkprintoperation-unix.c:297
++#: ../gtk/gtkprintoperation-unix.c:307
+ msgid "Error launching preview"
+ msgstr "Earráid agus réamhamharc á thosú"
+ 
+-#: gtk/gtkprintoperation-unix.c:470 gtk/gtkprintoperation-win32.c:1447
+-msgid "Application"
+-msgstr "Feidhmchlár"
+-
+-#: gtk/gtkprintoperation-win32.c:611
++#: ../gtk/gtkprintoperation-win32.c:609
+ msgid "Printer offline"
+ msgstr "Printéir as líne"
+ 
+-#: gtk/gtkprintoperation-win32.c:613
++#: ../gtk/gtkprintoperation-win32.c:611
+ msgid "Out of paper"
+ msgstr "Páipéar ídithe"
+ 
+ #. Translators: this is a printer status.
+-#: gtk/gtkprintoperation-win32.c:615
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1998
++#: ../gtk/gtkprintoperation-win32.c:613
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2126
+ msgid "Paused"
+ msgstr "Curtha ar sos"
+ 
+-#: gtk/gtkprintoperation-win32.c:617
++#: ../gtk/gtkprintoperation-win32.c:615
+ msgid "Need user intervention"
+ msgstr "Teastaíonn idirghabháil an úsáideora"
+ 
+-#: gtk/gtkprintoperation-win32.c:717
++#: ../gtk/gtkprintoperation-win32.c:715
+ msgid "Custom size"
+ msgstr "Méid saincheaptha"
+ 
+-#: gtk/gtkprintoperation-win32.c:1539
++#: ../gtk/gtkprintoperation-win32.c:1537
+ msgid "No printer found"
+ msgstr "Níor aimsíodh aon phrintéir"
+ 
+-#: gtk/gtkprintoperation-win32.c:1566
++#: ../gtk/gtkprintoperation-win32.c:1564
+ msgid "Invalid argument to CreateDC"
+ msgstr "Argóint neamhbhailí go CreateDC"
+ 
+-#: gtk/gtkprintoperation-win32.c:1602 gtk/gtkprintoperation-win32.c:1829
++#: ../gtk/gtkprintoperation-win32.c:1600 ../gtk/gtkprintoperation-win32.c:1827
+ msgid "Error from StartDoc"
+ msgstr "Earráid ó StartDoc"
+ 
+-#: gtk/gtkprintoperation-win32.c:1684 gtk/gtkprintoperation-win32.c:1707
+-#: gtk/gtkprintoperation-win32.c:1755
++#: ../gtk/gtkprintoperation-win32.c:1682 ../gtk/gtkprintoperation-win32.c:1705
++#: ../gtk/gtkprintoperation-win32.c:1753
+ msgid "Not enough free memory"
+ msgstr "Cuimhne ídithe"
+ 
+-#: gtk/gtkprintoperation-win32.c:1760
++#: ../gtk/gtkprintoperation-win32.c:1758
+ msgid "Invalid argument to PrintDlgEx"
+ msgstr "Argóint neamhbhailí go PrintDlgEx"
+ 
+-#: gtk/gtkprintoperation-win32.c:1765
++#: ../gtk/gtkprintoperation-win32.c:1763
+ msgid "Invalid pointer to PrintDlgEx"
+ msgstr "Pointeoir neamhbhailí go PrintDlgEx"
+ 
+-#: gtk/gtkprintoperation-win32.c:1770
++#: ../gtk/gtkprintoperation-win32.c:1768
+ msgid "Invalid handle to PrintDlgEx"
+ msgstr "Lorgán neamhbhailí chuig PrintDlgEx"
+ 
+-#: gtk/gtkprintoperation-win32.c:1775
++#: ../gtk/gtkprintoperation-win32.c:1773
+ msgid "Unspecified error"
+ msgstr "Earráid gan sonrú"
+ 
+-#: gtk/gtkprintunixdialog.c:618
++#: ../gtk/gtkprintunixdialog.c:681
+ msgid "Getting printer information failed"
+ msgstr "Theip ar fháil eolais printéara"
+ 
+-#: gtk/gtkprintunixdialog.c:1873
++#: ../gtk/gtkprintunixdialog.c:1916
+ msgid "Getting printer information..."
+ msgstr "Eolas printéara á fháil..."
+ 
+-#: gtk/gtkprintunixdialog.c:2139
++#: ../gtk/gtkprintunixdialog.c:2184
+ msgid "Printer"
+ msgstr "Printéir"
+ 
+ #. Translators: this is the header for the location column in the print dialog
+-#: gtk/gtkprintunixdialog.c:2149
++#: ../gtk/gtkprintunixdialog.c:2194
+ msgid "Location"
+ msgstr "Suíomh"
+ 
+ #. Translators: this is the header for the printer status column in the print dialog
+-#: gtk/gtkprintunixdialog.c:2160
++#: ../gtk/gtkprintunixdialog.c:2205
+ msgid "Status"
+ msgstr "Stádas"
+ 
+-#: gtk/gtkprintunixdialog.c:2186
++#: ../gtk/gtkprintunixdialog.c:2231
+ msgid "Range"
+ msgstr "Raon"
+ 
+-#: gtk/gtkprintunixdialog.c:2190
++#: ../gtk/gtkprintunixdialog.c:2235
+ msgid "_All Pages"
+ msgstr "_Gach Leathanach"
+ 
+-#: gtk/gtkprintunixdialog.c:2197
++#: ../gtk/gtkprintunixdialog.c:2240
+ msgid "C_urrent Page"
+ msgstr "Leathanach _Reatha"
+ 
+-#: gtk/gtkprintunixdialog.c:2207
++#: ../gtk/gtkprintunixdialog.c:2248
+ msgid "Se_lection"
+ msgstr "_Roghnú"
+ 
+-#: gtk/gtkprintunixdialog.c:2216
++#: ../gtk/gtkprintunixdialog.c:2254
+ msgid "Pag_es:"
+ msgstr "_Leathanaigh:"
+ 
+-#: gtk/gtkprintunixdialog.c:2217
++#: ../gtk/gtkprintunixdialog.c:2255
+ msgid ""
+ "Specify one or more page ranges,\n"
+ " e.g. 1-3,7,11"
+@@ -1668,28 +2277,28 @@ msgstr ""
+ "Sonraigh raon leathanaigh amháin nó níos mó,\n"
+ " m.s. 1-3,7,11"
+ 
+-#: gtk/gtkprintunixdialog.c:2227
++#: ../gtk/gtkprintunixdialog.c:2264
+ msgid "Pages"
+ msgstr "Leathanaigh"
+ 
+-#: gtk/gtkprintunixdialog.c:2240
++#: ../gtk/gtkprintunixdialog.c:2275
+ msgid "Copies"
+ msgstr "Cóipeanna"
+ 
+ #. FIXME chpe: too much space between Copies and spinbutton, put those 2 in a hbox and make it span 2 columns
+-#: gtk/gtkprintunixdialog.c:2245
++#: ../gtk/gtkprintunixdialog.c:2280
+ msgid "Copie_s:"
+ msgstr "Cóip_eanna:"
+ 
+-#: gtk/gtkprintunixdialog.c:2263
++#: ../gtk/gtkprintunixdialog.c:2296
+ msgid "C_ollate"
+ msgstr "C_omhordaigh"
+ 
+-#: gtk/gtkprintunixdialog.c:2271
++#: ../gtk/gtkprintunixdialog.c:2302
+ msgid "_Reverse"
+ msgstr "_Aisiompaithe"
+ 
+-#: gtk/gtkprintunixdialog.c:2291
++#: ../gtk/gtkprintunixdialog.c:2318
+ msgid "General"
+ msgstr "Ginearálta"
+ 
+@@ -1699,168 +2308,168 @@ msgstr "Ginearálta"
+ #. Translators: These strings name the possible arrangements of
+ #. * multiple pages on a sheet when printing
+ #.
+-#: gtk/gtkprintunixdialog.c:3017
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3508
++#: ../gtk/gtkprintunixdialog.c:3058
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3686
+ msgid "Left to right, top to bottom"
+ msgstr "Clé go deas, barr go bun"
+ 
+-#: gtk/gtkprintunixdialog.c:3017
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3508
++#: ../gtk/gtkprintunixdialog.c:3058
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3686
+ msgid "Left to right, bottom to top"
+ msgstr "Clé go deas, bun go barr"
+ 
+-#: gtk/gtkprintunixdialog.c:3018
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3509
++#: ../gtk/gtkprintunixdialog.c:3059
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3687
+ msgid "Right to left, top to bottom"
+ msgstr "Deas go clé, barr go bun"
+ 
+-#: gtk/gtkprintunixdialog.c:3018
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3509
++#: ../gtk/gtkprintunixdialog.c:3059
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3687
+ msgid "Right to left, bottom to top"
+ msgstr "Deas go clé, bun go barr"
+ 
+-#: gtk/gtkprintunixdialog.c:3019
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3510
++#: ../gtk/gtkprintunixdialog.c:3060
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3688
+ msgid "Top to bottom, left to right"
+ msgstr "Barr go bun, clé go deas"
+ 
+-#: gtk/gtkprintunixdialog.c:3019
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3510
++#: ../gtk/gtkprintunixdialog.c:3060
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3688
+ msgid "Top to bottom, right to left"
+ msgstr "Barr go bunn, deas go clé"
+ 
+-#: gtk/gtkprintunixdialog.c:3020
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3511
++#: ../gtk/gtkprintunixdialog.c:3061
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3689
+ msgid "Bottom to top, left to right"
+ msgstr "Bun go barr, clé go deas"
+ 
+-#: gtk/gtkprintunixdialog.c:3020
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3511
++#: ../gtk/gtkprintunixdialog.c:3061
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3689
+ msgid "Bottom to top, right to left"
+ msgstr "Barr go bun, deas go clé"
+ 
+ #. Translators, this string is used to label the option in the print
+ #. * dialog that controls in what order multiple pages are arranged
+ #.
+-#: gtk/gtkprintunixdialog.c:3024 gtk/gtkprintunixdialog.c:3037
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3543
++#: ../gtk/gtkprintunixdialog.c:3065 ../gtk/gtkprintunixdialog.c:3078
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3766
+ msgid "Page Ordering"
+ msgstr "Cur in Ord Leathanaigh"
+ 
+-#: gtk/gtkprintunixdialog.c:3053
++#: ../gtk/gtkprintunixdialog.c:3094
+ msgid "Left to right"
+ msgstr "Clé go deas"
+ 
+-#: gtk/gtkprintunixdialog.c:3054
++#: ../gtk/gtkprintunixdialog.c:3095
+ msgid "Right to left"
+ msgstr "Deas go clé"
+ 
+-#: gtk/gtkprintunixdialog.c:3066
++#: ../gtk/gtkprintunixdialog.c:3107
+ msgid "Top to bottom"
+ msgstr "Barr go bun"
+ 
+-#: gtk/gtkprintunixdialog.c:3067
++#: ../gtk/gtkprintunixdialog.c:3108
+ msgid "Bottom to top"
+ msgstr "Bun go barr"
+ 
+-#: gtk/gtkprintunixdialog.c:3307
++#: ../gtk/gtkprintunixdialog.c:3352
+ msgid "Layout"
+ msgstr "Leagan Amach"
+ 
+-#: gtk/gtkprintunixdialog.c:3311
++#: ../gtk/gtkprintunixdialog.c:3356
+ msgid "T_wo-sided:"
+ msgstr "_Déthaobhach:"
+ 
+-#: gtk/gtkprintunixdialog.c:3326
++#: ../gtk/gtkprintunixdialog.c:3368
+ msgid "Pages per _side:"
+ msgstr "Leathanaigh sa _taobh:"
+ 
+-#: gtk/gtkprintunixdialog.c:3343
++#: ../gtk/gtkprintunixdialog.c:3382
+ msgid "Page or_dering:"
+ msgstr "Cur in _ord leathanaigh:"
+ 
+-#: gtk/gtkprintunixdialog.c:3359
++#: ../gtk/gtkprintunixdialog.c:3395
+ msgid "_Only print:"
+ msgstr "_Ná priontáil ach:"
+ 
+ #. In enum order
+-#: gtk/gtkprintunixdialog.c:3374
++#: ../gtk/gtkprintunixdialog.c:3407
+ msgid "All sheets"
+ msgstr "Gach leathán"
+ 
+-#: gtk/gtkprintunixdialog.c:3375
++#: ../gtk/gtkprintunixdialog.c:3408
+ msgid "Even sheets"
+ msgstr "Leatháin chothroma"
+ 
+-#: gtk/gtkprintunixdialog.c:3376
++#: ../gtk/gtkprintunixdialog.c:3409
+ msgid "Odd sheets"
+ msgstr "Leatháin chorra"
+ 
+-#: gtk/gtkprintunixdialog.c:3379
++#: ../gtk/gtkprintunixdialog.c:3412
+ msgid "Sc_ale:"
+ msgstr "_Scála:"
+ 
+-#: gtk/gtkprintunixdialog.c:3406
++#: ../gtk/gtkprintunixdialog.c:3436
+ msgid "Paper"
+ msgstr "Páipéar"
+ 
+-#: gtk/gtkprintunixdialog.c:3410
++#: ../gtk/gtkprintunixdialog.c:3440
+ msgid "Paper _type:"
+ msgstr "Cineál an pháipéir:"
+ 
+-#: gtk/gtkprintunixdialog.c:3425
++#: ../gtk/gtkprintunixdialog.c:3452
+ msgid "Paper _source:"
+ msgstr "_Foinse an pháipéir:"
+ 
+-#: gtk/gtkprintunixdialog.c:3440
++#: ../gtk/gtkprintunixdialog.c:3464
+ msgid "Output t_ray:"
+ msgstr "T_ráidire aschurtha:"
+ 
+-#: gtk/gtkprintunixdialog.c:3480
++#: ../gtk/gtkprintunixdialog.c:3497
+ msgid "Or_ientation:"
+ msgstr "_Treoshuíomh:"
+ 
+ #. In enum order
+-#: gtk/gtkprintunixdialog.c:3495
++#: ../gtk/gtkprintunixdialog.c:3509
+ msgid "Portrait"
+ msgstr "Portráid"
+ 
+-#: gtk/gtkprintunixdialog.c:3496
++#: ../gtk/gtkprintunixdialog.c:3510
+ msgid "Landscape"
+ msgstr "Tírdhreach"
+ 
+-#: gtk/gtkprintunixdialog.c:3497
++#: ../gtk/gtkprintunixdialog.c:3511
+ msgid "Reverse portrait"
+ msgstr "Portráid aisiompaithe"
+ 
+-#: gtk/gtkprintunixdialog.c:3498
++#: ../gtk/gtkprintunixdialog.c:3512
+ msgid "Reverse landscape"
+ msgstr "Tírdhreach aisiompaithe"
+ 
+-#: gtk/gtkprintunixdialog.c:3543
++#: ../gtk/gtkprintunixdialog.c:3556
+ msgid "Job Details"
+ msgstr "Sonraí Jab:"
+ 
+-#: gtk/gtkprintunixdialog.c:3549
++#: ../gtk/gtkprintunixdialog.c:3560
+ msgid "Pri_ority:"
+ msgstr "Tosaí_ocht:"
+ 
+-#: gtk/gtkprintunixdialog.c:3564
++#: ../gtk/gtkprintunixdialog.c:3572
+ msgid "_Billing info:"
+ msgstr "Eolas billeáil"
+ 
+-#: gtk/gtkprintunixdialog.c:3582
++#: ../gtk/gtkprintunixdialog.c:3587
+ msgid "Print Document"
+ msgstr "Priontáil Cáipéis"
+ 
+ #. Translators: this is one of the choices for the print at option
+ #. * in the print dialog
+ #.
+-#: gtk/gtkprintunixdialog.c:3591
++#: ../gtk/gtkprintunixdialog.c:3594
+ msgid "_Now"
+ msgstr "A_nois"
+ 
+-#: gtk/gtkprintunixdialog.c:3602
++#: ../gtk/gtkprintunixdialog.c:3603
+ msgid "A_t:"
+ msgstr "A_g:"
+ 
+@@ -1868,7 +2477,7 @@ msgstr "A_g:"
+ #. * You can remove the am/pm values below for your locale if they are not
+ #. * supported.
+ #.
+-#: gtk/gtkprintunixdialog.c:3608
++#: ../gtk/gtkprintunixdialog.c:3609
+ msgid ""
+ "Specify the time of print,\n"
+ " e.g. 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm"
+@@ -1876,121 +2485,105 @@ msgstr ""
+ "Sonraigh am an phriontála,\n"
+ " m.s. 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm"
+ 
+-#: gtk/gtkprintunixdialog.c:3618
++#: ../gtk/gtkprintunixdialog.c:3617
+ msgid "Time of print"
+ msgstr "Am priontála"
+ 
+-#: gtk/gtkprintunixdialog.c:3634
++#: ../gtk/gtkprintunixdialog.c:3631
+ msgid "On _hold"
+ msgstr "Ar feit_heamh"
+ 
+-#: gtk/gtkprintunixdialog.c:3635
++#: ../gtk/gtkprintunixdialog.c:3632
+ msgid "Hold the job until it is explicitly released"
+ msgstr "Coinnigh an jab go dtí go scaoiltear é go follasach"
+ 
+-#: gtk/gtkprintunixdialog.c:3655
++#: ../gtk/gtkprintunixdialog.c:3650
+ msgid "Add Cover Page"
+ msgstr "Cuir Leathanach Cumhdaigh Leis"
+ 
+ #. Translators, this is the label used for the option in the print
+ #. * dialog that controls the front cover page.
+ #.
+-#: gtk/gtkprintunixdialog.c:3664
++#: ../gtk/gtkprintunixdialog.c:3657
+ msgid "Be_fore:"
+ msgstr "_Roimh:"
+ 
+ #. Translators, this is the label used for the option in the print
+ #. * dialog that controls the back cover page.
+ #.
+-#: gtk/gtkprintunixdialog.c:3682
++#: ../gtk/gtkprintunixdialog.c:3672
+ msgid "_After:"
+ msgstr "_Tar Éis:"
+ 
+ #. Translators: this is the tab label for the notebook tab containing
+ #. * job-specific options in the print dialog
+ #.
+-#: gtk/gtkprintunixdialog.c:3700
++#: ../gtk/gtkprintunixdialog.c:3687
+ msgid "Job"
+ msgstr "Jab"
+ 
+-#: gtk/gtkprintunixdialog.c:3766
++#: ../gtk/gtkprintunixdialog.c:3753
+ msgid "Advanced"
+ msgstr "Casta"
+ 
+ #. Translators: this will appear as tab label in print dialog.
+-#: gtk/gtkprintunixdialog.c:3804
++#: ../gtk/gtkprintunixdialog.c:3791
+ msgid "Image Quality"
+ msgstr "Cáilíocht Íomhá"
+ 
+ #. Translators: this will appear as tab label in print dialog.
+-#: gtk/gtkprintunixdialog.c:3808
++#: ../gtk/gtkprintunixdialog.c:3795
+ msgid "Color"
+ msgstr "Dath"
+ 
+ #. Translators: this will appear as tab label in print dialog.
+ #. It's a typographical term, as in "Binding and finishing"
+-#: gtk/gtkprintunixdialog.c:3813
++#: ../gtk/gtkprintunixdialog.c:3800
+ msgid "Finishing"
+ msgstr "Ag críochnú"
+ 
+-#: gtk/gtkprintunixdialog.c:3823
++#: ../gtk/gtkprintunixdialog.c:3810
+ msgid "Some of the settings in the dialog conflict"
+ msgstr "Tá cuid de na socruithe sa dialóg in aghaidh a chéile"
+ 
+-#: gtk/gtkprintunixdialog.c:3846
++#: ../gtk/gtkprintunixdialog.c:3836
+ msgid "Print"
+ msgstr "Priontáil"
+ 
+-#: gtk/gtkrc.c:2834
+-#, c-format
+-msgid "Unable to find include file: \"%s\""
+-msgstr "Ní féidir comhad ceanntáisc a aimsiú: \"%s\""
+-
+-#: gtk/gtkrc.c:3470 gtk/gtkrc.c:3473
+-#, c-format
+-msgid "Unable to locate image file in pixmap_path: \"%s\""
+-msgstr "Ní féidir íomhá chomaid a aimsiú i bpixmap_path: \"%s\""
+-
+-#: gtk/gtkrecentaction.c:165 gtk/gtkrecentaction.c:173
+-#: gtk/gtkrecentchoosermenu.c:615 gtk/gtkrecentchoosermenu.c:623
+-#, c-format
+-msgid "This function is not implemented for widgets of class '%s'"
+-msgstr "Níl an feidhm seo curtha i ngníomh do ghiuirléidí na haicme '%s'"
+-
+-#: gtk/gtkrecentchooserdefault.c:482
++#: ../gtk/gtkrecentchooserdefault.c:480
+ msgid "Select which type of documents are shown"
+ msgstr "Roghnaigh an cineál cáipéisí le taispeáint"
+ 
+-#: gtk/gtkrecentchooserdefault.c:1138 gtk/gtkrecentchooserdefault.c:1175
++#: ../gtk/gtkrecentchooserdefault.c:1130 ../gtk/gtkrecentchooserdefault.c:1167
+ #, c-format
+ msgid "No item for URI '%s' found"
+ msgstr "Níor aimsíodh mír le URI '%s'"
+ 
+-#: gtk/gtkrecentchooserdefault.c:1302
++#: ../gtk/gtkrecentchooserdefault.c:1294
+ msgid "Untitled filter"
+ msgstr "Scagaire gan teideal"
+ 
+-#: gtk/gtkrecentchooserdefault.c:1655
++#: ../gtk/gtkrecentchooserdefault.c:1647
+ msgid "Could not remove item"
+ msgstr "Níorbh fhéidir mír a bhaint"
+ 
+-#: gtk/gtkrecentchooserdefault.c:1699
++#: ../gtk/gtkrecentchooserdefault.c:1691
+ msgid "Could not clear list"
+ msgstr "Níorbh fhéidir liosta a ghlanadh"
+ 
+-#: gtk/gtkrecentchooserdefault.c:1783
++#: ../gtk/gtkrecentchooserdefault.c:1775
+ msgid "Copy _Location"
+ msgstr "Cóipeái_l Suíomh"
+ 
+-#: gtk/gtkrecentchooserdefault.c:1796
++#: ../gtk/gtkrecentchooserdefault.c:1788
+ msgid "_Remove From List"
+ msgstr "_Bain den Liosta"
+ 
+-#: gtk/gtkrecentchooserdefault.c:1805
++#: ../gtk/gtkrecentchooserdefault.c:1797
+ msgid "_Clear List"
+ msgstr "_Glan Liosta"
+ 
+-#: gtk/gtkrecentchooserdefault.c:1819
++#: ../gtk/gtkrecentchooserdefault.c:1811
+ msgid "Show _Private Resources"
+ msgstr "Taispeáin _Acmhainní Príobháideacha"
+ 
+@@ -2004,21 +2597,21 @@ msgstr "Taispeáin _Acmhainní Príobháideacha"
+ #. * user appended or prepended custom menu items to the
+ #. * recent chooser menu widget.
+ #.
+-#: gtk/gtkrecentchoosermenu.c:369
++#: ../gtk/gtkrecentchoosermenu.c:360
+ msgid "No items found"
+ msgstr "Níor aimsíodh mír ar bith"
+ 
+-#: gtk/gtkrecentchoosermenu.c:535 gtk/gtkrecentchoosermenu.c:591
++#: ../gtk/gtkrecentchoosermenu.c:526 ../gtk/gtkrecentchoosermenu.c:582
+ #, c-format
+ msgid "No recently used resource found with URI `%s'"
+ msgstr "Níor aimsíodh aon acmhainn úsáidte le déanaí leis an URI `%s'"
+ 
+-#: gtk/gtkrecentchoosermenu.c:802
++#: ../gtk/gtkrecentchoosermenu.c:792
+ #, c-format
+ msgid "Open '%s'"
+ msgstr "Oscail '%s'"
+ 
+-#: gtk/gtkrecentchoosermenu.c:832
++#: ../gtk/gtkrecentchoosermenu.c:822
+ msgid "Unknown item"
+ msgstr "Mír anaithnid"
+ 
+@@ -2027,7 +2620,7 @@ msgstr "Mír anaithnid"
+ #. * the %s is the name of the item. Please keep the _ in front
+ #. * of the number to give these menu items a mnemonic.
+ #.
+-#: gtk/gtkrecentchoosermenu.c:843
++#: ../gtk/gtkrecentchoosermenu.c:833
+ #, c-format
+ msgctxt "recent menu label"
+ msgid "_%d. %s"
+@@ -2036,46 +2629,42 @@ msgstr "_%d. %s"
+ #. This is the format that is used for items in a recent files menu.
+ #. * The %d is the number of the item, the %s is the name of the item.
+ #.
+-#: gtk/gtkrecentchoosermenu.c:848
++#: ../gtk/gtkrecentchoosermenu.c:838
+ #, c-format
+ msgctxt "recent menu label"
+ msgid "%d. %s"
+ msgstr "%d. %s"
+ 
+-#: gtk/gtkrecentmanager.c:980 gtk/gtkrecentmanager.c:993
+-#: gtk/gtkrecentmanager.c:1131 gtk/gtkrecentmanager.c:1141
+-#: gtk/gtkrecentmanager.c:1194 gtk/gtkrecentmanager.c:1203
+-#: gtk/gtkrecentmanager.c:1218
++#: ../gtk/gtkrecentmanager.c:1010 ../gtk/gtkrecentmanager.c:1023
++#: ../gtk/gtkrecentmanager.c:1160 ../gtk/gtkrecentmanager.c:1170
++#: ../gtk/gtkrecentmanager.c:1222 ../gtk/gtkrecentmanager.c:1231
++#: ../gtk/gtkrecentmanager.c:1246
+ #, c-format
+ msgid "Unable to find an item with URI '%s'"
+ msgstr "Ní féidir mír a aimsiú le URI '%s'"
+ 
+-#: gtk/gtkspinner.c:456
+-msgctxt "throbbing progress animation widget"
+-msgid "Spinner"
+-msgstr ""
+-
+-#: gtk/gtkspinner.c:457
+-msgid "Provides visual indication of progress"
++#: ../gtk/gtkrecentmanager.c:2446
++#, c-format
++msgid "No registered application with name '%s' for item with URI '%s' found"
+ msgstr ""
+ 
+ #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate
+-#: gtk/gtkstock.c:313
++#: ../gtk/gtkstock.c:324
+ msgctxt "Stock label"
+ msgid "Information"
+ msgstr "Eolas"
+ 
+-#: gtk/gtkstock.c:314
++#: ../gtk/gtkstock.c:325
+ msgctxt "Stock label"
+ msgid "Warning"
+ msgstr "Rabhadh"
+ 
+-#: gtk/gtkstock.c:315
++#: ../gtk/gtkstock.c:326
+ msgctxt "Stock label"
+ msgid "Error"
+ msgstr "Earráid"
+ 
+-#: gtk/gtkstock.c:316
++#: ../gtk/gtkstock.c:327
+ msgctxt "Stock label"
+ msgid "Question"
+ msgstr "Ceist"
+@@ -2083,695 +2672,707 @@ msgstr "Ceist"
+ #. FIXME these need accelerators when appropriate, and
+ #. * need the mnemonics to be rationalized
+ #.
+-#: gtk/gtkstock.c:321
++#: ../gtk/gtkstock.c:332
+ msgctxt "Stock label"
+ msgid "_About"
+ msgstr "_Maidir Leis Seo"
+ 
+-#: gtk/gtkstock.c:322
++#: ../gtk/gtkstock.c:333
+ msgctxt "Stock label"
+ msgid "_Add"
+ msgstr "Cuir _Leis"
+ 
+-#: gtk/gtkstock.c:323
++#: ../gtk/gtkstock.c:334
+ msgctxt "Stock label"
+ msgid "_Apply"
+ msgstr "Cuir i bh_Feidhm"
+ 
+-#: gtk/gtkstock.c:324
++#: ../gtk/gtkstock.c:335
+ msgctxt "Stock label"
+ msgid "_Bold"
+ msgstr "_Trom"
+ 
+-#: gtk/gtkstock.c:325
++#: ../gtk/gtkstock.c:336
+ msgctxt "Stock label"
+ msgid "_Cancel"
+ msgstr "_Cealaigh"
+ 
+-#: gtk/gtkstock.c:326
++#: ../gtk/gtkstock.c:337
+ #, fuzzy
+ msgctxt "Stock label"
+ msgid "_CD-ROM"
+ msgstr "_CD-ROM"
+ 
+-#: gtk/gtkstock.c:327
++#: ../gtk/gtkstock.c:338
+ msgctxt "Stock label"
+ msgid "_Clear"
+ msgstr "_Glan"
+ 
+-#: gtk/gtkstock.c:328
++#: ../gtk/gtkstock.c:339
+ msgctxt "Stock label"
+ msgid "_Close"
+ msgstr "_Dún"
+ 
+-#: gtk/gtkstock.c:329
++#: ../gtk/gtkstock.c:340
+ msgctxt "Stock label"
+ msgid "C_onnect"
+ msgstr "_Nasc"
+ 
+-#: gtk/gtkstock.c:330
++#: ../gtk/gtkstock.c:341
+ msgctxt "Stock label"
+ msgid "_Convert"
+ msgstr "_Tiontaigh"
+ 
+-#: gtk/gtkstock.c:331
++#: ../gtk/gtkstock.c:342
+ msgctxt "Stock label"
+ msgid "_Copy"
+ msgstr "_Cóipeáil"
+ 
+-#: gtk/gtkstock.c:332
++#: ../gtk/gtkstock.c:343
+ msgctxt "Stock label"
+ msgid "Cu_t"
+ msgstr "_Gearr"
+ 
+-#: gtk/gtkstock.c:333
++#: ../gtk/gtkstock.c:344
+ msgctxt "Stock label"
+ msgid "_Delete"
+ msgstr "_Scrios"
+ 
+-#: gtk/gtkstock.c:334
++#: ../gtk/gtkstock.c:345
+ msgctxt "Stock label"
+ msgid "_Discard"
+ msgstr "_Cuir i Leataobh"
+ 
+-#: gtk/gtkstock.c:335
++#: ../gtk/gtkstock.c:346
+ msgctxt "Stock label"
+ msgid "_Disconnect"
+ msgstr "_Dínasc"
+ 
+-#: gtk/gtkstock.c:336
++#: ../gtk/gtkstock.c:347
+ msgctxt "Stock label"
+ msgid "_Execute"
+ msgstr "_Rith"
+ 
+-#: gtk/gtkstock.c:337
++#: ../gtk/gtkstock.c:348
+ msgctxt "Stock label"
+ msgid "_Edit"
+ msgstr "Cuir in _Eagar"
+ 
+-#: gtk/gtkstock.c:338
++#: ../gtk/gtkstock.c:349
+ #, fuzzy
+ msgctxt "Stock label"
+ msgid "_File"
+ msgstr "Comhad"
+ 
+-#: gtk/gtkstock.c:339
++#: ../gtk/gtkstock.c:350
+ msgctxt "Stock label"
+ msgid "_Find"
+ msgstr "_Aimsigh"
+ 
+-#: gtk/gtkstock.c:340
++#: ../gtk/gtkstock.c:351
+ msgctxt "Stock label"
+ msgid "Find and _Replace"
+ msgstr "Aimsigh agus _Ionadaigh"
+ 
+-#: gtk/gtkstock.c:341
++#: ../gtk/gtkstock.c:352
+ msgctxt "Stock label"
+ msgid "_Floppy"
+ msgstr "Diosca _Bog"
+ 
+-#: gtk/gtkstock.c:342
++#: ../gtk/gtkstock.c:353
+ msgctxt "Stock label"
+ msgid "_Fullscreen"
+ msgstr "_Lánscáileán"
+ 
+-#: gtk/gtkstock.c:343
++#: ../gtk/gtkstock.c:354
+ msgctxt "Stock label"
+ msgid "_Leave Fullscreen"
+ msgstr "_Fág Lánscáileán"
+ 
+ #. This is a navigation label as in "go to the bottom of the page"
+-#: gtk/gtkstock.c:345
++#: ../gtk/gtkstock.c:356
+ msgctxt "Stock label, navigation"
+ msgid "_Bottom"
+ msgstr "_Bun:"
+ 
+ #. This is a navigation label as in "go to the first page"
+-#: gtk/gtkstock.c:347
++#: ../gtk/gtkstock.c:358
+ msgctxt "Stock label, navigation"
+ msgid "_First"
+ msgstr "An _Chéad"
+ 
+ #. This is a navigation label as in "go to the last page"
+-#: gtk/gtkstock.c:349
++#: ../gtk/gtkstock.c:360
+ msgctxt "Stock label, navigation"
+ msgid "_Last"
+ msgstr "An _Deireanach"
+ 
+ #. This is a navigation label as in "go to the top of the page"
+-#: gtk/gtkstock.c:351
++#: ../gtk/gtkstock.c:362
+ msgctxt "Stock label, navigation"
+ msgid "_Top"
+ msgstr "Ba_rr:"
+ 
+ #. This is a navigation label as in "go back"
+-#: gtk/gtkstock.c:353
++#: ../gtk/gtkstock.c:364
+ msgctxt "Stock label, navigation"
+ msgid "_Back"
+ msgstr "Ar A_is"
+ 
+ #. This is a navigation label as in "go down"
+-#: gtk/gtkstock.c:355
++#: ../gtk/gtkstock.c:366
+ msgctxt "Stock label, navigation"
+ msgid "_Down"
+ msgstr "_Síos"
+ 
+ #. This is a navigation label as in "go forward"
+-#: gtk/gtkstock.c:357
++#: ../gtk/gtkstock.c:368
+ msgctxt "Stock label, navigation"
+ msgid "_Forward"
+ msgstr "Ar A_ghaidh"
+ 
+ #. This is a navigation label as in "go up"
+-#: gtk/gtkstock.c:359
++#: ../gtk/gtkstock.c:370
+ msgctxt "Stock label, navigation"
+ msgid "_Up"
+ msgstr "_Siar"
+ 
+-#: gtk/gtkstock.c:360
++#: ../gtk/gtkstock.c:371
+ #, fuzzy
+ msgctxt "Stock label"
+ msgid "_Hard Disk"
+ msgstr "Diosca _Crua"
+ 
+-#: gtk/gtkstock.c:361
++#: ../gtk/gtkstock.c:372
+ msgctxt "Stock label"
+ msgid "_Help"
+ msgstr "Cab_hair"
+ 
+-#: gtk/gtkstock.c:362
++#: ../gtk/gtkstock.c:373
+ msgctxt "Stock label"
+ msgid "_Home"
+ msgstr "_Baile"
+ 
+-#: gtk/gtkstock.c:363
++#: ../gtk/gtkstock.c:374
+ msgctxt "Stock label"
+ msgid "Increase Indent"
+ msgstr "Méadaigh Eang"
+ 
+-#: gtk/gtkstock.c:364
++#: ../gtk/gtkstock.c:375
+ msgctxt "Stock label"
+ msgid "Decrease Indent"
+ msgstr "Laghdaigh Eang"
+ 
+-#: gtk/gtkstock.c:365
++#: ../gtk/gtkstock.c:376
+ msgctxt "Stock label"
+ msgid "_Index"
+ msgstr "_Innéacs"
+ 
+-#: gtk/gtkstock.c:366
++#: ../gtk/gtkstock.c:377
+ msgctxt "Stock label"
+ msgid "_Information"
+ msgstr "_Eolas"
+ 
+-#: gtk/gtkstock.c:367
++#: ../gtk/gtkstock.c:378
+ msgctxt "Stock label"
+ msgid "_Italic"
+ msgstr "Cló _Iodálach"
+ 
+-#: gtk/gtkstock.c:368
++#: ../gtk/gtkstock.c:379
+ msgctxt "Stock label"
+ msgid "_Jump to"
+ msgstr "_Léim Go"
+ 
+ #. This is about text justification, "centered text"
+-#: gtk/gtkstock.c:370
++#: ../gtk/gtkstock.c:381
+ msgctxt "Stock label"
+ msgid "_Center"
+ msgstr "_Láraigh"
+ 
+ #. This is about text justification
+-#: gtk/gtkstock.c:372
++#: ../gtk/gtkstock.c:383
+ msgctxt "Stock label"
+ msgid "_Fill"
+ msgstr "_Líon"
+ 
+ #. This is about text justification, "left-justified text"
+-#: gtk/gtkstock.c:374
++#: ../gtk/gtkstock.c:385
+ msgctxt "Stock label"
+ msgid "_Left"
+ msgstr "Ar _Chlé"
+ 
+ #. This is about text justification, "right-justified text"
+-#: gtk/gtkstock.c:376
++#: ../gtk/gtkstock.c:387
+ msgctxt "Stock label"
+ msgid "_Right"
+ msgstr "Ar _Dheis"
+ 
+ #. Media label, as in "fast forward"
+-#: gtk/gtkstock.c:379
++#: ../gtk/gtkstock.c:390
+ msgctxt "Stock label, media"
+ msgid "_Forward"
+ msgstr "_Ar Aghaidh"
+ 
+ #. Media label, as in "next song"
+-#: gtk/gtkstock.c:381
++#: ../gtk/gtkstock.c:392
+ msgctxt "Stock label, media"
+ msgid "_Next"
+ msgstr "Ar _Aghaidh"
+ 
+ #. Media label, as in "pause music"
+-#: gtk/gtkstock.c:383
++#: ../gtk/gtkstock.c:394
+ msgctxt "Stock label, media"
+ msgid "P_ause"
+ msgstr "_Sos"
+ 
+ #. Media label, as in "play music"
+-#: gtk/gtkstock.c:385
++#: ../gtk/gtkstock.c:396
+ msgctxt "Stock label, media"
+ msgid "_Play"
+ msgstr "_Seinn"
+ 
+ #. Media label, as in  "previous song"
+-#: gtk/gtkstock.c:387
++#: ../gtk/gtkstock.c:398
+ msgctxt "Stock label, media"
+ msgid "Pre_vious"
+ msgstr "_Roimhe Seo"
+ 
+ #. Media label
+-#: gtk/gtkstock.c:389
++#: ../gtk/gtkstock.c:400
+ msgctxt "Stock label, media"
+ msgid "_Record"
+ msgstr "_Taifead"
+ 
+ #. Media label
+-#: gtk/gtkstock.c:391
++#: ../gtk/gtkstock.c:402
+ msgctxt "Stock label, media"
+ msgid "R_ewind"
+ msgstr "At_ochrais"
+ 
+ #. Media label
+-#: gtk/gtkstock.c:393
++#: ../gtk/gtkstock.c:404
+ msgctxt "Stock label, media"
+ msgid "_Stop"
+ msgstr "_Stad"
+ 
+-#: gtk/gtkstock.c:394
++#: ../gtk/gtkstock.c:405
+ msgctxt "Stock label"
+ msgid "_Network"
+ msgstr "Lío_nra"
+ 
+-#: gtk/gtkstock.c:395
++#: ../gtk/gtkstock.c:406
+ msgctxt "Stock label"
+ msgid "_New"
+ msgstr "_Nua"
+ 
+-#: gtk/gtkstock.c:396
++#: ../gtk/gtkstock.c:407
+ msgctxt "Stock label"
+ msgid "_No"
+ msgstr "_Níl"
+ 
+-#: gtk/gtkstock.c:397
++#: ../gtk/gtkstock.c:408
+ msgctxt "Stock label"
+ msgid "_OK"
+ msgstr "Tá g_o Maith"
+ 
+-#: gtk/gtkstock.c:398
++#: ../gtk/gtkstock.c:409
+ msgctxt "Stock label"
+ msgid "_Open"
+ msgstr "_Oscail"
+ 
+ #. Page orientation
+-#: gtk/gtkstock.c:400
++#: ../gtk/gtkstock.c:411
+ msgctxt "Stock label"
+ msgid "Landscape"
+ msgstr "Tírdhreach"
+ 
+ #. Page orientation
+-#: gtk/gtkstock.c:402
++#: ../gtk/gtkstock.c:413
+ msgctxt "Stock label"
+ msgid "Portrait"
+ msgstr "Portráid"
+ 
+ #. Page orientation
+-#: gtk/gtkstock.c:404
++#: ../gtk/gtkstock.c:415
+ msgctxt "Stock label"
+ msgid "Reverse landscape"
+ msgstr "Tírdhreach aisiompaithe"
+ 
+ #. Page orientation
+-#: gtk/gtkstock.c:406
++#: ../gtk/gtkstock.c:417
+ msgctxt "Stock label"
+ msgid "Reverse portrait"
+ msgstr "Portráid aisiompaithe"
+ 
+-#: gtk/gtkstock.c:407
++#: ../gtk/gtkstock.c:418
+ msgctxt "Stock label"
+ msgid "Page Set_up"
+ msgstr "Socrú _Leathanaigh"
+ 
+-#: gtk/gtkstock.c:408
++#: ../gtk/gtkstock.c:419
+ msgctxt "Stock label"
+ msgid "_Paste"
+ msgstr "G_reamaigh"
+ 
+-#: gtk/gtkstock.c:409
++#: ../gtk/gtkstock.c:420
+ msgctxt "Stock label"
+ msgid "_Preferences"
+ msgstr "_Sainroghanna"
+ 
+-#: gtk/gtkstock.c:410
++#: ../gtk/gtkstock.c:421
+ msgctxt "Stock label"
+ msgid "_Print"
+ msgstr "_Priontáil"
+ 
+-#: gtk/gtkstock.c:411
++#: ../gtk/gtkstock.c:422
+ msgctxt "Stock label"
+ msgid "Print Pre_view"
+ msgstr "Réamh_amharc Priontála"
+ 
+-#: gtk/gtkstock.c:412
++#: ../gtk/gtkstock.c:423
+ msgctxt "Stock label"
+ msgid "_Properties"
+ msgstr "_Airíonna"
+ 
+-#: gtk/gtkstock.c:413
++#: ../gtk/gtkstock.c:424
+ msgctxt "Stock label"
+ msgid "_Quit"
+ msgstr "_Scoir"
+ 
+-#: gtk/gtkstock.c:414
++#: ../gtk/gtkstock.c:425
+ msgctxt "Stock label"
+ msgid "_Redo"
+ msgstr "_Athfheidhmigh"
+ 
+-#: gtk/gtkstock.c:415
++#: ../gtk/gtkstock.c:426
+ msgctxt "Stock label"
+ msgid "_Refresh"
+ msgstr "_Athnuaigh"
+ 
+-#: gtk/gtkstock.c:416
++#: ../gtk/gtkstock.c:427
+ msgctxt "Stock label"
+ msgid "_Remove"
+ msgstr "_Bain"
+ 
+-#: gtk/gtkstock.c:417
++#: ../gtk/gtkstock.c:428
+ msgctxt "Stock label"
+ msgid "_Revert"
+ msgstr "_Fill"
+ 
+-#: gtk/gtkstock.c:418
++#: ../gtk/gtkstock.c:429
+ msgctxt "Stock label"
+ msgid "_Save"
+ msgstr "_Sábháil"
+ 
+-#: gtk/gtkstock.c:419
++#: ../gtk/gtkstock.c:430
+ msgctxt "Stock label"
+ msgid "Save _As"
+ msgstr "Sábháil M_ar"
+ 
+-#: gtk/gtkstock.c:420
++#: ../gtk/gtkstock.c:431
+ msgctxt "Stock label"
+ msgid "Select _All"
+ msgstr "Roghnaigh _Gach Rud"
+ 
+-#: gtk/gtkstock.c:421
++#: ../gtk/gtkstock.c:432
+ msgctxt "Stock label"
+ msgid "_Color"
+ msgstr "_Dath"
+ 
+-#: gtk/gtkstock.c:422
++#: ../gtk/gtkstock.c:433
+ msgctxt "Stock label"
+ msgid "_Font"
+ msgstr "_Cló"
+ 
+ #. Sorting direction
+-#: gtk/gtkstock.c:424
++#: ../gtk/gtkstock.c:435
+ msgctxt "Stock label"
+ msgid "_Ascending"
+ msgstr "_Ardaitheach"
+ 
+ #. Sorting direction
+-#: gtk/gtkstock.c:426
++#: ../gtk/gtkstock.c:437
+ msgctxt "Stock label"
+ msgid "_Descending"
+ msgstr "Í_slitheach"
+ 
+-#: gtk/gtkstock.c:427
++#: ../gtk/gtkstock.c:438
+ msgctxt "Stock label"
+ msgid "_Spell Check"
+ msgstr "_Litriú"
+ 
+-#: gtk/gtkstock.c:428
++#: ../gtk/gtkstock.c:439
+ msgctxt "Stock label"
+ msgid "_Stop"
+ msgstr "_Stad"
+ 
+ #. Font variant
+-#: gtk/gtkstock.c:430
++#: ../gtk/gtkstock.c:441
+ msgctxt "Stock label"
+ msgid "_Strikethrough"
+ msgstr "Líne _Trí"
+ 
+-#: gtk/gtkstock.c:431
++#: ../gtk/gtkstock.c:442
+ msgctxt "Stock label"
+ msgid "_Undelete"
+ msgstr "_Díscrios"
+ 
+ #. Font variant
+-#: gtk/gtkstock.c:433
++#: ../gtk/gtkstock.c:444
+ msgctxt "Stock label"
+ msgid "_Underline"
+ msgstr "_Líne Faoi"
+ 
+-#: gtk/gtkstock.c:434
++#: ../gtk/gtkstock.c:445
+ msgctxt "Stock label"
+ msgid "_Undo"
+ msgstr "Cea_laigh"
+ 
+-#: gtk/gtkstock.c:435
++#: ../gtk/gtkstock.c:446
+ msgctxt "Stock label"
+ msgid "_Yes"
+ msgstr "_Tá"
+ 
+ #. Zoom
+-#: gtk/gtkstock.c:437
++#: ../gtk/gtkstock.c:448
+ msgctxt "Stock label"
+ msgid "_Normal Size"
+ msgstr "_Gnáthmhéid"
+ 
+ #. Zoom
+-#: gtk/gtkstock.c:439
++#: ../gtk/gtkstock.c:450
+ msgctxt "Stock label"
+ msgid "Best _Fit"
+ msgstr "_Scothoiriúint"
+ 
+-#: gtk/gtkstock.c:440
++#: ../gtk/gtkstock.c:451
+ msgctxt "Stock label"
+ msgid "Zoom _In"
+ msgstr "Súmáil _Isteach"
+ 
+-#: gtk/gtkstock.c:441
++#: ../gtk/gtkstock.c:452
+ msgctxt "Stock label"
+ msgid "Zoom _Out"
+ msgstr "Súmáil _Amach"
+ 
+-#: gtk/gtktextbufferrichtext.c:650
++#. Translators: if the "on" state label requires more than three
++#. * glyphs then use MEDIUM VERTICAL BAR (U+2759) as the text for
++#. * the state
++#.
++#: ../gtk/gtkswitch.c:337 ../gtk/gtkswitch.c:392 ../gtk/gtkswitch.c:586
++msgctxt "switch"
++msgid "ON"
++msgstr "❙"
++
++#. Translators: if the "off" state label requires more than three
++#. * glyphs then use WHITE CIRCLE (U+25CB) as the text for the state
++#.
++#: ../gtk/gtkswitch.c:345 ../gtk/gtkswitch.c:393 ../gtk/gtkswitch.c:615
++msgctxt "switch"
++msgid "OFF"
++msgstr "○"
++
++#: ../gtk/gtktextbufferrichtext.c:649
+ #, c-format
+ msgid "Unknown error when trying to deserialize %s"
+ msgstr ""
+ 
+-#: gtk/gtktextbufferrichtext.c:709
++#: ../gtk/gtktextbufferrichtext.c:708
+ #, c-format
+ msgid "No deserialize function found for format %s"
+ msgstr ""
+ 
+-#: gtk/gtktextbufferserialize.c:795 gtk/gtktextbufferserialize.c:821
++#: ../gtk/gtktextbufferserialize.c:798 ../gtk/gtktextbufferserialize.c:824
+ #, c-format
+ msgid "Both \"id\" and \"name\" were found on the <%s> element"
+ msgstr "Aimsíodh \"id\" agus \"name\" araon ar an eilimint <%s>"
+ 
+-#: gtk/gtktextbufferserialize.c:805 gtk/gtktextbufferserialize.c:831
++#: ../gtk/gtktextbufferserialize.c:808 ../gtk/gtktextbufferserialize.c:834
+ #, c-format
+ msgid "The attribute \"%s\" was found twice on the <%s> element"
+ msgstr "Aimsíodh an tréith \"%s\" faoi dhó ar an eilimint <%s>"
+ 
+-#: gtk/gtktextbufferserialize.c:845
++#: ../gtk/gtktextbufferserialize.c:850
+ #, fuzzy, c-format
+ msgid "<%s> element has invalid ID \"%s\""
+ msgstr "Tá ca neamhbhailí \"%2$s\" ag eilimint <%1$s>"
+ 
+-#: gtk/gtktextbufferserialize.c:855
++#: ../gtk/gtktextbufferserialize.c:860
+ #, c-format
+ msgid "<%s> element has neither a \"name\" nor an \"id\" attribute"
+ msgstr "Níl tréith \"name\" ná \"id\" ag an eilimint <%s>"
+ 
+-#: gtk/gtktextbufferserialize.c:942
++#: ../gtk/gtktextbufferserialize.c:947
+ #, c-format
+ msgid "Attribute \"%s\" repeated twice on the same <%s> element"
+ msgstr ""
+ 
+-#: gtk/gtktextbufferserialize.c:960 gtk/gtktextbufferserialize.c:985
++#: ../gtk/gtktextbufferserialize.c:965 ../gtk/gtktextbufferserialize.c:990
+ #, c-format
+ msgid "Attribute \"%s\" is invalid on <%s> element in this context"
+ msgstr ""
+ 
+-#: gtk/gtktextbufferserialize.c:1024
++#: ../gtk/gtktextbufferserialize.c:1029
+ #, c-format
+ msgid "Tag \"%s\" has not been defined."
+ msgstr "Níor sainmhíníodh an chlib \"%s\"."
+ 
+-#: gtk/gtktextbufferserialize.c:1036
++#: ../gtk/gtktextbufferserialize.c:1041
+ msgid "Anonymous tag found and tags can not be created."
+ msgstr ""
+ 
+-#: gtk/gtktextbufferserialize.c:1047
++#: ../gtk/gtktextbufferserialize.c:1052
+ #, c-format
+ msgid "Tag \"%s\" does not exist in buffer and tags can not be created."
+ msgstr ""
+ 
+-#: gtk/gtktextbufferserialize.c:1146 gtk/gtktextbufferserialize.c:1221
+-#: gtk/gtktextbufferserialize.c:1324 gtk/gtktextbufferserialize.c:1398
++#: ../gtk/gtktextbufferserialize.c:1151 ../gtk/gtktextbufferserialize.c:1226
++#: ../gtk/gtktextbufferserialize.c:1331 ../gtk/gtktextbufferserialize.c:1405
+ #, c-format
+ msgid "Element <%s> is not allowed below <%s>"
+ msgstr "Ní cheadaítear an eilimint <%s> faoi <%s>"
+ 
+-#: gtk/gtktextbufferserialize.c:1177
++#: ../gtk/gtktextbufferserialize.c:1182
+ #, c-format
+ msgid "\"%s\" is not a valid attribute type"
+ msgstr "Ní cineál tréithe bailí é \"%s\""
+ 
+-#: gtk/gtktextbufferserialize.c:1185
++#: ../gtk/gtktextbufferserialize.c:1190
+ #, c-format
+ msgid "\"%s\" is not a valid attribute name"
+ msgstr "Ní ainm tréithe bailí é \"%s\""
+ 
+-#: gtk/gtktextbufferserialize.c:1195
++#: ../gtk/gtktextbufferserialize.c:1200
+ #, c-format
+ msgid ""
+ "\"%s\" could not be converted to a value of type \"%s\" for attribute \"%s\""
+ msgstr ""
+ 
+-#: gtk/gtktextbufferserialize.c:1204
++#: ../gtk/gtktextbufferserialize.c:1209
+ #, c-format
+ msgid "\"%s\" is not a valid value for attribute \"%s\""
+ msgstr ""
+ 
+-#: gtk/gtktextbufferserialize.c:1289
++#: ../gtk/gtktextbufferserialize.c:1294
+ #, c-format
+ msgid "Tag \"%s\" already defined"
+ msgstr "Sainmhíníodh clib \"%s\" cheana."
+ 
+-#: gtk/gtktextbufferserialize.c:1300
++#: ../gtk/gtktextbufferserialize.c:1307
+ #, c-format
+ msgid "Tag \"%s\" has invalid priority \"%s\""
+ msgstr ""
+ 
+-#: gtk/gtktextbufferserialize.c:1353
++#: ../gtk/gtktextbufferserialize.c:1360
+ #, c-format
+ msgid "Outermost element in text must be <text_view_markup> not <%s>"
+ msgstr ""
+ 
+-#: gtk/gtktextbufferserialize.c:1362 gtk/gtktextbufferserialize.c:1378
++#: ../gtk/gtktextbufferserialize.c:1369 ../gtk/gtktextbufferserialize.c:1385
+ #, c-format
+ msgid "A <%s> element has already been specified"
+ msgstr ""
+ 
+-#: gtk/gtktextbufferserialize.c:1384
++#: ../gtk/gtktextbufferserialize.c:1391
+ msgid "A <text> element can't occur before a <tags> element"
+ msgstr ""
+ 
+-#: gtk/gtktextbufferserialize.c:1784
++#: ../gtk/gtktextbufferserialize.c:1790
+ msgid "Serialized data is malformed"
+ msgstr ""
+ 
+-#: gtk/gtktextbufferserialize.c:1862
++#: ../gtk/gtktextbufferserialize.c:1868
+ msgid ""
+ "Serialized data is malformed. First section isn't GTKTEXTBUFFERCONTENTS-0001"
+ msgstr ""
+ 
+-#: gtk/gtktextutil.c:60
++#: ../gtk/gtktextutil.c:58
+ msgid "LRM _Left-to-right mark"
+ msgstr "LRM Marc _Clé-go-deas"
+ 
+-#: gtk/gtktextutil.c:61
++#: ../gtk/gtktextutil.c:59
+ msgid "RLM _Right-to-left mark"
+ msgstr "RLM Marc _Deas-go-clé"
+ 
+-#: gtk/gtktextutil.c:62
++#: ../gtk/gtktextutil.c:60
+ msgid "LRE Left-to-right _embedding"
+ msgstr "LRE _Leabú Clé-go-deas"
+ 
+-#: gtk/gtktextutil.c:63
++#: ../gtk/gtktextutil.c:61
+ msgid "RLE Right-to-left e_mbedding"
+ msgstr "RLE L_eabú Deas-go-clé"
+ 
+-#: gtk/gtktextutil.c:64
++#: ../gtk/gtktextutil.c:62
+ msgid "LRO Left-to-right _override"
+ msgstr "LRO _Sárú Clé-go-deas"
+ 
+-#: gtk/gtktextutil.c:65
++#: ../gtk/gtktextutil.c:63
+ msgid "RLO Right-to-left o_verride"
+ msgstr "RLO Sá_rú Deas-go-clé"
+ 
+-#: gtk/gtktextutil.c:66
++#: ../gtk/gtktextutil.c:64
+ msgid "PDF _Pop directional formatting"
+ msgstr ""
+ 
+-#: gtk/gtktextutil.c:67
++#: ../gtk/gtktextutil.c:65
+ msgid "ZWS _Zero width space"
+ msgstr ""
+ 
+-#: gtk/gtktextutil.c:68
++#: ../gtk/gtktextutil.c:66
+ msgid "ZWJ Zero width _joiner"
+ msgstr ""
+ 
+-#: gtk/gtktextutil.c:69
++#: ../gtk/gtktextutil.c:67
+ msgid "ZWNJ Zero width _non-joiner"
+ msgstr ""
+ 
+-#: gtk/gtkthemes.c:72
+-#, c-format
+-msgid "Unable to locate theme engine in module_path: \"%s\","
+-msgstr "Ní féidir inneall téama a aimsiú i module_path: \"%s\","
+-
+-#: gtk/gtkuimanager.c:1505
++#: ../gtk/gtkuimanager.c:1781
+ #, c-format
+ msgid "Unexpected start tag '%s' on line %d char %d"
+ msgstr ""
+ 
+-#: gtk/gtkuimanager.c:1595
++#: ../gtk/gtkuimanager.c:1871
+ #, c-format
+ msgid "Unexpected character data on line %d char %d"
+ msgstr ""
+ 
+-#: gtk/gtkuimanager.c:2427
++#: ../gtk/gtkuimanager.c:2694
+ msgid "Empty"
+ msgstr "Folamh"
+ 
+-#: gtk/gtkvolumebutton.c:83
++#: ../gtk/gtkvolumebutton.c:169
+ msgid "Volume"
+ msgstr "Airde"
+ 
+-#: gtk/gtkvolumebutton.c:85
++#: ../gtk/gtkvolumebutton.c:171
+ msgid "Turns volume down or up"
+ msgstr "Méadaíonn nó laghdaíonn sé seo an airde"
+ 
+-#: gtk/gtkvolumebutton.c:88
++#: ../gtk/gtkvolumebutton.c:174
+ msgid "Adjusts the volume"
+ msgstr "Coigeartaíonn sé seo an airde"
+ 
+-#: gtk/gtkvolumebutton.c:94 gtk/gtkvolumebutton.c:97
++#: ../gtk/gtkvolumebutton.c:180 ../gtk/gtkvolumebutton.c:183
+ msgid "Volume Down"
+ msgstr "Airde Síos"
+ 
+-#: gtk/gtkvolumebutton.c:96
++#: ../gtk/gtkvolumebutton.c:182
+ msgid "Decreases the volume"
+ msgstr "Laghdaíonn sé seo an airde"
+ 
+-#: gtk/gtkvolumebutton.c:100 gtk/gtkvolumebutton.c:103
++#: ../gtk/gtkvolumebutton.c:186 ../gtk/gtkvolumebutton.c:189
+ msgid "Volume Up"
+ msgstr "Airde Suas"
+ 
+-#: gtk/gtkvolumebutton.c:102
++#: ../gtk/gtkvolumebutton.c:188
+ msgid "Increases the volume"
+ msgstr "Méadaíonn sé seo an airde"
+ 
+-#: gtk/gtkvolumebutton.c:160
++#: ../gtk/gtkvolumebutton.c:246
+ msgid "Muted"
+ msgstr "Gan fuaim"
+ 
+-#: gtk/gtkvolumebutton.c:164
++#: ../gtk/gtkvolumebutton.c:250
+ msgid "Full Volume"
+ msgstr "Airde Iomlán"
+ 
+@@ -2780,932 +3381,927 @@ msgstr "Airde Iomlán"
+ #. * Translate the "%d" to "%Id" if you want to use localised digits,
+ #. * or otherwise translate the "%d" to "%d".
+ #.
+-#: gtk/gtkvolumebutton.c:177
++#: ../gtk/gtkvolumebutton.c:263
+ #, c-format
+ msgctxt "volume percentage"
+ msgid "%d %%"
+ msgstr "%d %%"
+ 
+-#: gtk/paper_names_offsets.c:4
++#: ../gtk/paper_names_offsets.c:4
+ msgctxt "paper size"
+ msgid "asme_f"
+ msgstr "asme_f"
+ 
+-#: gtk/paper_names_offsets.c:5
++#: ../gtk/paper_names_offsets.c:5
+ msgctxt "paper size"
+ msgid "A0x2"
+ msgstr "A0x2"
+ 
+-#: gtk/paper_names_offsets.c:6
++#: ../gtk/paper_names_offsets.c:6
+ msgctxt "paper size"
+ msgid "A0"
+ msgstr "A0"
+ 
+-#: gtk/paper_names_offsets.c:7
++#: ../gtk/paper_names_offsets.c:7
+ msgctxt "paper size"
+ msgid "A0x3"
+ msgstr "A0x3"
+ 
+-#: gtk/paper_names_offsets.c:8
++#: ../gtk/paper_names_offsets.c:8
+ msgctxt "paper size"
+ msgid "A1"
+ msgstr "A1"
+ 
+-#: gtk/paper_names_offsets.c:9
++#: ../gtk/paper_names_offsets.c:9
+ msgctxt "paper size"
+ msgid "A10"
+ msgstr "A10"
+ 
+-#: gtk/paper_names_offsets.c:10
++#: ../gtk/paper_names_offsets.c:10
+ msgctxt "paper size"
+ msgid "A1x3"
+ msgstr "A1x3"
+ 
+-#: gtk/paper_names_offsets.c:11
++#: ../gtk/paper_names_offsets.c:11
+ msgctxt "paper size"
+ msgid "A1x4"
+ msgstr "A1x4"
+ 
+-#: gtk/paper_names_offsets.c:12
++#: ../gtk/paper_names_offsets.c:12
+ msgctxt "paper size"
+ msgid "A2"
+ msgstr "A2"
+ 
+-#: gtk/paper_names_offsets.c:13
++#: ../gtk/paper_names_offsets.c:13
+ msgctxt "paper size"
+ msgid "A2x3"
+ msgstr "A2x3"
+ 
+-#: gtk/paper_names_offsets.c:14
++#: ../gtk/paper_names_offsets.c:14
+ msgctxt "paper size"
+ msgid "A2x4"
+ msgstr "A2x4"
+ 
+-#: gtk/paper_names_offsets.c:15
++#: ../gtk/paper_names_offsets.c:15
+ msgctxt "paper size"
+ msgid "A2x5"
+ msgstr "A2x5"
+ 
+-#: gtk/paper_names_offsets.c:16
++#: ../gtk/paper_names_offsets.c:16
+ msgctxt "paper size"
+ msgid "A3"
+ msgstr "A3"
+ 
+-#: gtk/paper_names_offsets.c:17
++#: ../gtk/paper_names_offsets.c:17
+ msgctxt "paper size"
+ msgid "A3 Extra"
+ msgstr "A3 Breise"
+ 
+-#: gtk/paper_names_offsets.c:18
++#: ../gtk/paper_names_offsets.c:18
+ msgctxt "paper size"
+ msgid "A3x3"
+ msgstr "A3x3"
+ 
+-#: gtk/paper_names_offsets.c:19
++#: ../gtk/paper_names_offsets.c:19
+ msgctxt "paper size"
+ msgid "A3x4"
+ msgstr "A3x4"
+ 
+-#: gtk/paper_names_offsets.c:20
++#: ../gtk/paper_names_offsets.c:20
+ msgctxt "paper size"
+ msgid "A3x5"
+ msgstr "A3x5"
+ 
+-#: gtk/paper_names_offsets.c:21
++#: ../gtk/paper_names_offsets.c:21
+ msgctxt "paper size"
+ msgid "A3x6"
+ msgstr "A3x6"
+ 
+-#: gtk/paper_names_offsets.c:22
++#: ../gtk/paper_names_offsets.c:22
+ msgctxt "paper size"
+ msgid "A3x7"
+ msgstr "A3x7"
+ 
+-#: gtk/paper_names_offsets.c:23
++#: ../gtk/paper_names_offsets.c:23
+ msgctxt "paper size"
+ msgid "A4"
+ msgstr "A4"
+ 
+-#: gtk/paper_names_offsets.c:24
++#: ../gtk/paper_names_offsets.c:24
+ msgctxt "paper size"
+ msgid "A4 Extra"
+ msgstr "A4 Breise"
+ 
+-#: gtk/paper_names_offsets.c:25
++#: ../gtk/paper_names_offsets.c:25
+ msgctxt "paper size"
+ msgid "A4 Tab"
+ msgstr "A4 Clib"
+ 
+-#: gtk/paper_names_offsets.c:26
++#: ../gtk/paper_names_offsets.c:26
+ msgctxt "paper size"
+ msgid "A4x3"
+ msgstr "A4x3"
+ 
+-#: gtk/paper_names_offsets.c:27
++#: ../gtk/paper_names_offsets.c:27
+ msgctxt "paper size"
+ msgid "A4x4"
+ msgstr "A4x4"
+ 
+-#: gtk/paper_names_offsets.c:28
++#: ../gtk/paper_names_offsets.c:28
+ msgctxt "paper size"
+ msgid "A4x5"
+ msgstr "A4x5"
+ 
+-#: gtk/paper_names_offsets.c:29
++#: ../gtk/paper_names_offsets.c:29
+ msgctxt "paper size"
+ msgid "A4x6"
+ msgstr "A4x6"
+ 
+-#: gtk/paper_names_offsets.c:30
++#: ../gtk/paper_names_offsets.c:30
+ msgctxt "paper size"
+ msgid "A4x7"
+ msgstr "A4x7"
+ 
+-#: gtk/paper_names_offsets.c:31
++#: ../gtk/paper_names_offsets.c:31
+ msgctxt "paper size"
+ msgid "A4x8"
+ msgstr "A4x8"
+ 
+-#: gtk/paper_names_offsets.c:32
++#: ../gtk/paper_names_offsets.c:32
+ msgctxt "paper size"
+ msgid "A4x9"
+ msgstr "A4x9"
+ 
+-#: gtk/paper_names_offsets.c:33
++#: ../gtk/paper_names_offsets.c:33
+ msgctxt "paper size"
+ msgid "A5"
+ msgstr "A5"
+ 
+-#: gtk/paper_names_offsets.c:34
++#: ../gtk/paper_names_offsets.c:34
+ msgctxt "paper size"
+ msgid "A5 Extra"
+ msgstr "A5 Breise"
+ 
+-#: gtk/paper_names_offsets.c:35
++#: ../gtk/paper_names_offsets.c:35
+ msgctxt "paper size"
+ msgid "A6"
+ msgstr "A6"
+ 
+-#: gtk/paper_names_offsets.c:36
++#: ../gtk/paper_names_offsets.c:36
+ msgctxt "paper size"
+ msgid "A7"
+ msgstr "A7"
+ 
+-#: gtk/paper_names_offsets.c:37
++#: ../gtk/paper_names_offsets.c:37
+ msgctxt "paper size"
+ msgid "A8"
+ msgstr "A8"
+ 
+-#: gtk/paper_names_offsets.c:38
++#: ../gtk/paper_names_offsets.c:38
+ msgctxt "paper size"
+ msgid "A9"
+ msgstr "A9"
+ 
+-#: gtk/paper_names_offsets.c:39
++#: ../gtk/paper_names_offsets.c:39
+ msgctxt "paper size"
+ msgid "B0"
+ msgstr "B0"
+ 
+-#: gtk/paper_names_offsets.c:40
++#: ../gtk/paper_names_offsets.c:40
+ msgctxt "paper size"
+ msgid "B1"
+ msgstr "B1"
+ 
+-#: gtk/paper_names_offsets.c:41
++#: ../gtk/paper_names_offsets.c:41
+ msgctxt "paper size"
+ msgid "B10"
+ msgstr "B10"
+ 
+-#: gtk/paper_names_offsets.c:42
++#: ../gtk/paper_names_offsets.c:42
+ msgctxt "paper size"
+ msgid "B2"
+ msgstr "B2"
+ 
+-#: gtk/paper_names_offsets.c:43
++#: ../gtk/paper_names_offsets.c:43
+ msgctxt "paper size"
+ msgid "B3"
+ msgstr "B3"
+ 
+-#: gtk/paper_names_offsets.c:44
++#: ../gtk/paper_names_offsets.c:44
+ msgctxt "paper size"
+ msgid "B4"
+ msgstr "B4"
+ 
+-#: gtk/paper_names_offsets.c:45
++#: ../gtk/paper_names_offsets.c:45
+ msgctxt "paper size"
+ msgid "B5"
+ msgstr "B5"
+ 
+-#: gtk/paper_names_offsets.c:46
++#: ../gtk/paper_names_offsets.c:46
+ msgctxt "paper size"
+ msgid "B5 Extra"
+ msgstr "B5 Breise"
+ 
+-#: gtk/paper_names_offsets.c:47
++#: ../gtk/paper_names_offsets.c:47
+ msgctxt "paper size"
+ msgid "B6"
+ msgstr "B6"
+ 
+-#: gtk/paper_names_offsets.c:48
++#: ../gtk/paper_names_offsets.c:48
+ msgctxt "paper size"
+ msgid "B6/C4"
+ msgstr "B6/C4"
+ 
+-#: gtk/paper_names_offsets.c:49
++#: ../gtk/paper_names_offsets.c:49
+ msgctxt "paper size"
+ msgid "B7"
+ msgstr "B7"
+ 
+-#: gtk/paper_names_offsets.c:50
++#: ../gtk/paper_names_offsets.c:50
+ msgctxt "paper size"
+ msgid "B8"
+ msgstr "B8"
+ 
+-#: gtk/paper_names_offsets.c:51
++#: ../gtk/paper_names_offsets.c:51
+ msgctxt "paper size"
+ msgid "B9"
+ msgstr "B9"
+ 
+-#: gtk/paper_names_offsets.c:52
++#: ../gtk/paper_names_offsets.c:52
+ msgctxt "paper size"
+ msgid "C0"
+ msgstr "C0"
+ 
+-#: gtk/paper_names_offsets.c:53
++#: ../gtk/paper_names_offsets.c:53
+ msgctxt "paper size"
+ msgid "C1"
+ msgstr "C1"
+ 
+-#: gtk/paper_names_offsets.c:54
++#: ../gtk/paper_names_offsets.c:54
+ msgctxt "paper size"
+ msgid "C10"
+ msgstr "C10"
+ 
+-#: gtk/paper_names_offsets.c:55
++#: ../gtk/paper_names_offsets.c:55
+ msgctxt "paper size"
+ msgid "C2"
+ msgstr "C2"
+ 
+-#: gtk/paper_names_offsets.c:56
++#: ../gtk/paper_names_offsets.c:56
+ msgctxt "paper size"
+ msgid "C3"
+ msgstr "C3"
+ 
+-#: gtk/paper_names_offsets.c:57
++#: ../gtk/paper_names_offsets.c:57
+ msgctxt "paper size"
+ msgid "C4"
+ msgstr "C4"
+ 
+-#: gtk/paper_names_offsets.c:58
++#: ../gtk/paper_names_offsets.c:58
+ msgctxt "paper size"
+ msgid "C5"
+ msgstr "C5"
+ 
+-#: gtk/paper_names_offsets.c:59
++#: ../gtk/paper_names_offsets.c:59
+ msgctxt "paper size"
+ msgid "C6"
+ msgstr "C6"
+ 
+-#: gtk/paper_names_offsets.c:60
++#: ../gtk/paper_names_offsets.c:60
+ msgctxt "paper size"
+ msgid "C6/C5"
+ msgstr "C6/C5"
+ 
+-#: gtk/paper_names_offsets.c:61
++#: ../gtk/paper_names_offsets.c:61
+ msgctxt "paper size"
+ msgid "C7"
+ msgstr "C7"
+ 
+-#: gtk/paper_names_offsets.c:62
++#: ../gtk/paper_names_offsets.c:62
+ msgctxt "paper size"
+ msgid "C7/C6"
+ msgstr "C7/C6"
+ 
+-#: gtk/paper_names_offsets.c:63
++#: ../gtk/paper_names_offsets.c:63
+ msgctxt "paper size"
+ msgid "C8"
+ msgstr "C8"
+ 
+-#: gtk/paper_names_offsets.c:64
++#: ../gtk/paper_names_offsets.c:64
+ msgctxt "paper size"
+ msgid "C9"
+ msgstr "C9"
+ 
+-#: gtk/paper_names_offsets.c:65
++#: ../gtk/paper_names_offsets.c:65
+ msgctxt "paper size"
+ msgid "DL Envelope"
+ msgstr "Clúdach DL"
+ 
+-#: gtk/paper_names_offsets.c:66
++#: ../gtk/paper_names_offsets.c:66
+ msgctxt "paper size"
+ msgid "RA0"
+ msgstr "RA0"
+ 
+-#: gtk/paper_names_offsets.c:67
++#: ../gtk/paper_names_offsets.c:67
+ msgctxt "paper size"
+ msgid "RA1"
+ msgstr "RA1"
+ 
+-#: gtk/paper_names_offsets.c:68
++#: ../gtk/paper_names_offsets.c:68
+ msgctxt "paper size"
+ msgid "RA2"
+ msgstr "RA2"
+ 
+-#: gtk/paper_names_offsets.c:69
++#: ../gtk/paper_names_offsets.c:69
+ msgctxt "paper size"
+ msgid "SRA0"
+ msgstr "SRA0"
+ 
+-#: gtk/paper_names_offsets.c:70
++#: ../gtk/paper_names_offsets.c:70
+ msgctxt "paper size"
+ msgid "SRA1"
+ msgstr "SRA1"
+ 
+-#: gtk/paper_names_offsets.c:71
++#: ../gtk/paper_names_offsets.c:71
+ msgctxt "paper size"
+ msgid "SRA2"
+ msgstr "SRA2"
+ 
+-#: gtk/paper_names_offsets.c:72
++#: ../gtk/paper_names_offsets.c:72
+ msgctxt "paper size"
+ msgid "JB0"
+ msgstr "JB0"
+ 
+-#: gtk/paper_names_offsets.c:73
++#: ../gtk/paper_names_offsets.c:73
+ msgctxt "paper size"
+ msgid "JB1"
+ msgstr "JB1"
+ 
+-#: gtk/paper_names_offsets.c:74
++#: ../gtk/paper_names_offsets.c:74
+ msgctxt "paper size"
+ msgid "JB10"
+ msgstr "JB10"
+ 
+-#: gtk/paper_names_offsets.c:75
++#: ../gtk/paper_names_offsets.c:75
+ msgctxt "paper size"
+ msgid "JB2"
+ msgstr "JB2"
+ 
+-#: gtk/paper_names_offsets.c:76
++#: ../gtk/paper_names_offsets.c:76
+ msgctxt "paper size"
+ msgid "JB3"
+ msgstr "JB3"
+ 
+-#: gtk/paper_names_offsets.c:77
++#: ../gtk/paper_names_offsets.c:77
+ msgctxt "paper size"
+ msgid "JB4"
+ msgstr "JB4"
+ 
+-#: gtk/paper_names_offsets.c:78
++#: ../gtk/paper_names_offsets.c:78
+ msgctxt "paper size"
+ msgid "JB5"
+ msgstr "JB5"
+ 
+-#: gtk/paper_names_offsets.c:79
++#: ../gtk/paper_names_offsets.c:79
+ msgctxt "paper size"
+ msgid "JB6"
+ msgstr "JB6"
+ 
+-#: gtk/paper_names_offsets.c:80
++#: ../gtk/paper_names_offsets.c:80
+ msgctxt "paper size"
+ msgid "JB7"
+ msgstr "JB7"
+ 
+-#: gtk/paper_names_offsets.c:81
++#: ../gtk/paper_names_offsets.c:81
+ msgctxt "paper size"
+ msgid "JB8"
+ msgstr "JB8"
+ 
+-#: gtk/paper_names_offsets.c:82
++#: ../gtk/paper_names_offsets.c:82
+ msgctxt "paper size"
+ msgid "JB9"
+ msgstr "JB9"
+ 
+-#: gtk/paper_names_offsets.c:83
++#: ../gtk/paper_names_offsets.c:83
+ msgctxt "paper size"
+ msgid "jis exec"
+ msgstr "jis exec"
+ 
+-#: gtk/paper_names_offsets.c:84
++#: ../gtk/paper_names_offsets.c:84
+ msgctxt "paper size"
+ msgid "Choukei 2 Envelope"
+ msgstr "Clúdach Choukei 2"
+ 
+-#: gtk/paper_names_offsets.c:85
++#: ../gtk/paper_names_offsets.c:85
+ msgctxt "paper size"
+ msgid "Choukei 3 Envelope"
+ msgstr "Clúdach Choukei 3"
+ 
+-#: gtk/paper_names_offsets.c:86
++#: ../gtk/paper_names_offsets.c:86
+ msgctxt "paper size"
+ msgid "Choukei 4 Envelope"
+ msgstr "Clúdach Choukei 4"
+ 
+-#: gtk/paper_names_offsets.c:87
++#: ../gtk/paper_names_offsets.c:87
+ msgctxt "paper size"
+ msgid "hagaki (postcard)"
+ msgstr "hagaki (cárta poist)"
+ 
+-#: gtk/paper_names_offsets.c:88
++#: ../gtk/paper_names_offsets.c:88
+ msgctxt "paper size"
+ msgid "kahu Envelope"
+ msgstr "Clúdach kahu"
+ 
+-#: gtk/paper_names_offsets.c:89
++#: ../gtk/paper_names_offsets.c:89
+ msgctxt "paper size"
+ msgid "kaku2 Envelope"
+ msgstr "Clúdach kaku2"
+ 
+-#: gtk/paper_names_offsets.c:90
++#: ../gtk/paper_names_offsets.c:90
+ msgctxt "paper size"
+ msgid "oufuku (reply postcard)"
+ msgstr "oufuku (cárta poist freagartha)"
+ 
+-#: gtk/paper_names_offsets.c:91
++#: ../gtk/paper_names_offsets.c:91
+ msgctxt "paper size"
+ msgid "you4 Envelope"
+ msgstr "Clúdach you4"
+ 
+-#: gtk/paper_names_offsets.c:92
++#: ../gtk/paper_names_offsets.c:92
+ msgctxt "paper size"
+ msgid "10x11"
+ msgstr "10x11"
+ 
+-#: gtk/paper_names_offsets.c:93
++#: ../gtk/paper_names_offsets.c:93
+ msgctxt "paper size"
+ msgid "10x13"
+ msgstr "10x13"
+ 
+-#: gtk/paper_names_offsets.c:94
++#: ../gtk/paper_names_offsets.c:94
+ msgctxt "paper size"
+ msgid "10x14"
+ msgstr "10x14"
+ 
+-#: gtk/paper_names_offsets.c:95 gtk/paper_names_offsets.c:96
++#: ../gtk/paper_names_offsets.c:95 ../gtk/paper_names_offsets.c:96
+ msgctxt "paper size"
+ msgid "10x15"
+ msgstr "10x15"
+ 
+-#: gtk/paper_names_offsets.c:97
++#: ../gtk/paper_names_offsets.c:97
+ msgctxt "paper size"
+ msgid "11x12"
+ msgstr "11x12"
+ 
+-#: gtk/paper_names_offsets.c:98
++#: ../gtk/paper_names_offsets.c:98
+ msgctxt "paper size"
+ msgid "11x15"
+ msgstr "11x15"
+ 
+-#: gtk/paper_names_offsets.c:99
++#: ../gtk/paper_names_offsets.c:99
+ msgctxt "paper size"
+ msgid "12x19"
+ msgstr "12x19"
+ 
+-#: gtk/paper_names_offsets.c:100
++#: ../gtk/paper_names_offsets.c:100
+ msgctxt "paper size"
+ msgid "5x7"
+ msgstr "5x7"
+ 
+-#: gtk/paper_names_offsets.c:101
++#: ../gtk/paper_names_offsets.c:101
+ msgctxt "paper size"
+ msgid "6x9 Envelope"
+ msgstr "Clúdach 6x9"
+ 
+-#: gtk/paper_names_offsets.c:102
++#: ../gtk/paper_names_offsets.c:102
+ msgctxt "paper size"
+ msgid "7x9 Envelope"
+ msgstr "Clúdach 7x9"
+ 
+-#: gtk/paper_names_offsets.c:103
++#: ../gtk/paper_names_offsets.c:103
+ msgctxt "paper size"
+ msgid "9x11 Envelope"
+ msgstr "Clúdach 9x11"
+ 
+-#: gtk/paper_names_offsets.c:104
++#: ../gtk/paper_names_offsets.c:104
+ msgctxt "paper size"
+ msgid "a2 Envelope"
+ msgstr "Clúdach a2"
+ 
+-#: gtk/paper_names_offsets.c:105
++#: ../gtk/paper_names_offsets.c:105
+ msgctxt "paper size"
+ msgid "Arch A"
+ msgstr "Arch A"
+ 
+-#: gtk/paper_names_offsets.c:106
++#: ../gtk/paper_names_offsets.c:106
+ msgctxt "paper size"
+ msgid "Arch B"
+ msgstr "Arch B"
+ 
+-#: gtk/paper_names_offsets.c:107
++#: ../gtk/paper_names_offsets.c:107
+ msgctxt "paper size"
+ msgid "Arch C"
+ msgstr "Arch C"
+ 
+-#: gtk/paper_names_offsets.c:108
++#: ../gtk/paper_names_offsets.c:108
+ msgctxt "paper size"
+ msgid "Arch D"
+ msgstr "Arch D"
+ 
+-#: gtk/paper_names_offsets.c:109
++#: ../gtk/paper_names_offsets.c:109
+ msgctxt "paper size"
+ msgid "Arch E"
+ msgstr "Arch E"
+ 
+-#: gtk/paper_names_offsets.c:110
++#: ../gtk/paper_names_offsets.c:110
+ msgctxt "paper size"
+ msgid "b-plus"
+ msgstr "b-plus"
+ 
+-#: gtk/paper_names_offsets.c:111
++#: ../gtk/paper_names_offsets.c:111
+ msgctxt "paper size"
+ msgid "c"
+ msgstr "c"
+ 
+-#: gtk/paper_names_offsets.c:112
++#: ../gtk/paper_names_offsets.c:112
+ msgctxt "paper size"
+ msgid "c5 Envelope"
+ msgstr "Clúdach c5"
+ 
+-#: gtk/paper_names_offsets.c:113
++#: ../gtk/paper_names_offsets.c:113
+ msgctxt "paper size"
+ msgid "d"
+ msgstr "d"
+ 
+-#: gtk/paper_names_offsets.c:114
++#: ../gtk/paper_names_offsets.c:114
+ msgctxt "paper size"
+ msgid "e"
+ msgstr "e"
+ 
+-#: gtk/paper_names_offsets.c:115
++#: ../gtk/paper_names_offsets.c:115
+ msgctxt "paper size"
+ msgid "edp"
+ msgstr "edp"
+ 
+-#: gtk/paper_names_offsets.c:116
++#: ../gtk/paper_names_offsets.c:116
+ msgctxt "paper size"
+ msgid "European edp"
+ msgstr "edp Eorpach"
+ 
+-#: gtk/paper_names_offsets.c:117
++#: ../gtk/paper_names_offsets.c:117
+ msgctxt "paper size"
+ msgid "Executive"
+ msgstr "Feidhmeannach"
+ 
+-#: gtk/paper_names_offsets.c:118
++#: ../gtk/paper_names_offsets.c:118
+ msgctxt "paper size"
+ msgid "f"
+ msgstr "f"
+ 
+-#: gtk/paper_names_offsets.c:119
++#: ../gtk/paper_names_offsets.c:119
+ msgctxt "paper size"
+ msgid "FanFold European"
+ msgstr "FanFold Eorpach"
+ 
+-#: gtk/paper_names_offsets.c:120
++#: ../gtk/paper_names_offsets.c:120
+ msgctxt "paper size"
+ msgid "FanFold US"
+ msgstr "FanFold (SAM)"
+ 
+-#: gtk/paper_names_offsets.c:121
++#: ../gtk/paper_names_offsets.c:121
+ msgctxt "paper size"
+ msgid "FanFold German Legal"
+ msgstr "Fanfold Dlí Gearmánach"
+ 
+-#: gtk/paper_names_offsets.c:122
++#: ../gtk/paper_names_offsets.c:122
+ msgctxt "paper size"
+ msgid "Government Legal"
+ msgstr "Dlí Rialtais"
+ 
+-#: gtk/paper_names_offsets.c:123
++#: ../gtk/paper_names_offsets.c:123
+ msgctxt "paper size"
+ msgid "Government Letter"
+ msgstr "Litir Rialtais"
+ 
+-#: gtk/paper_names_offsets.c:124
++#: ../gtk/paper_names_offsets.c:124
+ msgctxt "paper size"
+ msgid "Index 3x5"
+ msgstr "Innéacs 3x5"
+ 
+-#: gtk/paper_names_offsets.c:125
++#: ../gtk/paper_names_offsets.c:125
+ msgctxt "paper size"
+ msgid "Index 4x6 (postcard)"
+ msgstr "Innéacs 4x6 (cárta poist)"
+ 
+-#: gtk/paper_names_offsets.c:126
++#: ../gtk/paper_names_offsets.c:126
+ msgctxt "paper size"
+ msgid "Index 4x6 ext"
+ msgstr "Innéacs 4x6 ext"
+ 
+-#: gtk/paper_names_offsets.c:127
++#: ../gtk/paper_names_offsets.c:127
+ msgctxt "paper size"
+ msgid "Index 5x8"
+ msgstr "Innéacs 5x8"
+ 
+-#: gtk/paper_names_offsets.c:128
++#: ../gtk/paper_names_offsets.c:128
+ msgctxt "paper size"
+ msgid "Invoice"
+ msgstr "Sonrasc"
+ 
+-#: gtk/paper_names_offsets.c:129
++#: ../gtk/paper_names_offsets.c:129
+ msgctxt "paper size"
+ msgid "Tabloid"
+ msgstr "Tablóid"
+ 
+-#: gtk/paper_names_offsets.c:130
++#: ../gtk/paper_names_offsets.c:130
+ msgctxt "paper size"
+ msgid "US Legal"
+ msgstr "Dlí (SAM)"
+ 
+-#: gtk/paper_names_offsets.c:131
++#: ../gtk/paper_names_offsets.c:131
+ msgctxt "paper size"
+ msgid "US Legal Extra"
+ msgstr "Dlí Breise (SAM)"
+ 
+-#: gtk/paper_names_offsets.c:132
++#: ../gtk/paper_names_offsets.c:132
+ msgctxt "paper size"
+ msgid "US Letter"
+ msgstr "Litir (SAM)"
+ 
+-#: gtk/paper_names_offsets.c:133
++#: ../gtk/paper_names_offsets.c:133
+ msgctxt "paper size"
+ msgid "US Letter Extra"
+ msgstr "Litir Breise (SAM)"
+ 
+-#: gtk/paper_names_offsets.c:134
++#: ../gtk/paper_names_offsets.c:134
+ msgctxt "paper size"
+ msgid "US Letter Plus"
+ msgstr "Litir Plus (SAM)"
+ 
+-#: gtk/paper_names_offsets.c:135
++#: ../gtk/paper_names_offsets.c:135
+ msgctxt "paper size"
+ msgid "Monarch Envelope"
+ msgstr "Clúdach Monarch"
+ 
+-#: gtk/paper_names_offsets.c:136
++#: ../gtk/paper_names_offsets.c:136
+ msgctxt "paper size"
+ msgid "#10 Envelope"
+ msgstr "Clúdach #10"
+ 
+-#: gtk/paper_names_offsets.c:137
++#: ../gtk/paper_names_offsets.c:137
+ msgctxt "paper size"
+ msgid "#11 Envelope"
+ msgstr "Clúdach #11"
+ 
+-#: gtk/paper_names_offsets.c:138
++#: ../gtk/paper_names_offsets.c:138
+ msgctxt "paper size"
+ msgid "#12 Envelope"
+ msgstr "Clúdach #12"
+ 
+-#: gtk/paper_names_offsets.c:139
++#: ../gtk/paper_names_offsets.c:139
+ msgctxt "paper size"
+ msgid "#14 Envelope"
+ msgstr "Clúdach #14"
+ 
+-#: gtk/paper_names_offsets.c:140
++#: ../gtk/paper_names_offsets.c:140
+ msgctxt "paper size"
+ msgid "#9 Envelope"
+ msgstr "Clúdach #9"
+ 
+-#: gtk/paper_names_offsets.c:141
++#: ../gtk/paper_names_offsets.c:141
+ msgctxt "paper size"
+ msgid "Personal Envelope"
+ msgstr "Clúdach Pearsanta"
+ 
+-#: gtk/paper_names_offsets.c:142
++#: ../gtk/paper_names_offsets.c:142
+ msgctxt "paper size"
+ msgid "Quarto"
+ msgstr "Ceathairfhillte"
+ 
+-#: gtk/paper_names_offsets.c:143
++#: ../gtk/paper_names_offsets.c:143
+ msgctxt "paper size"
+ msgid "Super A"
+ msgstr "Super A"
+ 
+-#: gtk/paper_names_offsets.c:144
++#: ../gtk/paper_names_offsets.c:144
+ msgctxt "paper size"
+ msgid "Super B"
+ msgstr "Super B"
+ 
+-#: gtk/paper_names_offsets.c:145
++#: ../gtk/paper_names_offsets.c:145
+ msgctxt "paper size"
+ msgid "Wide Format"
+ msgstr "Formáid Leathan"
+ 
+-#: gtk/paper_names_offsets.c:146
++#: ../gtk/paper_names_offsets.c:146
+ msgctxt "paper size"
+ msgid "Dai-pa-kai"
+ msgstr "Dai-pa-kai"
+ 
+-#: gtk/paper_names_offsets.c:147
++#: ../gtk/paper_names_offsets.c:147
+ msgctxt "paper size"
+ msgid "Folio"
+ msgstr "Fóilió"
+ 
+-#: gtk/paper_names_offsets.c:148
++#: ../gtk/paper_names_offsets.c:148
+ msgctxt "paper size"
+ msgid "Folio sp"
+ msgstr "Fóilió sp"
+ 
+-#: gtk/paper_names_offsets.c:149
++#: ../gtk/paper_names_offsets.c:149
+ msgctxt "paper size"
+ msgid "Invite Envelope"
+ msgstr "Clúdach Cuiridh"
+ 
+-#: gtk/paper_names_offsets.c:150
++#: ../gtk/paper_names_offsets.c:150
+ msgctxt "paper size"
+ msgid "Italian Envelope"
+ msgstr "Clúdach Iodálach"
+ 
+-#: gtk/paper_names_offsets.c:151
++#: ../gtk/paper_names_offsets.c:151
+ msgctxt "paper size"
+ msgid "juuro-ku-kai"
+ msgstr "juuro-ku-kai"
+ 
+-#: gtk/paper_names_offsets.c:152
++#: ../gtk/paper_names_offsets.c:152
+ msgctxt "paper size"
+ msgid "pa-kai"
+ msgstr "pa-kai"
+ 
+-#: gtk/paper_names_offsets.c:153
++#: ../gtk/paper_names_offsets.c:153
+ msgctxt "paper size"
+ msgid "Postfix Envelope"
+ msgstr "Clúdach Postfix"
+ 
+-#: gtk/paper_names_offsets.c:154
++#: ../gtk/paper_names_offsets.c:154
+ msgctxt "paper size"
+ msgid "Small Photo"
+ msgstr "Grianghraf Beag"
+ 
+-#: gtk/paper_names_offsets.c:155
++#: ../gtk/paper_names_offsets.c:155
+ msgctxt "paper size"
+ msgid "prc1 Envelope"
+ msgstr "Clúdach prc1"
+ 
+-#: gtk/paper_names_offsets.c:156
++#: ../gtk/paper_names_offsets.c:156
+ msgctxt "paper size"
+ msgid "prc10 Envelope"
+ msgstr "Clúdach prc10"
+ 
+-#: gtk/paper_names_offsets.c:157
++#: ../gtk/paper_names_offsets.c:157
+ msgctxt "paper size"
+ msgid "prc 16k"
+ msgstr "prc 16k"
+ 
+-#: gtk/paper_names_offsets.c:158
++#: ../gtk/paper_names_offsets.c:158
+ msgctxt "paper size"
+ msgid "prc2 Envelope"
+ msgstr "Clúdach prc2"
+ 
+-#: gtk/paper_names_offsets.c:159
++#: ../gtk/paper_names_offsets.c:159
+ msgctxt "paper size"
+ msgid "prc3 Envelope"
+ msgstr "Clúdach prc3"
+ 
+-#: gtk/paper_names_offsets.c:160
++#: ../gtk/paper_names_offsets.c:160
+ msgctxt "paper size"
+ msgid "prc 32k"
+ msgstr "prc 32k"
+ 
+-#: gtk/paper_names_offsets.c:161
++#: ../gtk/paper_names_offsets.c:161
+ msgctxt "paper size"
+ msgid "prc4 Envelope"
+ msgstr "Clúdach prc4"
+ 
+-#: gtk/paper_names_offsets.c:162
++#: ../gtk/paper_names_offsets.c:162
+ msgctxt "paper size"
+ msgid "prc5 Envelope"
+ msgstr "Clúdach prc5"
+ 
+-#: gtk/paper_names_offsets.c:163
++#: ../gtk/paper_names_offsets.c:163
+ msgctxt "paper size"
+ msgid "prc6 Envelope"
+ msgstr "Clúdach prc6"
+ 
+-#: gtk/paper_names_offsets.c:164
++#: ../gtk/paper_names_offsets.c:164
+ msgctxt "paper size"
+ msgid "prc7 Envelope"
+ msgstr "Clúdach prc7"
+ 
+-#: gtk/paper_names_offsets.c:165
++#: ../gtk/paper_names_offsets.c:165
+ msgctxt "paper size"
+ msgid "prc8 Envelope"
+ msgstr "Clúdach prc8"
+ 
+-#: gtk/paper_names_offsets.c:166
++#: ../gtk/paper_names_offsets.c:166
+ msgctxt "paper size"
+ msgid "prc9 Envelope"
+ msgstr "Clúdach prc9"
+ 
+-#: gtk/paper_names_offsets.c:167
++#: ../gtk/paper_names_offsets.c:167
+ msgctxt "paper size"
+ msgid "ROC 16k"
+ msgstr "ROC 16k"
+ 
+-#: gtk/paper_names_offsets.c:168
++#: ../gtk/paper_names_offsets.c:168
+ msgctxt "paper size"
+ msgid "ROC 8k"
+ msgstr "ROC 8k"
+ 
+-#: gtk/updateiconcache.c:492 gtk/updateiconcache.c:552
+-#, c-format
+-msgid "different idatas found for symlinked '%s' and '%s'\n"
+-msgstr "aimsíodh idata difriúla do '%s' agus '%s' nasctha go siombalach\n"
+-
+-#: gtk/updateiconcache.c:1374
++#: ../gtk/updateiconcache.c:1368
+ #, c-format
+ msgid "Failed to write header\n"
+ msgstr "Theip ar scríobh ceanntáisc\n"
+ 
+-#: gtk/updateiconcache.c:1380
++#: ../gtk/updateiconcache.c:1374
+ #, c-format
+ msgid "Failed to write hash table\n"
+ msgstr "Theip ar scríobh hais-tábla\n"
+ 
+-#: gtk/updateiconcache.c:1386
++#: ../gtk/updateiconcache.c:1380
+ #, c-format
+ msgid "Failed to write folder index\n"
+ msgstr "Theip ar scríobh innéacs fillteáin\n"
+ 
+-#: gtk/updateiconcache.c:1394
++#: ../gtk/updateiconcache.c:1388
+ #, c-format
+ msgid "Failed to rewrite header\n"
+ msgstr "Theip ar athscríobh ceanntáisc\n"
+ 
+-#: gtk/updateiconcache.c:1463
++#: ../gtk/updateiconcache.c:1482
+ #, c-format
+ msgid "Failed to open file %s : %s\n"
+ msgstr "Theip ar oscailt comhaid %s : %s\n"
+ 
+-#: gtk/updateiconcache.c:1471
++#: ../gtk/updateiconcache.c:1490 ../gtk/updateiconcache.c:1520
+ #, c-format
+ msgid "Failed to write cache file: %s\n"
+ msgstr "Theip ar scríobh chomhad taisce: %s\n"
+ 
+-#: gtk/updateiconcache.c:1507
++#: ../gtk/updateiconcache.c:1530
+ #, c-format
+ msgid "The generated cache was invalid.\n"
+ msgstr "Bhí an taisce ghinte neamhbhailí.\n"
+ 
+-#: gtk/updateiconcache.c:1521
++#: ../gtk/updateiconcache.c:1544
+ #, c-format
+ msgid "Could not rename %s to %s: %s, removing %s then.\n"
+ msgstr "Níorbh fhéidir %s a athainmniú go %s: %s, mar sin %s á bhaint.\n"
+ 
+-#: gtk/updateiconcache.c:1535
++#: ../gtk/updateiconcache.c:1558
+ #, c-format
+ msgid "Could not rename %s to %s: %s\n"
+ msgstr "Níorbh fhéidir %s a athainmniú go %s: %s\n"
+ 
+-#: gtk/updateiconcache.c:1545
++#: ../gtk/updateiconcache.c:1568
+ #, c-format
+ msgid "Could not rename %s back to %s: %s.\n"
+ msgstr "Níorbh fhéidir %s a athainmniú ar ais go %s: %s\n"
+ 
+-#: gtk/updateiconcache.c:1572
++#: ../gtk/updateiconcache.c:1595
+ #, c-format
+ msgid "Cache file created successfully.\n"
+ msgstr "D'éirigh le cruthú an chomhaid taisce.\n"
+ 
+-#: gtk/updateiconcache.c:1611
++#: ../gtk/updateiconcache.c:1634
+ msgid "Overwrite an existing cache, even if up to date"
+ msgstr ""
+ 
+-#: gtk/updateiconcache.c:1612
++#: ../gtk/updateiconcache.c:1635
+ msgid "Don't check for the existence of index.theme"
+ msgstr ""
+ 
+-#: gtk/updateiconcache.c:1613
++#: ../gtk/updateiconcache.c:1636
+ msgid "Don't include image data in the cache"
+ msgstr ""
+ 
+-#: gtk/updateiconcache.c:1614
++#: ../gtk/updateiconcache.c:1637
+ msgid "Output a C header file"
+ msgstr "Cuir comhad ceanntáisc C amach"
+ 
+-#: gtk/updateiconcache.c:1615
++#: ../gtk/updateiconcache.c:1638
+ msgid "Turn off verbose output"
+ msgstr "Díchumasaigh aschur foclach"
+ 
+-#: gtk/updateiconcache.c:1616
++#: ../gtk/updateiconcache.c:1639
+ msgid "Validate existing icon cache"
+ msgstr ""
+ 
+-#: gtk/updateiconcache.c:1683
++#: ../gtk/updateiconcache.c:1706
+ #, c-format
+ msgid "File not found: %s\n"
+ msgstr "Comhad gan aimsiú: %s\n"
+ 
+-#: gtk/updateiconcache.c:1689
++#: ../gtk/updateiconcache.c:1712
+ #, c-format
+ msgid "Not a valid icon cache: %s\n"
+ msgstr "Ní taisce dheilbhíní bhailí é: %s\n"
+ 
+-#: gtk/updateiconcache.c:1702
++#: ../gtk/updateiconcache.c:1725
+ #, c-format
+ msgid "No theme index file.\n"
+ msgstr "Gan chomhad innéacs téama.\n"
+ 
+-#: gtk/updateiconcache.c:1706
++#: ../gtk/updateiconcache.c:1729
+ #, c-format
+ msgid ""
+ "No theme index file in '%s'.\n"
+@@ -3716,376 +4312,375 @@ msgstr ""
+ "theme-index.\n"
+ 
+ #. ID
+-#: modules/input/imam-et.c:454
++#: ../modules/input/imam-et.c:452
+ msgid "Amharic (EZ+)"
+ msgstr "Amáiris (EZ+)"
+ 
+ #. ID
+-#: modules/input/imcedilla.c:92
++#: ../modules/input/imcedilla.c:90
+ msgid "Cedilla"
+ msgstr "Straithín"
+ 
+ #. ID
+-#: modules/input/imcyrillic-translit.c:217
++#: ../modules/input/imcyrillic-translit.c:215
+ msgid "Cyrillic (Transliterated)"
+ msgstr "Coireallach (Traslitrithe)"
+ 
+ #. ID
+-#: modules/input/iminuktitut.c:127
++#: ../modules/input/iminuktitut.c:125
+ msgid "Inuktitut (Transliterated)"
+ msgstr "Ionúitis (Traslitrithe)"
+ 
+ #. ID
+-#: modules/input/imipa.c:145
++#: ../modules/input/imipa.c:143
+ msgid "IPA"
+ msgstr "AFI"
+ 
+ #. ID
+-#: modules/input/immultipress.c:31
++#: ../modules/input/immultipress.c:29
+ msgid "Multipress"
+ msgstr "Il-bhrú"
+ 
+ #. ID
+-#: modules/input/imthai.c:35
++#: ../modules/input/imthai.c:33
+ msgid "Thai-Lao"
+ msgstr "Téalainnis-Láóis"
+ 
+ #. ID
+-#: modules/input/imti-er.c:453
++#: ../modules/input/imti-er.c:451
+ msgid "Tigrigna-Eritrean (EZ+)"
+ msgstr "Tigrínis-Eiritréach (EZ+)"
+ 
+ #. ID
+-#: modules/input/imti-et.c:453
++#: ../modules/input/imti-et.c:451
+ msgid "Tigrigna-Ethiopian (EZ+)"
+ msgstr "Tigrínis-Aetópach (EZ+)"
+ 
+ #. ID
+-#: modules/input/imviqr.c:244
++#: ../modules/input/imviqr.c:242
+ msgid "Vietnamese (VIQR)"
+ msgstr "Vítneaimis (VIQR)"
+ 
+ #. ID
+-#: modules/input/imxim.c:28
++#: ../modules/input/imxim.c:26
+ msgid "X Input Method"
+ msgstr "Modh Ionchurtha X"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:811
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1020
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:858
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1073
+ msgid "Username:"
+ msgstr "Ainm Úsáideora:"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:812
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1029
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:859
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1082
+ msgid "Password:"
+ msgstr "Focal Faire:"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:850
+-#, c-format
+-msgid "Authentication is required to get a file from %s"
+-msgstr "Fíordheimhniú de dhíth chun comhad a fháil ó %s"
+-
+-#: modules/printbackends/cups/gtkprintbackendcups.c:854
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1042
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:898
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1095
+ #, c-format
+ msgid "Authentication is required to print document '%s' on printer %s"
+ msgstr "Fíordheimhniú de dhíth chun cáipéis '%s' a phriontáil ar phrintéir %s"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:856
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:900
+ #, c-format
+ msgid "Authentication is required to print a document on %s"
+ msgstr "Fíordheimhniú de dhíth chun cáipéis a phriontáil ar %s"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:860
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:904
+ #, c-format
+ msgid "Authentication is required to get attributes of job '%s'"
+ msgstr "Fíordheimhniú de dhíth chun tréithe jab '%s' a fháil"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:862
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:906
+ msgid "Authentication is required to get attributes of a job"
+ msgstr "Fíordheimhniú de dhíth chun tréithe jab a fháil"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:866
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:910
+ #, c-format
+ msgid "Authentication is required to get attributes of printer %s"
+ msgstr "Fíordheimhniú de dhíth chun tréithe printéara %s a fháil"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:868
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:912
+ msgid "Authentication is required to get attributes of a printer"
+ msgstr "Fíordheimhniú de dhíth chun tréithe printéara a fháil"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:871
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:915
+ #, c-format
+ msgid "Authentication is required to get default printer of %s"
+ msgstr "Fíordheimhniú de dhíth chun an printéir réamhshocraithe %s a fháil"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:874
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:918
+ #, c-format
+ msgid "Authentication is required to get printers from %s"
+ msgstr "Fíordheimhniú de dhíth chun printéirí a fháil ó %s"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:877
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:923
++#, c-format
++msgid "Authentication is required to get a file from %s"
++msgstr "Fíordheimhniú de dhíth chun comhad a fháil ó %s"
++
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:925
+ #, c-format
+ msgid "Authentication is required on %s"
+ msgstr "Fíordheimhniú de dhíth ar %s"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1014
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1067
+ msgid "Domain:"
+ msgstr "Fearann:"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1044
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1097
+ #, c-format
+ msgid "Authentication is required to print document '%s'"
+ msgstr "Fíordheimhniú de dhíth chun cáipéis '%s' a phriontáil"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1049
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1102
+ #, c-format
+ msgid "Authentication is required to print this document on printer %s"
+ msgstr ""
+ "Fíordheimhniú de dhíth chun an cháipéis seo a phriontáil ar phrintéir %s"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1051
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1104
+ msgid "Authentication is required to print this document"
+ msgstr "Fíordheimhniú de dhíth chun an cháipéis seo a phriontáil"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1672
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1666
+ #, c-format
+ msgid "Printer '%s' is low on toner."
+ msgstr "Tonóir gann i bprintéir '%s'."
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1673
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1667
+ #, c-format
+ msgid "Printer '%s' has no toner left."
+ msgstr "Níl aon tonóir fágtha i bprintéir '%s'."
+ 
+ #. Translators: "Developer" like on photo development context
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1675
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1669
+ #, c-format
+ msgid "Printer '%s' is low on developer."
+ msgstr "Réalóir gann i bprintéir '%s'."
+ 
+ #. Translators: "Developer" like on photo development context
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1677
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1671
+ #, c-format
+ msgid "Printer '%s' is out of developer."
+ msgstr "Níl aon réalóir fágtha i bprintéir '%s'."
+ 
+ #. Translators: "marker" is one color bin of the printer
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1679
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1673
+ #, c-format
+ msgid "Printer '%s' is low on at least one marker supply."
+ msgstr ""
+ 
+ #. Translators: "marker" is one color bin of the printer
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1681
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1675
+ #, c-format
+ msgid "Printer '%s' is out of at least one marker supply."
+ msgstr ""
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1682
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1676
+ #, c-format
+ msgid "The cover is open on printer '%s'."
+ msgstr "Tá an clúdach ar phrintéir '%s' oscailte."
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1683
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1677
+ #, c-format
+ msgid "The door is open on printer '%s'."
+ msgstr "Tá an doras ar phrintéir '%s' oscailte."
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1684
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1678
+ #, c-format
+ msgid "Printer '%s' is low on paper."
+ msgstr "Páipéar gann i bprintéir '%s'."
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1685
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1679
+ #, c-format
+ msgid "Printer '%s' is out of paper."
+ msgstr "Níl aon pháipéar fágtha i bprintéir '%s'."
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1686
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1680
+ #, fuzzy, c-format
+ msgid "Printer '%s' is currently offline."
+ msgstr "Tá printéir '%s' as líne faoi láthair."
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1687
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:1681
+ #, c-format
+ msgid "There is a problem on printer '%s'."
+ msgstr "Tá fadhb ann le printéir '%s'."
+ 
+ #. Translators: this is a printer status.
+-#: modules/printbackends/cups/gtkprintbackendcups.c:1995
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2123
+ msgid "Paused ; Rejecting Jobs"
+ msgstr "Ar Sos ; Jabanna á nDiúltú"
+ 
+ #. Translators: this is a printer status.
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2001
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2129
+ msgid "Rejecting Jobs"
+ msgstr "Jabanna á nDiúltú"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2777
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2909
+ msgid "Two Sided"
+ msgstr "Déthaobhach"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2778
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2910
+ msgid "Paper Type"
+ msgstr "Cineál an Pháipéir"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2779
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2911
+ msgid "Paper Source"
+ msgstr "Foinse an Pháipéir"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2780
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2912
+ msgid "Output Tray"
+ msgstr "Tráidire Aschurtha"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2781
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2913
+ msgid "Resolution"
+ msgstr "Taifeach"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2782
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2914
+ msgid "GhostScript pre-filtering"
+ msgstr "Réamhscagadh GhostScript"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2791
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2923
+ msgid "One Sided"
+ msgstr "Aonthaobhach"
+ 
+ #. Translators: this is an option of "Two Sided"
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2793
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2925
+ msgid "Long Edge (Standard)"
+ msgstr "Ciumhais Fhada (Caighdeánach)"
+ 
+ #. Translators: this is an option of "Two Sided"
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2795
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2927
+ msgid "Short Edge (Flip)"
+ msgstr "Ciumhais Ghearr (Smeach)"
+ 
+ #. Translators: this is an option of "Paper Source"
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2797
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2799
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2807
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2929
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2931
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2939
+ msgid "Auto Select"
+ msgstr "Roghnaigh go hUathoibríoch"
+ 
+ #. Translators: this is an option of "Paper Source"
+ #. Translators: this is an option of "Resolution"
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2801
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2803
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2805
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2809
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3295
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2933
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2935
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2937
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2941
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3429
+ msgid "Printer Default"
+ msgstr "Réamhshocrú Printéara"
+ 
+ #. Translators: this is an option of "GhostScript"
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2811
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2943
+ msgid "Embed GhostScript fonts only"
+ msgstr "Leabaigh clónna GhostScript amháin"
+ 
+ #. Translators: this is an option of "GhostScript"
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2813
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2945
+ msgid "Convert to PS level 1"
+ msgstr "Tiontaigh go PS leibhéal 1"
+ 
+ #. Translators: this is an option of "GhostScript"
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2815
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2947
+ msgid "Convert to PS level 2"
+ msgstr "Tiontaigh go PS leibhéal 2"
+ 
+ #. Translators: this is an option of "GhostScript"
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2817
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2949
+ msgid "No pre-filtering"
+ msgstr "Gan réamhscagadh"
+ 
+ #. Translators: "Miscellaneous" is the label for a button, that opens
+ #. up an extra panel of settings in a print dialog.
+-#: modules/printbackends/cups/gtkprintbackendcups.c:2826
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:2958
+ msgid "Miscellaneous"
+ msgstr "Socruithe Éagsúla"
+ 
+ #. Translators: These strings name the possible values of the
+ #. * job priority option in the print dialog
+ #.
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3681
+ msgid "Urgent"
+ msgstr "Práinneach"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3681
+ msgid "High"
+ msgstr "Ard"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3681
+ msgid "Medium"
+ msgstr "Measartha"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3681
+ msgid "Low"
+ msgstr "Íseal"
+ 
+-#. Cups specific, non-ppd related settings
+-#. Translators, this string is used to label the pages-per-sheet option
+-#. * in the print dialog
+-#.
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3527
+-msgid "Pages per Sheet"
+-msgstr "Leathanaigh sa Leathán"
+-
+ #. Translators, this string is used to label the job priority option
+ #. * in the print dialog
+ #.
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3564
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3711
+ msgid "Job Priority"
+ msgstr "Tosaíocht an Jab"
+ 
+ #. Translators, this string is used to label the billing info entry
+ #. * in the print dialog
+ #.
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3575
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3722
+ msgid "Billing Info"
+ msgstr "Eolas billeála"
+ 
+ #. Translators, these strings are names for various 'standard' cover
+ #. * pages that the printing system may support.
+ #.
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
+ msgid "None"
+ msgstr "Neamhní"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
+ msgid "Classified"
+ msgstr "Rúnaicmithe"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
+ msgid "Confidential"
+ msgstr "Faoi Rún"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
+ msgid "Secret"
+ msgstr "Rúnda"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
+ msgid "Standard"
+ msgstr "Caighdeánach"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
+ msgid "Top Secret"
+ msgstr "An-Rúnda"
+ 
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
+ msgid "Unclassified"
+ msgstr "Neamhrúnaicmithe"
+ 
++#. Translators, this string is used to label the pages-per-sheet option
++#. * in the print dialog
++#.
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3748
++msgid "Pages per Sheet"
++msgstr "Leathanaigh sa Leathán"
++
+ #. Translators, this is the label used for the option in the print
+ #. * dialog that controls the front cover page.
+ #.
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3625
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3808
+ msgid "Before"
+ msgstr "Roimh"
+ 
+ #. Translators, this is the label used for the option in the print
+ #. * dialog that controls the back cover page.
+ #.
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3640
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3823
+ msgid "After"
+ msgstr "Tar Éis"
+ 
+@@ -4093,14 +4688,14 @@ msgstr "Tar Éis"
+ #. * a print job is printed. Possible values are 'now', a specified time,
+ #. * or 'on hold'
+ #.
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3660
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3843
+ msgid "Print at"
+ msgstr "Priontáil ag"
+ 
+ #. Translators: this is the name of the option that allows the user
+ #. * to specify a time when a print job will be printed.
+ #.
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3671
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3854
+ msgid "Print at time"
+ msgstr "Priontáil ag am"
+ 
+@@ -4108,109 +4703,223 @@ msgstr "Priontáil ag am"
+ #. * size. The two placeholders are replaced with the width and height
+ #. * in points. E.g: "Custom 230.4x142.9"
+ #.
+-#: modules/printbackends/cups/gtkprintbackendcups.c:3706
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3889
+ #, c-format
+ msgid "Custom %sx%s"
+ msgstr "%sx%s Saincheaptha"
+ 
+-#. default filename used for print-to-file
+-#: modules/printbackends/file/gtkprintbackendfile.c:250
+-#, c-format
+-msgid "output.%s"
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3970
++#, fuzzy
++msgid "Printer Profile"
++msgstr "Printéir as líne"
++
++#. TRANSLATORS: this is when color profile information is unavailable
++#: ../modules/printbackends/cups/gtkprintbackendcups.c:3977
++#, fuzzy
++msgid "Unavailable"
++msgstr "Níl ar fáil"
++
++#. TRANSLATORS: when we're running an old CUPS, and
++#. * it hasn't registered the device with colord
++#: ../modules/printbackends/cups/gtkprintercups.c:221
++msgid "Color management unavailable"
++msgstr ""
++
++#. TRANSLATORS: when there is no color profile available
++#: ../modules/printbackends/cups/gtkprintercups.c:233
++#, fuzzy
++msgid "No profile available"
++msgstr "Níl ar fáil"
++
++#. TRANSLATORS: when the color profile has no title
++#: ../modules/printbackends/cups/gtkprintercups.c:244
++#, fuzzy
++msgid "Unspecified profile"
++msgstr "Earráid gan sonrú"
++
++#: ../modules/printbackends/file/gtkprintbackendfile.c:249
++#, fuzzy
++msgid "output"
+ msgstr "aschur.%s"
+ 
+-#: modules/printbackends/file/gtkprintbackendfile.c:493
++#: ../modules/printbackends/file/gtkprintbackendfile.c:521
+ msgid "Print to File"
+ msgstr "Priontáil go Comhad"
+ 
+-#: modules/printbackends/file/gtkprintbackendfile.c:570
++#: ../modules/printbackends/file/gtkprintbackendfile.c:647
+ msgid "PDF"
+ msgstr "PDF"
+ 
+-#: modules/printbackends/file/gtkprintbackendfile.c:570
++#: ../modules/printbackends/file/gtkprintbackendfile.c:647
+ msgid "Postscript"
+ msgstr "Postscript"
+ 
+-#: modules/printbackends/file/gtkprintbackendfile.c:570
++#: ../modules/printbackends/file/gtkprintbackendfile.c:647
+ msgid "SVG"
+ msgstr "SVG"
+ 
+-#: modules/printbackends/file/gtkprintbackendfile.c:582
+-#: modules/printbackends/test/gtkprintbackendtest.c:503
++#: ../modules/printbackends/file/gtkprintbackendfile.c:660
++#: ../modules/printbackends/test/gtkprintbackendtest.c:501
+ msgid "Pages per _sheet:"
+ msgstr "_Leathanaigh sa leathán:"
+ 
+-#: modules/printbackends/file/gtkprintbackendfile.c:641
++#: ../modules/printbackends/file/gtkprintbackendfile.c:719
+ msgid "File"
+ msgstr "Comhad"
+ 
+-#: modules/printbackends/file/gtkprintbackendfile.c:651
++#: ../modules/printbackends/file/gtkprintbackendfile.c:729
+ msgid "_Output format"
+ msgstr "_Formáid aschurtha"
+ 
+-#: modules/printbackends/lpr/gtkprintbackendlpr.c:395
++#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:393
+ msgid "Print to LPR"
+ msgstr "Priontáil go LPR"
+ 
+-#: modules/printbackends/lpr/gtkprintbackendlpr.c:421
++#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:419
+ msgid "Pages Per Sheet"
+ msgstr "Leathanaigh sa Leathán"
+ 
+-#: modules/printbackends/lpr/gtkprintbackendlpr.c:428
++#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:426
+ msgid "Command Line"
+ msgstr "Líne na n-Orduithe"
+ 
+ #. SUN_BRANDING
+-#: modules/printbackends/papi/gtkprintbackendpapi.c:811
++#: ../modules/printbackends/papi/gtkprintbackendpapi.c:809
+ msgid "printer offline"
+ msgstr "printéir as líne"
+ 
+ #. SUN_BRANDING
+-#: modules/printbackends/papi/gtkprintbackendpapi.c:829
++#: ../modules/printbackends/papi/gtkprintbackendpapi.c:827
+ msgid "ready to print"
+ msgstr "réidh do phriontáil"
+ 
+ #. SUN_BRANDING
+-#: modules/printbackends/papi/gtkprintbackendpapi.c:832
++#: ../modules/printbackends/papi/gtkprintbackendpapi.c:830
+ msgid "processing job"
+ msgstr "jab á phróiseáil"
+ 
+ #. SUN_BRANDING
+-#: modules/printbackends/papi/gtkprintbackendpapi.c:836
++#: ../modules/printbackends/papi/gtkprintbackendpapi.c:834
+ msgid "paused"
+ msgstr "curtha ar shos"
+ 
+ #. SUN_BRANDING
+-#: modules/printbackends/papi/gtkprintbackendpapi.c:839
++#: ../modules/printbackends/papi/gtkprintbackendpapi.c:837
+ msgid "unknown"
+ msgstr "anaithnid"
+ 
+ #. default filename used for print-to-test
+-#: modules/printbackends/test/gtkprintbackendtest.c:234
++#: ../modules/printbackends/test/gtkprintbackendtest.c:232
+ #, c-format
+ msgid "test-output.%s"
+ msgstr "aschur-trialach.%s"
+ 
+-#: modules/printbackends/test/gtkprintbackendtest.c:467
++#: ../modules/printbackends/test/gtkprintbackendtest.c:465
+ msgid "Print to Test Printer"
+ msgstr "Priontáil go Printéir Tástála"
+ 
+-#: tests/testfilechooser.c:207
+-#, c-format
+-msgid "Could not get information for file '%s': %s"
+-msgstr "Níorbh fhéidir eolas a fháil don chomhad '%s': %s"
++#~ msgid "X screen to use"
++#~ msgstr "Scáileán X le húsáid"
+ 
+-#: tests/testfilechooser.c:222
+-#, c-format
+-msgid "Failed to open file '%s': %s"
+-msgstr "Theip ar oscail comhad '%s': %s"
++#~ msgid "SCREEN"
++#~ msgstr "SCÁILEÁN"
+ 
+-#: tests/testfilechooser.c:267
+-#, c-format
+-msgid ""
+-"Failed to load image '%s': reason not known, probably a corrupt image file"
+-msgstr ""
+-"Theip ar luchtú íomhá '%s': fáth anaithnid, is dócha comhad íomhá truaillithe"
++#~ msgid "Make X calls synchronous"
++#~ msgstr "Déan sioncronach glaonna X"
++
++#~ msgid "Credits"
++#~ msgstr "Admhálacha"
++
++#~ msgid "Written by"
++#~ msgstr "Scríofa ag"
++
++#~ msgid "Received invalid color data\n"
++#~ msgstr "Fuair sonraí datha neamhbhailí\n"
++
++#, fuzzy
++#~ msgid "Num Lock is on"
++#~ msgstr "Tá Caps Lock ann"
++
++#~ msgid "_Add"
++#~ msgstr "Cuir _Leis"
++
++#~ msgid "_Remove"
++#~ msgstr "_Bain"
++
++#~ msgid "_Browse for other folders"
++#~ msgstr "_Brabhsáil ar fhillteáin eile"
++
++#~ msgid "Invalid path"
++#~ msgstr "Conair neamhbhailí"
++
++#~ msgid "No match"
++#~ msgstr "Gan rud comhoiriúnach"
++
++#~ msgid "Sole completion"
++#~ msgstr "An comhlánú amháin"
++
++#~ msgid "Complete, but not unique"
++#~ msgstr "Curtha i grích, ach nach uathúil"
++
++#~ msgid "Completing..."
++#~ msgstr "Á chur i grích..."
++
++#~ msgid "Only local files may be selected"
++#~ msgstr "Is féidir comhaid logánta amháin a roghnú"
++
++#~ msgid "Incomplete hostname; end it with '/'"
++#~ msgstr "Óstainm neamhiomlán; cuir '/' ag an deireadh"
++
++#~ msgid "Path does not exist"
++#~ msgstr "Níl an conair sin ann"
++
++#~ msgid "Error creating folder '%s': %s"
++#~ msgstr "Earráid agus fillteán '%s' á chruthú: %s"
++
++#~ msgid ""
++#~ "Could not find the icon '%s'. The '%s' theme\n"
++#~ "was not found either, perhaps you need to install it.\n"
++#~ "You can get a copy from:\n"
++#~ "\t%s"
++#~ msgstr ""
++#~ "Níorbh fhéidir an deilbhín '%s' a aimsiú. Níor\n"
++#~ "aimsíodh an téama '%s' ach an oiread, b'fhéidir go\n"
++#~ "gcaithfidh tú é a shuiteáil.\n"
++#~ "Is féidir leat cóip a fháil ó:\n"
++#~ "\t%s"
++
++#~ msgid "Connect as u_ser:"
++#~ msgstr "Nasc mar ú_sáideoir:"
++
++#~ msgid "_Save in folder:"
++#~ msgstr "_Sábháil i bhfillteán:"
++
++#~ msgid "Unable to find include file: \"%s\""
++#~ msgstr "Ní féidir comhad ceanntáisc a aimsiú: \"%s\""
++
++#~ msgid "Unable to locate image file in pixmap_path: \"%s\""
++#~ msgstr "Ní féidir íomhá chomaid a aimsiú i bpixmap_path: \"%s\""
++
++#~ msgid "This function is not implemented for widgets of class '%s'"
++#~ msgstr "Níl an feidhm seo curtha i ngníomh do ghiuirléidí na haicme '%s'"
++
++#~ msgid "Unable to locate theme engine in module_path: \"%s\","
++#~ msgstr "Ní féidir inneall téama a aimsiú i module_path: \"%s\","
++
++#~ msgid "different idatas found for symlinked '%s' and '%s'\n"
++#~ msgstr "aimsíodh idata difriúla do '%s' agus '%s' nasctha go siombalach\n"
++
++#~ msgid "Could not get information for file '%s': %s"
++#~ msgstr "Níorbh fhéidir eolas a fháil don chomhad '%s': %s"
++
++#~ msgid "Failed to open file '%s': %s"
++#~ msgstr "Theip ar oscail comhad '%s': %s"
++
++#~ msgid ""
++#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
++#~ msgstr ""
++#~ "Theip ar luchtú íomhá '%s': fáth anaithnid, is dócha comhad íomhá "
++#~ "truaillithe"
+ 
+ #~ msgid "Gdk debugging flags to set"
+ #~ msgstr "Bratacha dífhabhtaithe Gdk le socrú"
+diff --git a/po/zh_HK.po b/po/zh_HK.po
+index 64057e3..2305461 100644
+--- a/po/zh_HK.po
++++ b/po/zh_HK.po
+@@ -8,9 +8,9 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: gtk+ 3.3.11\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-09-05 20:10+0800\n"
+-"PO-Revision-Date: 2012-09-05 20:10+0800\n"
+-"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
++"POT-Creation-Date: 2012-11-07 02:40+0800\n"
++"PO-Revision-Date: 2012-11-07 02:40+0800\n"
++"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
+ "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
+ "Language: zh_TW\n"
+ "MIME-Version: 1.0\n"
+@@ -69,7 +69,7 @@ msgstr "準備設定的 GDK 偵錯旗標"
+ #. Placeholder in --gdk-no-debug=FLAGS in --help output
+ #. Placeholder in --gtk-debug=FLAGS in --help output
+ #. Placeholder in --gtk-no-debug=FLAGS in --help output
+-#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:453 ../gtk/gtkmain.c:456
++#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:454 ../gtk/gtkmain.c:457
+ msgid "FLAGS"
+ msgstr "旗標"
+ 
+@@ -698,7 +698,7 @@ msgstr "美工設計"
+ #. * translated on keyboards used for your language, don't translate
+ #. * this.
+ #.
+-#: ../gtk/gtkaccellabel.c:156
++#: ../gtk/gtkaccellabel.c:159
+ msgctxt "keyboard label"
+ msgid "Shift"
+ msgstr "Shift"
+@@ -708,7 +708,7 @@ msgstr "Shift"
+ #. * translated on keyboards used for your language, don't translate
+ #. * this.
+ #.
+-#: ../gtk/gtkaccellabel.c:162
++#: ../gtk/gtkaccellabel.c:165
+ msgctxt "keyboard label"
+ msgid "Ctrl"
+ msgstr "Ctrl"
+@@ -718,7 +718,7 @@ msgstr "Ctrl"
+ #. * translated on keyboards used for your language, don't translate
+ #. * this.
+ #.
+-#: ../gtk/gtkaccellabel.c:168
++#: ../gtk/gtkaccellabel.c:171
+ msgctxt "keyboard label"
+ msgid "Alt"
+ msgstr "Alt"
+@@ -728,7 +728,7 @@ msgstr "Alt"
+ #. * translated on keyboards used for your language, don't translate
+ #. * this.
+ #.
+-#: ../gtk/gtkaccellabel.c:802
++#: ../gtk/gtkaccellabel.c:805
+ msgctxt "keyboard label"
+ msgid "Super"
+ msgstr "Super"
+@@ -738,7 +738,7 @@ msgstr "Super"
+ #. * translated on keyboards used for your language, don't translate
+ #. * this.
+ #.
+-#: ../gtk/gtkaccellabel.c:815
++#: ../gtk/gtkaccellabel.c:818
+ msgctxt "keyboard label"
+ msgid "Hyper"
+ msgstr "Hyper"
+@@ -748,17 +748,17 @@ msgstr "Hyper"
+ #. * translated on keyboards used for your language, don't translate
+ #. * this.
+ #.
+-#: ../gtk/gtkaccellabel.c:829
++#: ../gtk/gtkaccellabel.c:832
+ msgctxt "keyboard label"
+ msgid "Meta"
+ msgstr "Meta"
+ 
+-#: ../gtk/gtkaccellabel.c:845
++#: ../gtk/gtkaccellabel.c:848
+ msgctxt "keyboard label"
+ msgid "Space"
+ msgstr "Space"
+ 
+-#: ../gtk/gtkaccellabel.c:848
++#: ../gtk/gtkaccellabel.c:851
+ msgctxt "keyboard label"
+ msgid "Backslash"
+ msgstr "Backslash"
+@@ -794,7 +794,7 @@ msgstr "找不到應用程式"
+ msgid "Select an application to open \"%s\""
+ msgstr "請選擇要用來開啟「%s」的應用程式"
+ 
+-#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:654
++#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:657
+ #, c-format
+ msgid "No applications available to open \"%s\""
+ msgstr "沒有程式可開啟「%s」的應用程式"
+@@ -824,23 +824,23 @@ msgstr "消除關聯"
+ msgid "Show other applications"
+ msgstr "顯示其他的應用程式"
+ 
+-#: ../gtk/gtkappchooserwidget.c:603
++#: ../gtk/gtkappchooserwidget.c:606
+ msgid "Default Application"
+ msgstr "預設的應用程式"
+ 
+-#: ../gtk/gtkappchooserwidget.c:741
++#: ../gtk/gtkappchooserwidget.c:744
+ msgid "Recommended Applications"
+ msgstr "建議的應用程式"
+ 
+-#: ../gtk/gtkappchooserwidget.c:756
++#: ../gtk/gtkappchooserwidget.c:759
+ msgid "Related Applications"
+ msgstr "相關的應用程式"
+ 
+-#: ../gtk/gtkappchooserwidget.c:770
++#: ../gtk/gtkappchooserwidget.c:773
+ msgid "Other Applications"
+ msgstr "其他的應用程式"
+ 
+-#: ../gtk/gtkapplication.c:1552
++#: ../gtk/gtkapplication.c:1558
+ #, c-format
+ msgid ""
+ "%s cannot quit at this time:\n"
+@@ -851,20 +851,20 @@ msgstr ""
+ "\n"
+ "%s"
+ 
+-#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:475
++#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:480
+ #: ../gtk/gtkprintoperation-win32.c:1445
+ msgid "Application"
+ msgstr "應用程式"
+ 
+-#: ../gtk/gtkassistant.c:1004
++#: ../gtk/gtkassistant.c:1008
+ msgid "C_ontinue"
+ msgstr "繼續(_O)"
+ 
+-#: ../gtk/gtkassistant.c:1007
++#: ../gtk/gtkassistant.c:1011
+ msgid "Go _Back"
+ msgstr "後退(_B)"
+ 
+-#: ../gtk/gtkassistant.c:1011
++#: ../gtk/gtkassistant.c:1015
+ msgid "_Finish"
+ msgstr "完成(_F)"
+ 
+@@ -1003,7 +1003,7 @@ msgstr "無效"
+ #. * an accelerator when the cell is clicked to change the
+ #. * acelerator.
+ #.
+-#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:745
++#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:747
+ msgid "New accelerator..."
+ msgstr "新增捷徑鍵…"
+ 
+@@ -1403,7 +1403,7 @@ msgstr "Caps Lock 已開啟"
+ msgid "Select a File"
+ msgstr "選取檔案"
+ 
+-#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1817
++#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1819
+ msgid "Desktop"
+ msgstr "桌面"
+ 
+@@ -1419,48 +1419,48 @@ msgstr "其他…"
+ msgid "Type name of new folder"
+ msgstr "請輸入新資料夾名稱"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:968
++#: ../gtk/gtkfilechooserdefault.c:970
+ msgid "Could not retrieve information about the file"
+ msgstr "無法取得關於檔案的資訊"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:979
++#: ../gtk/gtkfilechooserdefault.c:981
+ msgid "Could not add a bookmark"
+ msgstr "無法加入書籤"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:990
++#: ../gtk/gtkfilechooserdefault.c:992
+ msgid "Could not remove bookmark"
+ msgstr "無法移除書籤"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:1001
++#: ../gtk/gtkfilechooserdefault.c:1003
+ msgid "The folder could not be created"
+ msgstr "無法建立資料夾"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:1014
++#: ../gtk/gtkfilechooserdefault.c:1016
+ msgid ""
+ "The folder could not be created, as a file with the same name already "
+ "exists.  Try using a different name for the folder, or rename the file first."
+ msgstr "此資料夾無法建立，因為已有相同名稱的檔案存在。嘗試使用不同的資料夾名稱，或者先重新命名該檔案。"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:1028
++#: ../gtk/gtkfilechooserdefault.c:1030
+ msgid "You need to choose a valid filename."
+ msgstr "你需要選擇有效的檔案名稱"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:1031
++#: ../gtk/gtkfilechooserdefault.c:1033
+ #, c-format
+ msgid "Cannot create a file under %s as it is not a folder"
+ msgstr "不能在 %s 下建立檔案，因為它不是資料夾"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:1043
++#: ../gtk/gtkfilechooserdefault.c:1045
+ msgid ""
+ "You may only select folders.  The item that you selected is not a folder; "
+ "try using a different item."
+ msgstr "你只能選擇資料夾。你所選取的項目不是資料夾；請嘗試使用不同的項目。"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:1053
++#: ../gtk/gtkfilechooserdefault.c:1055
+ msgid "Invalid file name"
+ msgstr "無效的檔案名稱"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:1063
++#: ../gtk/gtkfilechooserdefault.c:1065
+ msgid "The folder contents could not be displayed"
+ msgstr "無法顯示資料夾內容"
+ 
+@@ -1468,218 +1468,218 @@ msgstr "無法顯示資料夾內容"
+ #. * is a hostname. Nautilus and the panel contain the same string
+ #. * to translate.
+ #.
+-#: ../gtk/gtkfilechooserdefault.c:1589
++#: ../gtk/gtkfilechooserdefault.c:1591
+ #, c-format
+ msgid "%1$s on %2$s"
+ msgstr "%1$s 於 %2$s"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:1738
++#: ../gtk/gtkfilechooserdefault.c:1740
+ msgid "Search"
+ msgstr "搜尋"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:1762 ../gtk/gtkfilechooserdefault.c:4988
++#: ../gtk/gtkfilechooserdefault.c:1764 ../gtk/gtkfilechooserdefault.c:4990
+ msgid "Recently Used"
+-msgstr "最近使用的"
++msgstr "最近使用"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:2361
++#: ../gtk/gtkfilechooserdefault.c:2363
+ msgid "Select which types of files are shown"
+ msgstr "選擇顯示哪種類型的檔案"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:2720
++#: ../gtk/gtkfilechooserdefault.c:2722
+ #, c-format
+ msgid "Add the folder '%s' to the bookmarks"
+ msgstr "將資料夾「%s」加入書籤"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:2764
++#: ../gtk/gtkfilechooserdefault.c:2766
+ #, c-format
+ msgid "Add the current folder to the bookmarks"
+ msgstr "將目前的資料夾加入書籤"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:2766
++#: ../gtk/gtkfilechooserdefault.c:2768
+ #, c-format
+ msgid "Add the selected folders to the bookmarks"
+ msgstr "將已選的資料夾加入書籤"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:2804
++#: ../gtk/gtkfilechooserdefault.c:2806
+ #, c-format
+ msgid "Remove the bookmark '%s'"
+ msgstr "移除書籤「%s」"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:2806
++#: ../gtk/gtkfilechooserdefault.c:2808
+ #, c-format
+ msgid "Bookmark '%s' cannot be removed"
+ msgstr "無法移除書籤「%s」"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:2813 ../gtk/gtkfilechooserdefault.c:3699
++#: ../gtk/gtkfilechooserdefault.c:2815 ../gtk/gtkfilechooserdefault.c:3701
+ msgid "Remove the selected bookmark"
+ msgstr "移除已選的書籤"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:3377
++#: ../gtk/gtkfilechooserdefault.c:3379
+ msgid "Remove"
+ msgstr "移除"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:3386
++#: ../gtk/gtkfilechooserdefault.c:3388
+ msgid "Rename..."
+ msgstr "重新命名…"
+ 
+ #. Accessible object name for the file chooser's shortcuts pane
+-#: ../gtk/gtkfilechooserdefault.c:3550
++#: ../gtk/gtkfilechooserdefault.c:3552
+ msgid "Places"
+ msgstr "位置"
+ 
+ #. Column header for the file chooser's shortcuts pane
+-#: ../gtk/gtkfilechooserdefault.c:3607
++#: ../gtk/gtkfilechooserdefault.c:3609
+ msgid "_Places"
+ msgstr "位置(_P)"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:3687
++#: ../gtk/gtkfilechooserdefault.c:3689
+ msgid "Add the selected folder to the Bookmarks"
+ msgstr "將已選的資料夾加入書籤"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:3948
++#: ../gtk/gtkfilechooserdefault.c:3950
+ msgid "Could not select file"
+ msgstr "無法選取檔案"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4173
++#: ../gtk/gtkfilechooserdefault.c:4175
+ msgid "_Visit this file"
+ msgstr "查閱這個檔案(_V)"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4176
++#: ../gtk/gtkfilechooserdefault.c:4178
+ msgid "_Copy file's location"
+ msgstr "複製檔案的位置(_C)"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4179
++#: ../gtk/gtkfilechooserdefault.c:4181
+ msgid "_Add to Bookmarks"
+ msgstr "加入書籤(_A)"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4186
++#: ../gtk/gtkfilechooserdefault.c:4188
+ msgid "Show _Hidden Files"
+ msgstr "顯示隱藏檔(_H)"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4189
++#: ../gtk/gtkfilechooserdefault.c:4191
+ msgid "Show _Size Column"
+ msgstr "顯示大小欄位(_S)"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4414
++#: ../gtk/gtkfilechooserdefault.c:4416
+ msgid "Files"
+ msgstr "檔案"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4465
++#: ../gtk/gtkfilechooserdefault.c:4467
+ msgid "Name"
+ msgstr "名稱"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4488
++#: ../gtk/gtkfilechooserdefault.c:4490
+ msgid "Size"
+ msgstr "大小"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4502
++#: ../gtk/gtkfilechooserdefault.c:4504
+ msgid "Modified"
+ msgstr "已修改"
+ 
+ #. Label
+-#: ../gtk/gtkfilechooserdefault.c:4595
++#: ../gtk/gtkfilechooserdefault.c:4597
+ msgid "_Name:"
+ msgstr "名稱(_N):"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4826
++#: ../gtk/gtkfilechooserdefault.c:4828
+ msgid "Type a file name"
+ msgstr "輸入檔案名稱"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4873 ../gtk/gtkfilechooserdefault.c:4884
++#: ../gtk/gtkfilechooserdefault.c:4875 ../gtk/gtkfilechooserdefault.c:4886
+ msgid "Please select a folder below"
+ msgstr "請選擇下面的資料夾"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4879
++#: ../gtk/gtkfilechooserdefault.c:4881
+ msgid "Please type a file name"
+ msgstr "請輸入檔案名稱"
+ 
+ #. Create Folder
+-#: ../gtk/gtkfilechooserdefault.c:4950
++#: ../gtk/gtkfilechooserdefault.c:4952
+ msgid "Create Fo_lder"
+ msgstr "建立資料夾(_L)"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4998
++#: ../gtk/gtkfilechooserdefault.c:5000
+ msgid "Search:"
+ msgstr "搜尋："
+ 
+-#: ../gtk/gtkfilechooserdefault.c:5049
++#: ../gtk/gtkfilechooserdefault.c:5051
+ msgid "_Location:"
+ msgstr "位置(_L):"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:5500
++#: ../gtk/gtkfilechooserdefault.c:5502
+ msgid "Save in _folder:"
+ msgstr "儲存於資料夾(_F):"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:5502
++#: ../gtk/gtkfilechooserdefault.c:5504
+ msgid "Create in _folder:"
+ msgstr "新增於資料夾(_F)："
+ 
+-#: ../gtk/gtkfilechooserdefault.c:6589
++#: ../gtk/gtkfilechooserdefault.c:6591
+ #, c-format
+ msgid "Could not read the contents of %s"
+ msgstr "無法讀取 %s 的內容"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:6593
++#: ../gtk/gtkfilechooserdefault.c:6595
+ msgid "Could not read the contents of the folder"
+ msgstr "無法讀取資料夾的內容"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:6686 ../gtk/gtkfilechooserdefault.c:6754
+-#: ../gtk/gtkfilechooserdefault.c:6934
++#: ../gtk/gtkfilechooserdefault.c:6688 ../gtk/gtkfilechooserdefault.c:6756
++#: ../gtk/gtkfilechooserdefault.c:6936
+ msgid "Unknown"
+ msgstr "不明"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:6701
++#: ../gtk/gtkfilechooserdefault.c:6703
+ msgid "%H:%M"
+ msgstr "%H:%M"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:6703
++#: ../gtk/gtkfilechooserdefault.c:6705
+ msgid "Yesterday at %H:%M"
+ msgstr "昨天 %H:%M"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:7405
++#: ../gtk/gtkfilechooserdefault.c:7407
+ msgid "Cannot change to folder because it is not local"
+ msgstr "無法進入資料夾，因為它不是本地資料夾"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:8009 ../gtk/gtkfilechooserdefault.c:8030
++#: ../gtk/gtkfilechooserdefault.c:8011 ../gtk/gtkfilechooserdefault.c:8032
+ #, c-format
+ msgid "Shortcut %s already exists"
+ msgstr "捷徑 %s 已經存在"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:8120
++#: ../gtk/gtkfilechooserdefault.c:8122
+ #, c-format
+ msgid "Shortcut %s does not exist"
+ msgstr "捷徑 %s 不存在"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:8366 ../gtk/gtkprintunixdialog.c:548
++#: ../gtk/gtkfilechooserdefault.c:8368 ../gtk/gtkprintunixdialog.c:548
+ #, c-format
+ msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+ msgstr "名為「%s」的檔案已存在。是否要取代它？"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:8369 ../gtk/gtkprintunixdialog.c:552
++#: ../gtk/gtkfilechooserdefault.c:8371 ../gtk/gtkprintunixdialog.c:552
+ #, c-format
+ msgid ""
+ "The file already exists in \"%s\".  Replacing it will overwrite its contents."
+ msgstr "該檔案已存在於「%s」。取代它會覆蓋它的內容。"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:8374 ../gtk/gtkprintunixdialog.c:559
++#: ../gtk/gtkfilechooserdefault.c:8376 ../gtk/gtkprintunixdialog.c:559
+ msgid "_Replace"
+ msgstr "取代(_R)"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:9181
++#: ../gtk/gtkfilechooserdefault.c:9183
+ msgid "Could not start the search process"
+ msgstr "無法開始搜尋程序"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:9182
++#: ../gtk/gtkfilechooserdefault.c:9184
+ msgid ""
+ "The program was not able to create a connection to the indexer daemon.  "
+ "Please make sure it is running."
+ msgstr "此程式無法建立至 indexer 伺服程式的連線。請確認它是否已執行。"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:9196
++#: ../gtk/gtkfilechooserdefault.c:9198
+ msgid "Could not send the search request"
+ msgstr "無法傳送搜尋要求"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:9806
++#: ../gtk/gtkfilechooserdefault.c:9808
+ #, c-format
+ msgid "Could not mount %s"
+ msgstr "無法掛載 %s"
+@@ -1842,27 +1842,27 @@ msgstr ""
+ "請聯絡你的系統管理員"
+ 
+ #. Description of --gtk-module=MODULES in --help output
+-#: ../gtk/gtkmain.c:446
++#: ../gtk/gtkmain.c:447
+ msgid "Load additional GTK+ modules"
+ msgstr "載入額外的 GTK+ 模組"
+ 
+ #. Placeholder in --gtk-module=MODULES in --help output
+-#: ../gtk/gtkmain.c:447
++#: ../gtk/gtkmain.c:448
+ msgid "MODULES"
+ msgstr "模組"
+ 
+ #. Description of --g-fatal-warnings in --help output
+-#: ../gtk/gtkmain.c:449
++#: ../gtk/gtkmain.c:450
+ msgid "Make all warnings fatal"
+ msgstr "把所有的警告訊息都當成嚴重錯誤"
+ 
+ #. Description of --gtk-debug=FLAGS in --help output
+-#: ../gtk/gtkmain.c:452
++#: ../gtk/gtkmain.c:453
+ msgid "GTK+ debugging flags to set"
+ msgstr "準備設定的 GTK+ 偵錯旗標"
+ 
+ #. Description of --gtk-no-debug=FLAGS in --help output
+-#: ../gtk/gtkmain.c:455
++#: ../gtk/gtkmain.c:456
+ msgid "GTK+ debugging flags to unset"
+ msgstr "準備去除的 GTK+ 偵錯旗標"
+ 
+@@ -1871,73 +1871,73 @@ msgstr "準備去除的 GTK+ 偵錯旗標"
+ #. * Do *not* translate it to "predefinito:LTR", if it
+ #. * it isn't default:LTR or default:RTL it will not work
+ #.
+-#: ../gtk/gtkmain.c:706
++#: ../gtk/gtkmain.c:704
+ msgid "default:LTR"
+ msgstr "default:LTR"
+ 
+-#: ../gtk/gtkmain.c:774
++#: ../gtk/gtkmain.c:772
+ #, c-format
+ msgid "Cannot open display: %s"
+ msgstr "無法開啟畫面：%s"
+ 
+-#: ../gtk/gtkmain.c:840
++#: ../gtk/gtkmain.c:838
+ msgid "GTK+ Options"
+ msgstr "GTK+ 選項"
+ 
+-#: ../gtk/gtkmain.c:840
++#: ../gtk/gtkmain.c:838
+ msgid "Show GTK+ Options"
+ msgstr "顯示 GTK+ 選項"
+ 
+-#: ../gtk/gtkmountoperation.c:532
++#: ../gtk/gtkmountoperation.c:535
+ msgid "Co_nnect"
+ msgstr "連線(_N)"
+ 
+-#: ../gtk/gtkmountoperation.c:606
++#: ../gtk/gtkmountoperation.c:609
+ msgid "Connect As"
+ msgstr "連線身分"
+ 
+-#: ../gtk/gtkmountoperation.c:615
++#: ../gtk/gtkmountoperation.c:618
+ msgid "_Anonymous"
+ msgstr "匿名(_A)"
+ 
+-#: ../gtk/gtkmountoperation.c:624
++#: ../gtk/gtkmountoperation.c:627
+ msgid "Registered U_ser"
+ msgstr "已註冊使用者(_S)"
+ 
+-#: ../gtk/gtkmountoperation.c:635
++#: ../gtk/gtkmountoperation.c:638
+ msgid "_Username"
+ msgstr "使用者名稱(_U)"
+ 
+-#: ../gtk/gtkmountoperation.c:640
++#: ../gtk/gtkmountoperation.c:643
+ msgid "_Domain"
+ msgstr "網域(_D)"
+ 
+-#: ../gtk/gtkmountoperation.c:646
++#: ../gtk/gtkmountoperation.c:649
+ msgid "_Password"
+ msgstr "密碼(_P)"
+ 
+-#: ../gtk/gtkmountoperation.c:668
++#: ../gtk/gtkmountoperation.c:671
+ msgid "Forget password _immediately"
+ msgstr "立刻忘記密碼(_I)"
+ 
+-#: ../gtk/gtkmountoperation.c:678
++#: ../gtk/gtkmountoperation.c:681
+ msgid "Remember password until you _logout"
+ msgstr "記憶密碼到登出之前(_L)"
+ 
+-#: ../gtk/gtkmountoperation.c:688
++#: ../gtk/gtkmountoperation.c:691
+ msgid "Remember _forever"
+ msgstr "永遠記住密碼(_F)"
+ 
+-#: ../gtk/gtkmountoperation.c:1077
++#: ../gtk/gtkmountoperation.c:1080
+ #, c-format
+ msgid "Unknown Application (PID %d)"
+ msgstr "不明的應用程式（PID %d）"
+ 
+-#: ../gtk/gtkmountoperation.c:1260
++#: ../gtk/gtkmountoperation.c:1263
+ msgid "Unable to end process"
+ msgstr "無法終止程序"
+ 
+-#: ../gtk/gtkmountoperation.c:1297
++#: ../gtk/gtkmountoperation.c:1300
+ msgid "_End Process"
+ msgstr "終止程序(_E)"
+ 
+@@ -1980,14 +1980,14 @@ msgstr "第 %u 頁"
+ #. Translators: the format here is used to build the string that will be rendered
+ #. * in the number emblem.
+ #.
+-#: ../gtk/gtknumerableicon.c:481
++#: ../gtk/gtknumerableicon.c:482
+ #, c-format
+ msgctxt "Number format"
+ msgid "%d"
+ msgstr "%d"
+ 
+-#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:846
+-#: ../gtk/gtkpapersize.c:886
++#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:848
++#: ../gtk/gtkpapersize.c:888
+ msgid "Not a valid page setup file"
+ msgstr "不是有效的頁面設定檔案"
+ 
+@@ -2046,7 +2046,7 @@ msgstr "向下路徑"
+ msgid "File System Root"
+ msgstr "檔案系統根"
+ 
+-#: ../gtk/gtkprintbackend.c:748
++#: ../gtk/gtkprintbackend.c:750
+ msgid "Authentication"
+ msgstr "驗證"
+ 
+@@ -2112,29 +2112,29 @@ msgctxt "print operation status"
+ msgid "Finished with error"
+ msgstr "已完成但發生錯誤"
+ 
+-#: ../gtk/gtkprintoperation.c:2352
++#: ../gtk/gtkprintoperation.c:2349
+ #, c-format
+ msgid "Preparing %d"
+ msgstr "正在準備 %d"
+ 
+-#: ../gtk/gtkprintoperation.c:2354 ../gtk/gtkprintoperation.c:2984
++#: ../gtk/gtkprintoperation.c:2351 ../gtk/gtkprintoperation.c:2983
+ msgid "Preparing"
+ msgstr "正在準備"
+ 
+-#: ../gtk/gtkprintoperation.c:2357
++#: ../gtk/gtkprintoperation.c:2354
+ #, c-format
+ msgid "Printing %d"
+ msgstr "正在打印 %d"
+ 
+-#: ../gtk/gtkprintoperation.c:3014
++#: ../gtk/gtkprintoperation.c:3013
+ msgid "Error creating print preview"
+ msgstr "建立打印預覽時發生錯誤"
+ 
+-#: ../gtk/gtkprintoperation.c:3017
++#: ../gtk/gtkprintoperation.c:3016
+ msgid "The most probable reason is that a temporary file could not be created."
+ msgstr "最可能的原因是無法建立暫存檔案。"
+ 
+-#: ../gtk/gtkprintoperation-unix.c:302
++#: ../gtk/gtkprintoperation-unix.c:307
+ msgid "Error launching preview"
+ msgstr "執行預覽時發生錯誤"
+ 
+@@ -3301,7 +3301,7 @@ msgstr "第 %2$d 行第 %3$d 字有非預設的開始標記「%1$s」"
+ msgid "Unexpected character data on line %d char %d"
+ msgstr "第 %d 行第 %d 字有非預設的字符資料"
+ 
+-#: ../gtk/gtkuimanager.c:2738
++#: ../gtk/gtkuimanager.c:2694
+ msgid "Empty"
+ msgstr "空的"
+ 
+diff --git a/po/zh_TW.po b/po/zh_TW.po
+index 785b127..979172e 100644
+--- a/po/zh_TW.po
++++ b/po/zh_TW.po
+@@ -8,9 +8,9 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: gtk+ 3.3.11\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-09-05 20:10+0800\n"
+-"PO-Revision-Date: 2012-09-05 16:20+0800\n"
+-"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
++"POT-Creation-Date: 2012-11-07 02:40+0800\n"
++"PO-Revision-Date: 2012-11-01 22:07+0800\n"
++"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
+ "Language-Team: <>\n"
+ "Language: zh_TW\n"
+ "MIME-Version: 1.0\n"
+@@ -69,7 +69,7 @@ msgstr "準備設定的 GDK 偵錯旗標"
+ #. Placeholder in --gdk-no-debug=FLAGS in --help output
+ #. Placeholder in --gtk-debug=FLAGS in --help output
+ #. Placeholder in --gtk-no-debug=FLAGS in --help output
+-#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:453 ../gtk/gtkmain.c:456
++#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:454 ../gtk/gtkmain.c:457
+ msgid "FLAGS"
+ msgstr "旗標"
+ 
+@@ -699,7 +699,7 @@ msgstr "美工設計"
+ #. * translated on keyboards used for your language, don't translate
+ #. * this.
+ #.
+-#: ../gtk/gtkaccellabel.c:156
++#: ../gtk/gtkaccellabel.c:159
+ msgctxt "keyboard label"
+ msgid "Shift"
+ msgstr "Shift"
+@@ -709,7 +709,7 @@ msgstr "Shift"
+ #. * translated on keyboards used for your language, don't translate
+ #. * this.
+ #.
+-#: ../gtk/gtkaccellabel.c:162
++#: ../gtk/gtkaccellabel.c:165
+ msgctxt "keyboard label"
+ msgid "Ctrl"
+ msgstr "Ctrl"
+@@ -719,7 +719,7 @@ msgstr "Ctrl"
+ #. * translated on keyboards used for your language, don't translate
+ #. * this.
+ #.
+-#: ../gtk/gtkaccellabel.c:168
++#: ../gtk/gtkaccellabel.c:171
+ msgctxt "keyboard label"
+ msgid "Alt"
+ msgstr "Alt"
+@@ -729,7 +729,7 @@ msgstr "Alt"
+ #. * translated on keyboards used for your language, don't translate
+ #. * this.
+ #.
+-#: ../gtk/gtkaccellabel.c:802
++#: ../gtk/gtkaccellabel.c:805
+ msgctxt "keyboard label"
+ msgid "Super"
+ msgstr "Super"
+@@ -739,7 +739,7 @@ msgstr "Super"
+ #. * translated on keyboards used for your language, don't translate
+ #. * this.
+ #.
+-#: ../gtk/gtkaccellabel.c:815
++#: ../gtk/gtkaccellabel.c:818
+ msgctxt "keyboard label"
+ msgid "Hyper"
+ msgstr "Hyper"
+@@ -749,17 +749,17 @@ msgstr "Hyper"
+ #. * translated on keyboards used for your language, don't translate
+ #. * this.
+ #.
+-#: ../gtk/gtkaccellabel.c:829
++#: ../gtk/gtkaccellabel.c:832
+ msgctxt "keyboard label"
+ msgid "Meta"
+ msgstr "Meta"
+ 
+-#: ../gtk/gtkaccellabel.c:845
++#: ../gtk/gtkaccellabel.c:848
+ msgctxt "keyboard label"
+ msgid "Space"
+ msgstr "Space"
+ 
+-#: ../gtk/gtkaccellabel.c:848
++#: ../gtk/gtkaccellabel.c:851
+ msgctxt "keyboard label"
+ msgid "Backslash"
+ msgstr "Backslash"
+@@ -795,7 +795,7 @@ msgstr "找不到應用程式"
+ msgid "Select an application to open \"%s\""
+ msgstr "請選擇要用來開啟「%s」的應用程式"
+ 
+-#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:654
++#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:657
+ #, c-format
+ msgid "No applications available to open \"%s\""
+ msgstr "沒有程式可開啟「%s」的應用程式"
+@@ -827,23 +827,23 @@ msgstr "消除關聯"
+ msgid "Show other applications"
+ msgstr "顯示其他的應用程式"
+ 
+-#: ../gtk/gtkappchooserwidget.c:603
++#: ../gtk/gtkappchooserwidget.c:606
+ msgid "Default Application"
+ msgstr "預設的應用程式"
+ 
+-#: ../gtk/gtkappchooserwidget.c:741
++#: ../gtk/gtkappchooserwidget.c:744
+ msgid "Recommended Applications"
+ msgstr "建議的應用程式"
+ 
+-#: ../gtk/gtkappchooserwidget.c:756
++#: ../gtk/gtkappchooserwidget.c:759
+ msgid "Related Applications"
+ msgstr "相關的應用程式"
+ 
+-#: ../gtk/gtkappchooserwidget.c:770
++#: ../gtk/gtkappchooserwidget.c:773
+ msgid "Other Applications"
+ msgstr "其他的應用程式"
+ 
+-#: ../gtk/gtkapplication.c:1552
++#: ../gtk/gtkapplication.c:1558
+ #, c-format
+ msgid ""
+ "%s cannot quit at this time:\n"
+@@ -854,20 +854,20 @@ msgstr ""
+ "\n"
+ "%s"
+ 
+-#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:475
++#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:480
+ #: ../gtk/gtkprintoperation-win32.c:1445
+ msgid "Application"
+ msgstr "應用程式"
+ 
+-#: ../gtk/gtkassistant.c:1004
++#: ../gtk/gtkassistant.c:1008
+ msgid "C_ontinue"
+ msgstr "繼續(_O)"
+ 
+-#: ../gtk/gtkassistant.c:1007
++#: ../gtk/gtkassistant.c:1011
+ msgid "Go _Back"
+ msgstr "後退(_B)"
+ 
+-#: ../gtk/gtkassistant.c:1011
++#: ../gtk/gtkassistant.c:1015
+ msgid "_Finish"
+ msgstr "完成(_F)"
+ 
+@@ -1006,7 +1006,7 @@ msgstr "無效"
+ #. * an accelerator when the cell is clicked to change the
+ #. * acelerator.
+ #.
+-#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:745
++#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:747
+ msgid "New accelerator..."
+ msgstr "新增捷徑鍵…"
+ 
+@@ -1406,7 +1406,7 @@ msgstr "Caps Lock 已開啟"
+ msgid "Select a File"
+ msgstr "選取檔案"
+ 
+-#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1817
++#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1819
+ msgid "Desktop"
+ msgstr "桌面"
+ 
+@@ -1422,23 +1422,23 @@ msgstr "其他…"
+ msgid "Type name of new folder"
+ msgstr "請輸入新資料夾名稱"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:968
++#: ../gtk/gtkfilechooserdefault.c:970
+ msgid "Could not retrieve information about the file"
+ msgstr "無法取得關於檔案的資訊"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:979
++#: ../gtk/gtkfilechooserdefault.c:981
+ msgid "Could not add a bookmark"
+ msgstr "無法加入書籤"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:990
++#: ../gtk/gtkfilechooserdefault.c:992
+ msgid "Could not remove bookmark"
+ msgstr "無法移除書籤"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:1001
++#: ../gtk/gtkfilechooserdefault.c:1003
+ msgid "The folder could not be created"
+ msgstr "無法建立資料夾"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:1014
++#: ../gtk/gtkfilechooserdefault.c:1016
+ msgid ""
+ "The folder could not be created, as a file with the same name already "
+ "exists.  Try using a different name for the folder, or rename the file first."
+@@ -1446,26 +1446,26 @@ msgstr ""
+ "此資料夾無法建立，因為已有相同名稱的檔案存在。試著使用不同的資料夾名稱，或者"
+ "先重新命名該檔案。"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:1028
++#: ../gtk/gtkfilechooserdefault.c:1030
+ msgid "You need to choose a valid filename."
+ msgstr "您需要選擇有效的檔案名稱"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:1031
++#: ../gtk/gtkfilechooserdefault.c:1033
+ #, c-format
+ msgid "Cannot create a file under %s as it is not a folder"
+ msgstr "不能在 %s 下建立檔案，因為它不是資料夾"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:1043
++#: ../gtk/gtkfilechooserdefault.c:1045
+ msgid ""
+ "You may only select folders.  The item that you selected is not a folder; "
+ "try using a different item."
+ msgstr "您只能選擇資料夾。您所選取的項目不是資料夾；請試著使用不同的項目。"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:1053
++#: ../gtk/gtkfilechooserdefault.c:1055
+ msgid "Invalid file name"
+ msgstr "無效的檔案名稱"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:1063
++#: ../gtk/gtkfilechooserdefault.c:1065
+ msgid "The folder contents could not be displayed"
+ msgstr "無法顯示資料夾內容"
+ 
+@@ -1473,218 +1473,218 @@ msgstr "無法顯示資料夾內容"
+ #. * is a hostname. Nautilus and the panel contain the same string
+ #. * to translate.
+ #.
+-#: ../gtk/gtkfilechooserdefault.c:1589
++#: ../gtk/gtkfilechooserdefault.c:1591
+ #, c-format
+ msgid "%1$s on %2$s"
+ msgstr "%1$s 於 %2$s"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:1738
++#: ../gtk/gtkfilechooserdefault.c:1740
+ msgid "Search"
+ msgstr "搜尋"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:1762 ../gtk/gtkfilechooserdefault.c:4988
++#: ../gtk/gtkfilechooserdefault.c:1764 ../gtk/gtkfilechooserdefault.c:4990
+ msgid "Recently Used"
+-msgstr "最近使用的"
++msgstr "最近使用"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:2361
++#: ../gtk/gtkfilechooserdefault.c:2363
+ msgid "Select which types of files are shown"
+ msgstr "選擇顯示哪種類型的檔案"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:2720
++#: ../gtk/gtkfilechooserdefault.c:2722
+ #, c-format
+ msgid "Add the folder '%s' to the bookmarks"
+ msgstr "將資料夾「%s」加入書籤"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:2764
++#: ../gtk/gtkfilechooserdefault.c:2766
+ #, c-format
+ msgid "Add the current folder to the bookmarks"
+ msgstr "將目前的資料夾加入書籤"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:2766
++#: ../gtk/gtkfilechooserdefault.c:2768
+ #, c-format
+ msgid "Add the selected folders to the bookmarks"
+ msgstr "將已選的資料夾加入書籤"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:2804
++#: ../gtk/gtkfilechooserdefault.c:2806
+ #, c-format
+ msgid "Remove the bookmark '%s'"
+ msgstr "移除書籤「%s」"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:2806
++#: ../gtk/gtkfilechooserdefault.c:2808
+ #, c-format
+ msgid "Bookmark '%s' cannot be removed"
+ msgstr "無法移除書籤「%s」"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:2813 ../gtk/gtkfilechooserdefault.c:3699
++#: ../gtk/gtkfilechooserdefault.c:2815 ../gtk/gtkfilechooserdefault.c:3701
+ msgid "Remove the selected bookmark"
+ msgstr "移除已選的書籤"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:3377
++#: ../gtk/gtkfilechooserdefault.c:3379
+ msgid "Remove"
+ msgstr "移除"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:3386
++#: ../gtk/gtkfilechooserdefault.c:3388
+ msgid "Rename..."
+ msgstr "重新命名…"
+ 
+ #. Accessible object name for the file chooser's shortcuts pane
+-#: ../gtk/gtkfilechooserdefault.c:3550
++#: ../gtk/gtkfilechooserdefault.c:3552
+ msgid "Places"
+ msgstr "位置"
+ 
+ #. Column header for the file chooser's shortcuts pane
+-#: ../gtk/gtkfilechooserdefault.c:3607
++#: ../gtk/gtkfilechooserdefault.c:3609
+ msgid "_Places"
+ msgstr "位置(_P)"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:3687
++#: ../gtk/gtkfilechooserdefault.c:3689
+ msgid "Add the selected folder to the Bookmarks"
+ msgstr "將已選的資料夾加入書籤"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:3948
++#: ../gtk/gtkfilechooserdefault.c:3950
+ msgid "Could not select file"
+ msgstr "無法選取檔案"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4173
++#: ../gtk/gtkfilechooserdefault.c:4175
+ msgid "_Visit this file"
+ msgstr "查閱這個檔案(_V)"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4176
++#: ../gtk/gtkfilechooserdefault.c:4178
+ msgid "_Copy file's location"
+ msgstr "複製檔案的位置(_C)"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4179
++#: ../gtk/gtkfilechooserdefault.c:4181
+ msgid "_Add to Bookmarks"
+ msgstr "加入書籤(_A)"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4186
++#: ../gtk/gtkfilechooserdefault.c:4188
+ msgid "Show _Hidden Files"
+ msgstr "顯示隱藏檔(_H)"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4189
++#: ../gtk/gtkfilechooserdefault.c:4191
+ msgid "Show _Size Column"
+ msgstr "顯示大小欄位(_S)"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4414
++#: ../gtk/gtkfilechooserdefault.c:4416
+ msgid "Files"
+ msgstr "檔案"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4465
++#: ../gtk/gtkfilechooserdefault.c:4467
+ msgid "Name"
+ msgstr "名稱"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4488
++#: ../gtk/gtkfilechooserdefault.c:4490
+ msgid "Size"
+ msgstr "大小"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4502
++#: ../gtk/gtkfilechooserdefault.c:4504
+ msgid "Modified"
+ msgstr "已修改"
+ 
+ #. Label
+-#: ../gtk/gtkfilechooserdefault.c:4595
++#: ../gtk/gtkfilechooserdefault.c:4597
+ msgid "_Name:"
+ msgstr "名稱(_N):"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4826
++#: ../gtk/gtkfilechooserdefault.c:4828
+ msgid "Type a file name"
+ msgstr "輸入檔案名稱"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4873 ../gtk/gtkfilechooserdefault.c:4884
++#: ../gtk/gtkfilechooserdefault.c:4875 ../gtk/gtkfilechooserdefault.c:4886
+ msgid "Please select a folder below"
+ msgstr "請選擇下面的資料夾"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4879
++#: ../gtk/gtkfilechooserdefault.c:4881
+ msgid "Please type a file name"
+ msgstr "請輸入檔案名稱"
+ 
+ #. Create Folder
+-#: ../gtk/gtkfilechooserdefault.c:4950
++#: ../gtk/gtkfilechooserdefault.c:4952
+ msgid "Create Fo_lder"
+ msgstr "建立資料夾(_L)"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:4998
++#: ../gtk/gtkfilechooserdefault.c:5000
+ msgid "Search:"
+ msgstr "搜尋："
+ 
+-#: ../gtk/gtkfilechooserdefault.c:5049
++#: ../gtk/gtkfilechooserdefault.c:5051
+ msgid "_Location:"
+ msgstr "位置(_L):"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:5500
++#: ../gtk/gtkfilechooserdefault.c:5502
+ msgid "Save in _folder:"
+ msgstr "儲存於資料夾(_F):"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:5502
++#: ../gtk/gtkfilechooserdefault.c:5504
+ msgid "Create in _folder:"
+ msgstr "新增於資料夾(_F)："
+ 
+-#: ../gtk/gtkfilechooserdefault.c:6589
++#: ../gtk/gtkfilechooserdefault.c:6591
+ #, c-format
+ msgid "Could not read the contents of %s"
+ msgstr "無法讀取 %s 的內容"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:6593
++#: ../gtk/gtkfilechooserdefault.c:6595
+ msgid "Could not read the contents of the folder"
+ msgstr "無法讀取資料夾的內容"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:6686 ../gtk/gtkfilechooserdefault.c:6754
+-#: ../gtk/gtkfilechooserdefault.c:6934
++#: ../gtk/gtkfilechooserdefault.c:6688 ../gtk/gtkfilechooserdefault.c:6756
++#: ../gtk/gtkfilechooserdefault.c:6936
+ msgid "Unknown"
+ msgstr "不明"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:6701
++#: ../gtk/gtkfilechooserdefault.c:6703
+ msgid "%H:%M"
+ msgstr "%H:%M"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:6703
++#: ../gtk/gtkfilechooserdefault.c:6705
+ msgid "Yesterday at %H:%M"
+ msgstr "昨天 %H:%M"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:7405
++#: ../gtk/gtkfilechooserdefault.c:7407
+ msgid "Cannot change to folder because it is not local"
+ msgstr "無法進入資料夾，因為它不是本地資料夾"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:8009 ../gtk/gtkfilechooserdefault.c:8030
++#: ../gtk/gtkfilechooserdefault.c:8011 ../gtk/gtkfilechooserdefault.c:8032
+ #, c-format
+ msgid "Shortcut %s already exists"
+ msgstr "捷徑 %s 已經存在"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:8120
++#: ../gtk/gtkfilechooserdefault.c:8122
+ #, c-format
+ msgid "Shortcut %s does not exist"
+ msgstr "捷徑 %s 不存在"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:8366 ../gtk/gtkprintunixdialog.c:548
++#: ../gtk/gtkfilechooserdefault.c:8368 ../gtk/gtkprintunixdialog.c:548
+ #, c-format
+ msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+ msgstr "名為「%s」的檔案已存在。是否要取代它？"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:8369 ../gtk/gtkprintunixdialog.c:552
++#: ../gtk/gtkfilechooserdefault.c:8371 ../gtk/gtkprintunixdialog.c:552
+ #, c-format
+ msgid ""
+ "The file already exists in \"%s\".  Replacing it will overwrite its contents."
+ msgstr "該檔案已存在於「%s」。取代它會覆蓋它的內容。"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:8374 ../gtk/gtkprintunixdialog.c:559
++#: ../gtk/gtkfilechooserdefault.c:8376 ../gtk/gtkprintunixdialog.c:559
+ msgid "_Replace"
+ msgstr "取代(_R)"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:9181
++#: ../gtk/gtkfilechooserdefault.c:9183
+ msgid "Could not start the search process"
+ msgstr "無法開始搜尋程序"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:9182
++#: ../gtk/gtkfilechooserdefault.c:9184
+ msgid ""
+ "The program was not able to create a connection to the indexer daemon.  "
+ "Please make sure it is running."
+ msgstr "此程式無法建立至 indexer 伺服程式的連線。請確認它是否已執行。"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:9196
++#: ../gtk/gtkfilechooserdefault.c:9198
+ msgid "Could not send the search request"
+ msgstr "無法傳送搜尋要求"
+ 
+-#: ../gtk/gtkfilechooserdefault.c:9806
++#: ../gtk/gtkfilechooserdefault.c:9808
+ #, c-format
+ msgid "Could not mount %s"
+ msgstr "無法掛載 %s"
+@@ -1847,27 +1847,27 @@ msgstr ""
+ "請聯絡您的系統管理員"
+ 
+ #. Description of --gtk-module=MODULES in --help output
+-#: ../gtk/gtkmain.c:446
++#: ../gtk/gtkmain.c:447
+ msgid "Load additional GTK+ modules"
+ msgstr "載入額外的 GTK+ 模組"
+ 
+ #. Placeholder in --gtk-module=MODULES in --help output
+-#: ../gtk/gtkmain.c:447
++#: ../gtk/gtkmain.c:448
+ msgid "MODULES"
+ msgstr "模組"
+ 
+ #. Description of --g-fatal-warnings in --help output
+-#: ../gtk/gtkmain.c:449
++#: ../gtk/gtkmain.c:450
+ msgid "Make all warnings fatal"
+ msgstr "把所有的警告訊息都當成嚴重錯誤"
+ 
+ #. Description of --gtk-debug=FLAGS in --help output
+-#: ../gtk/gtkmain.c:452
++#: ../gtk/gtkmain.c:453
+ msgid "GTK+ debugging flags to set"
+ msgstr "準備設定的 GTK+ 偵錯旗標"
+ 
+ #. Description of --gtk-no-debug=FLAGS in --help output
+-#: ../gtk/gtkmain.c:455
++#: ../gtk/gtkmain.c:456
+ msgid "GTK+ debugging flags to unset"
+ msgstr "準備去除的 GTK+ 偵錯旗標"
+ 
+@@ -1876,73 +1876,73 @@ msgstr "準備去除的 GTK+ 偵錯旗標"
+ #. * Do *not* translate it to "predefinito:LTR", if it
+ #. * it isn't default:LTR or default:RTL it will not work
+ #.
+-#: ../gtk/gtkmain.c:706
++#: ../gtk/gtkmain.c:704
+ msgid "default:LTR"
+ msgstr "default:LTR"
+ 
+-#: ../gtk/gtkmain.c:774
++#: ../gtk/gtkmain.c:772
+ #, c-format
+ msgid "Cannot open display: %s"
+ msgstr "無法開啟畫面：%s"
+ 
+-#: ../gtk/gtkmain.c:840
++#: ../gtk/gtkmain.c:838
+ msgid "GTK+ Options"
+ msgstr "GTK+ 選項"
+ 
+-#: ../gtk/gtkmain.c:840
++#: ../gtk/gtkmain.c:838
+ msgid "Show GTK+ Options"
+ msgstr "顯示 GTK+ 選項"
+ 
+-#: ../gtk/gtkmountoperation.c:532
++#: ../gtk/gtkmountoperation.c:535
+ msgid "Co_nnect"
+ msgstr "連線(_N)"
+ 
+-#: ../gtk/gtkmountoperation.c:606
++#: ../gtk/gtkmountoperation.c:609
+ msgid "Connect As"
+ msgstr "連線身分"
+ 
+-#: ../gtk/gtkmountoperation.c:615
++#: ../gtk/gtkmountoperation.c:618
+ msgid "_Anonymous"
+ msgstr "匿名(_A)"
+ 
+-#: ../gtk/gtkmountoperation.c:624
++#: ../gtk/gtkmountoperation.c:627
+ msgid "Registered U_ser"
+ msgstr "已註冊使用者(_S)"
+ 
+-#: ../gtk/gtkmountoperation.c:635
++#: ../gtk/gtkmountoperation.c:638
+ msgid "_Username"
+ msgstr "使用者名稱(_U)"
+ 
+-#: ../gtk/gtkmountoperation.c:640
++#: ../gtk/gtkmountoperation.c:643
+ msgid "_Domain"
+ msgstr "網域(_D)"
+ 
+-#: ../gtk/gtkmountoperation.c:646
++#: ../gtk/gtkmountoperation.c:649
+ msgid "_Password"
+ msgstr "密碼(_P)"
+ 
+-#: ../gtk/gtkmountoperation.c:668
++#: ../gtk/gtkmountoperation.c:671
+ msgid "Forget password _immediately"
+ msgstr "立刻忘記密碼(_I)"
+ 
+-#: ../gtk/gtkmountoperation.c:678
++#: ../gtk/gtkmountoperation.c:681
+ msgid "Remember password until you _logout"
+ msgstr "記憶密碼到登出之前(_L)"
+ 
+-#: ../gtk/gtkmountoperation.c:688
++#: ../gtk/gtkmountoperation.c:691
+ msgid "Remember _forever"
+ msgstr "永遠記住密碼(_F)"
+ 
+-#: ../gtk/gtkmountoperation.c:1077
++#: ../gtk/gtkmountoperation.c:1080
+ #, c-format
+ msgid "Unknown Application (PID %d)"
+ msgstr "不明的應用程式（PID %d）"
+ 
+-#: ../gtk/gtkmountoperation.c:1260
++#: ../gtk/gtkmountoperation.c:1263
+ msgid "Unable to end process"
+ msgstr "無法終止程序"
+ 
+-#: ../gtk/gtkmountoperation.c:1297
++#: ../gtk/gtkmountoperation.c:1300
+ msgid "_End Process"
+ msgstr "終止程序(_E)"
+ 
+@@ -1985,14 +1985,14 @@ msgstr "第 %u 頁"
+ #. Translators: the format here is used to build the string that will be rendered
+ #. * in the number emblem.
+ #.
+-#: ../gtk/gtknumerableicon.c:481
++#: ../gtk/gtknumerableicon.c:482
+ #, c-format
+ msgctxt "Number format"
+ msgid "%d"
+ msgstr "%d"
+ 
+-#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:846
+-#: ../gtk/gtkpapersize.c:886
++#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:848
++#: ../gtk/gtkpapersize.c:888
+ msgid "Not a valid page setup file"
+ msgstr "不是有效的頁面設定檔案"
+ 
+@@ -2051,7 +2051,7 @@ msgstr "向下路徑"
+ msgid "File System Root"
+ msgstr "檔案系統根"
+ 
+-#: ../gtk/gtkprintbackend.c:748
++#: ../gtk/gtkprintbackend.c:750
+ msgid "Authentication"
+ msgstr "驗證"
+ 
+@@ -2117,29 +2117,29 @@ msgctxt "print operation status"
+ msgid "Finished with error"
+ msgstr "已完成但發生錯誤"
+ 
+-#: ../gtk/gtkprintoperation.c:2352
++#: ../gtk/gtkprintoperation.c:2349
+ #, c-format
+ msgid "Preparing %d"
+ msgstr "正在準備 %d"
+ 
+-#: ../gtk/gtkprintoperation.c:2354 ../gtk/gtkprintoperation.c:2984
++#: ../gtk/gtkprintoperation.c:2351 ../gtk/gtkprintoperation.c:2983
+ msgid "Preparing"
+ msgstr "正在準備"
+ 
+-#: ../gtk/gtkprintoperation.c:2357
++#: ../gtk/gtkprintoperation.c:2354
+ #, c-format
+ msgid "Printing %d"
+ msgstr "正在列印 %d"
+ 
+-#: ../gtk/gtkprintoperation.c:3014
++#: ../gtk/gtkprintoperation.c:3013
+ msgid "Error creating print preview"
+ msgstr "建立列印預覽時發生錯誤"
+ 
+-#: ../gtk/gtkprintoperation.c:3017
++#: ../gtk/gtkprintoperation.c:3016
+ msgid "The most probable reason is that a temporary file could not be created."
+ msgstr "最可能的原因是無法建立暫存檔案。"
+ 
+-#: ../gtk/gtkprintoperation-unix.c:302
++#: ../gtk/gtkprintoperation-unix.c:307
+ msgid "Error launching preview"
+ msgstr "執行預覽時發生錯誤"
+ 
+@@ -3306,7 +3306,7 @@ msgstr "第 %2$d 行第 %3$d 字有非預設的開始標記「%1$s」"
+ msgid "Unexpected character data on line %d char %d"
+ msgstr "第 %d 行第 %d 字有非預設的字元資料"
+ 
+-#: ../gtk/gtkuimanager.c:2738
++#: ../gtk/gtkuimanager.c:2694
+ msgid "Empty"
+ msgstr "空的"
+ 
+diff --git a/tests/testappchooser.c b/tests/testappchooser.c
+index 76af238..80e8fb7 100644
+--- a/tests/testappchooser.c
++++ b/tests/testappchooser.c
+@@ -16,6 +16,8 @@
+  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#include "config.h"
++
+ #include <stdlib.h>
+ #include <gtk/gtk.h>
+ 
+diff --git a/tests/testappchooserbutton.c b/tests/testappchooserbutton.c
+index 92fbb1a..1ab768c 100644
+--- a/tests/testappchooserbutton.c
++++ b/tests/testappchooserbutton.c
+@@ -16,8 +16,9 @@
+  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+-#include <stdlib.h>
++#include "config.h"
+ 
++#include <stdlib.h>
+ #include <gtk/gtk.h>
+ 
+ #define CUSTOM_ITEM "custom-item"
diff --git a/extra/gtkglext/PKGBUILD b/extra/gtkglext/PKGBUILD
index 57ad318a2..266007a7c 100644
--- a/extra/gtkglext/PKGBUILD
+++ b/extra/gtkglext/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 168603 2012-10-13 11:47:13Z andyrtr $
-# Maintainer:
+# $Id: PKGBUILD 169936 2012-10-30 22:45:47Z heftig $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=gtkglext
 pkgver=1.2.0
-pkgrel=8
+pkgrel=9
 pkgdesc="opengl extensions for gtk2"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gtkglext.sourceforge.net/"
 license=('LGPL')
-depends=('gtk2' 'glu' 'libxmu')
+depends=('gtk2' 'glu' 'libxmu' 'pangox-compat')
 makedepends=('mesa')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
@@ -31,6 +31,5 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD
index 35096f8a7..ba439dd43 100644
--- a/extra/gtkhtml4/PKGBUILD
+++ b/extra/gtkhtml4/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165225 2012-08-13 18:20:51Z jgc $
+# $Id: PKGBUILD 170809 2012-11-12 02:14:23Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtkhtml4
 _pkgbasename=gtkhtml
-pkgver=4.4.4
+pkgver=4.6.1
 pkgrel=1
 pkgdesc="A lightweight HTML renderer/editor widget for GTK3"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool')
 url="http://www.gnome.org"
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('737536d03c05d70e30f9b7aa45b4b810f7255dad2a9f0d4e16936a2e4852c7c9')
+sha256sums=('36670a268f3fd437ddb8c4e7f127d6fb0c09a6fe23a431bede0fc3213c75db98')
 
 build() {
     cd "$_pkgbasename-$pkgver"
diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD
index b8164c443..f50942e08 100644
--- a/extra/gtkmm3/PKGBUILD
+++ b/extra/gtkmm3/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 165858 2012-09-01 17:47:38Z ibiru $
+# $Id: PKGBUILD 169938 2012-10-30 22:45:55Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=gtkmm3
 _pkgbasename=gtkmm
 pkgname=('gtkmm3' 'gtkmm3-docs')
-pkgver=3.4.1
-pkgrel=1.1
+pkgver=3.6.0
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt')
 license=('LGPL')
 options=('!libtool' '!emptydirs')
 url="http://www.gtkmm.org/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('af218681c8ba7b97cafa67419d43be8d1151a541c1aea2a20d76971ef487bdcf')
+sha256sums=('888154d5c8acec083aa15e8dab68d977a393ade7257f0630becfa9a223fa2359')
 
 build() {
   cd "$_pkgbasename-$pkgver"
diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD
index 33cb31baf..6b14b32b4 100644
--- a/extra/gtkpod/PKGBUILD
+++ b/extra/gtkpod/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164515 2012-08-01 13:53:49Z jgc $
+# $Id: PKGBUILD 170131 2012-11-03 12:34:41Z ibiru $
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=gtkpod
 pkgver=2.1.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A platform independent GUI for Apple's iPod using GTK3"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gtkpod.sourceforge.net"
@@ -18,11 +18,14 @@ optdepends=('libmp4v2: MP4/h264 support'
             'faad2: m4a conversion support')
 install=gtkpod.install
 options=('!libtool')
-source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz")
-md5sums=('88fef3f947cbb7ae6b714080733a3b6b')
+source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz"
+        "gtkpod-2.1.2-anjuta.patch")
+md5sums=('88fef3f947cbb7ae6b714080733a3b6b'
+         '0a5f4ce0c9ef3d4d8db57290df43db27')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i "${srcdir}/gtkpod-2.1.2-anjuta.patch"
   sed -i 's#python#python2#' scripts/sync-palm-jppy.py
   ./configure --prefix=/usr
   make
diff --git a/extra/gtkpod/gtkpod-2.1.2-anjuta.patch b/extra/gtkpod/gtkpod-2.1.2-anjuta.patch
new file mode 100644
index 000000000..08c64f71b
--- /dev/null
+++ b/extra/gtkpod/gtkpod-2.1.2-anjuta.patch
@@ -0,0 +1,11 @@
+--- src/anjuta-app.c~	2012-06-01 03:14:23.000000000 -0500
++++ src/anjuta-app.c	2012-07-25 08:15:37.289630966 -0500
+@@ -501,7 +501,7 @@
+     g_list_free(plugins_dirs);
+ 
+     /* Preferences */
+-    app->preferences = anjuta_preferences_new(app->plugin_manager);
++    app->preferences = anjuta_preferences_new(app->plugin_manager, PREF_SCHEMA);
+     g_object_add_weak_pointer(G_OBJECT (app->preferences), (gpointer) &app->preferences);
+ 
+     g_signal_connect(app->settings, "changed::" GDL_STYLE, G_CALLBACK(on_gdl_style_changed), app);
diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD
index 20a09d5cf..d6c338e45 100644
--- a/extra/gtksourceview3/PKGBUILD
+++ b/extra/gtksourceview3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 159069 2012-05-15 11:37:21Z heftig $
+# $Id: PKGBUILD 170209 2012-11-05 11:49:55Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtksourceview3
 _pkgbasename=gtksourceview
-pkgver=3.4.2
+pkgver=3.6.1
 pkgrel=1
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection' 'glade')
 options=('!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('5a5712591b2b6487818ac4aadd965fc8397af23d8fd7c5bdd1460c6326a8f4ce')
+sha256sums=('a9d31df02acc6e9a9547b5ebaee19d1dc4c87b216eb561ee19da69bd1bb1bd0d')
 
 build() {
   cd "$_pkgbasename-$pkgver"
diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD
index 1026aeb76..56aa3fa4b 100644
--- a/extra/gucharmap/PKGBUILD
+++ b/extra/gucharmap/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 156882 2012-04-23 09:08:14Z ibiru $
+# $Id: PKGBUILD 170906 2012-11-12 22:40:18Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gucharmap
-pkgver=3.4.1.1
+pkgver=3.6.1
 pkgrel=1
 pkgdesc="Gnome Unicode Charmap"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org"
 depends=('dconf' 'gtk3' 'hicolor-icon-theme')
-makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
+makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl')
 options=('!libtool' '!emptydirs')
 install=gucharmap.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('52ea80e9e5f01232801dd24f7eb5c70eb36e7a85e429ad9113e8b71234d94c62')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('c3aad2990010ab66225b748e6ac5402cad9f21e908cddf728e57d755c54cc6b2')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD
index 91109b346..e9be3a918 100644
--- a/extra/gupnp-av/PKGBUILD
+++ b/extra/gupnp-av/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157080 2012-04-23 13:11:44Z heftig $
+# $Id: PKGBUILD 170152 2012-11-03 17:56:09Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Thijs Vermeir <thijsvermeir@gmail.com>
 # Contributor: Denis Zawada <deno@rootnode.net>
 
 pkgname=gupnp-av
-pkgver=0.10.2
+pkgver=0.10.3
 pkgrel=1
 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('gupnp')
 makedepends=('gobject-introspection' 'gtk-doc')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('4863c9bcbfa2e9fcb215d43c8d1e4090fbd078f8ae65e45a3314e7f6d59a8cbf')
+sha256sums=('d0dbb727d87bc9f2dc834455d14a30700b16b41a57e9dcde2e822b378ca8f1e2')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gupnp-igd/PKGBUILD b/extra/gupnp-igd/PKGBUILD
index 8e08e3a17..3d936b173 100644
--- a/extra/gupnp-igd/PKGBUILD
+++ b/extra/gupnp-igd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gupnp-igd
 pkgver=0.2.1
 pkgrel=3
 pkgdesc="A library to handle UPnP IGD port mapping"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gupnp.org"
 license=('LGPL')
 depends=('gupnp' 'python2-gobject2')
diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD
index 6040fee81..2d9c0ee6f 100644
--- a/extra/gupnp/PKGBUILD
+++ b/extra/gupnp/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 157079 2012-04-23 13:11:06Z heftig $
+# $Id: PKGBUILD 169941 2012-10-30 22:46:05Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gupnp
-pkgver=0.18.2
+pkgver=0.18.4
 pkgrel=1
 pkgdesc="An object-oriented UPNP framework"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gupnp.org/"
 license=('LGPL')
-depends=('gssdp')
+depends=('gssdp' 'util-linux')
 makedepends=('gobject-introspection' 'gtk-doc')
 optdepends=('python2: gupnp-binding-tool')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('3715fa56c1f351132cffe7d69127da1daada7ff50481838c6dbfd17d7182743d')
+sha256sums=('6b437d5711b212292c6080626b97480268310da636a6cf937ad6119291af78a1')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index 43dd19ebc..2c5065393 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 164365 2012-07-31 19:42:58Z eric $
+# $Id: PKGBUILD 170856 2012-11-12 20:04:56Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gvfs
 pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.12.3
-pkgrel=3
+pkgver=1.14.2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2')
+makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3')
 url="http://www.gnome.org"
 options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)   
-sha256sums=('38f69ec92083f86a51e7814e98d2861151f16dfb3abe4b3b39488408e12fd9c2')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('c3bbdac4bc89de82a2ba373799da80d24fb6a038a9893d9b54e2c9429c878fbc')
 
 build() {
   cd "$pkgbase-$pkgver"
@@ -24,12 +24,13 @@ build() {
 
 package_gvfs() {
   pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
-  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2')
+  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2' 'libsecret')
   optdepends=('gvfs-afc: AFC (mobile devices) support'
               'gvfs-smb: SMB/CIFS (Windows client) support'
               'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
               'gvfs-obexftp: ObexFTP (bluetooth) support'
-              'gvfs-afp: Apple Filing Protocol (AFP) support')
+              'gvfs-afp: Apple Filing Protocol (AFP) support'
+              'gtk3: Recent files support')
   install=gvfs.install
 
   cd "$pkgbase-$pkgver"
@@ -47,7 +48,7 @@ package_gvfs() {
 
 package_gvfs-smb() {
   pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
-  depends=("gvfs=$pkgver" 'smbclient' 'libgnome-keyring')
+  depends=("gvfs=$pkgver" 'smbclient')
   install=gvfs-smb.install
 
   cd "$pkgbase-$pkgver/daemon"
diff --git a/extra/gvfs/do-not-emit-connected-added-signals-at-object-creation.patch b/extra/gvfs/do-not-emit-connected-added-signals-at-object-creation.patch
new file mode 100644
index 000000000..9369c87bd
--- /dev/null
+++ b/extra/gvfs/do-not-emit-connected-added-signals-at-object-creation.patch
@@ -0,0 +1,39 @@
+From ca7743a63721c3dd1c166006539e356412466dcc Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc@gnome.org>
+Date: Sun, 23 Sep 2012 18:51:32 +0000
+Subject: proxy: don't emit connected/added signals at object creation
+
+It's unnecessary to emit those signals when the object is created, and
+it can cause weird side-effects if applications e.g. play a sound on
+signal emission.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=684677
+---
+diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c
+index 1af6c34..37fc788 100644
+--- a/monitor/proxy/gproxyvolumemonitor.c
++++ b/monitor/proxy/gproxyvolumemonitor.c
+@@ -955,6 +955,7 @@ g_proxy_volume_monitor_constructor (GType                  type,
+   GObjectClass *parent_class;
+   GError *error;
+   const char *dbus_name;
++  gchar *name_owner;
+ 
+   G_LOCK (proxy_vm);
+ 
+@@ -1018,7 +1019,12 @@ g_proxy_volume_monitor_constructor (GType                  type,
+   /* listen to when the owner of the service appears/disappears */
+   g_signal_connect (monitor->proxy, "notify::g-name-owner", G_CALLBACK (name_owner_changed), monitor);
+   /* initially seed drives/volumes/mounts if we have an owner */
+-  name_owner_changed (G_OBJECT (monitor->proxy), NULL, monitor);
++  name_owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (monitor->proxy));
++  if (name_owner != NULL)
++    {
++      seed_monitor (monitor);
++      g_free (name_owner);
++    }
+ 
+   g_hash_table_insert (the_volume_monitors, (gpointer) type, object);
+ 
+--
+cgit v0.9.0.2
diff --git a/extra/gvfs/gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch b/extra/gvfs/gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch
new file mode 100644
index 000000000..2d3bcb6c4
--- /dev/null
+++ b/extra/gvfs/gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch
@@ -0,0 +1,24 @@
+From 4a0915c25815647c165e7ca6047f3da84ece04ea Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Mon, 22 Oct 2012 13:07:04 +0000
+Subject: gdaemonmount: Check for a NULL GMountOperation when unmounting
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686637
+---
+diff --git a/client/gdaemonmount.c b/client/gdaemonmount.c
+index 53f22b5..ca77648 100644
+--- a/client/gdaemonmount.c
++++ b/client/gdaemonmount.c
+@@ -330,8 +330,9 @@ g_daemon_mount_unmount_with_operation (GMount *mount,
+   data = g_new0 (AsyncProxyCreate, 1);
+   data->mount = g_object_ref (mount);
+   data->mount_info = daemon_mount->mount_info;
+-  data->mount_operation = g_object_ref (mount_operation);
+   data->flags = flags;
++  if (mount_operation)
++    data->mount_operation = g_object_ref (mount_operation);
+   if (cancellable)
+     data->cancellable = g_object_ref (cancellable);
+ 
+--
+cgit v0.9.0.2
diff --git a/extra/gvfs/proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch b/extra/gvfs/proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch
new file mode 100644
index 000000000..e56a46ac6
--- /dev/null
+++ b/extra/gvfs/proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch
@@ -0,0 +1,25 @@
+From 5265dff7b56d892917640367414cf5d3f5e7ddb7 Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Thu, 01 Nov 2012 13:37:37 +0000
+Subject: proxy volume monitor: Don't disable exit_on_close on session bus
+
+We're on shared session bus, let's exit when connection closes
+(usually tied to running desktop session).
+
+https://bugzilla.gnome.org/show_bug.cgi?id=687074
+(cherry picked from commit f70800d655ca6b222625cd72af820f17404bdb4d)
+---
+diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c
+index 1af6c34..e0d17b7 100644
+--- a/monitor/proxy/gproxyvolumemonitor.c
++++ b/monitor/proxy/gproxyvolumemonitor.c
+@@ -1418,7 +1418,6 @@ g_proxy_volume_monitor_setup_session_bus_connection (void)
+       g_error_free (error);
+       goto out;
+     }
+-  g_dbus_connection_set_exit_on_close (the_session_bus, FALSE);
+ 
+   the_volume_monitors = g_hash_table_new (g_direct_hash, g_direct_equal);
+ 
+--
+cgit v0.9.0.2
diff --git a/extra/gvfs/proxy-volume-monitor-Dont-force-close-the-session-bus.patch b/extra/gvfs/proxy-volume-monitor-Dont-force-close-the-session-bus.patch
new file mode 100644
index 000000000..1a09ef7e6
--- /dev/null
+++ b/extra/gvfs/proxy-volume-monitor-Dont-force-close-the-session-bus.patch
@@ -0,0 +1,23 @@
+From 5dfdaf9a18971bf5504a0d3fe00f747a853ee800 Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Thu, 01 Nov 2012 13:46:10 +0000
+Subject: proxy volume monitor: Don't force-close the session bus
+
+Simple fix to prevent bus closing on GIO module unload.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=687074
+---
+diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c
+index e0d17b7..df99935 100644
+--- a/monitor/proxy/gproxyvolumemonitor.c
++++ b/monitor/proxy/gproxyvolumemonitor.c
+@@ -1435,7 +1435,6 @@ g_proxy_volume_monitor_teardown_session_bus_connection (void)
+   G_LOCK (proxy_vm);
+   if (the_session_bus != NULL)
+     {
+-      g_dbus_connection_close_sync (the_session_bus, NULL, NULL);
+       g_object_unref (the_session_bus);
+       the_session_bus = NULL;
+ 
+--
+cgit v0.9.0.2
diff --git a/extra/gweled/PKGBUILD b/extra/gweled/PKGBUILD
index b5a7a5971..2769eb8f7 100644
--- a/extra/gweled/PKGBUILD
+++ b/extra/gweled/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 130072 2011-07-01 21:54:59Z eric $
+# $Id: PKGBUILD 170548 2012-11-08 15:28:32Z heftig $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gweled
 pkgver=0.9.1
-pkgrel=1.1
+pkgrel=2
 pkgdesc="A puzzle game similar to Bejeweled (aka Diamond Mine)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -12,7 +12,6 @@ depends=('gtk2' 'librsvg' 'libmikmod' 'hicolor-icon-theme')
 makedepends=('intltool')
 install=gweled.install
 source=(http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('746ac14523c968e78140c2f0501fd7cf')
 sha1sums=('ff4a59935c9e1eb4a202e723baabaab39f526714')
 
 build() {
diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD
new file mode 100644
index 000000000..46fad3772
--- /dev/null
+++ b/extra/harfbuzz/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 172099 2012-11-28 10:31:24Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=harfbuzz
+pkgver=0.9.7
+pkgrel=1
+pkgdesc="OpenType text shaping engine."
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
+license=('MIT')
+depends=('icu' 'glib2' 'freetype2' 'graphite')
+makedepends=('icu' 'cairo' 'glib2' 'freetype2')
+optdepends=('cairo: hb-view program')
+options=(!libtool)
+source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('bd2999859f8828461fedae23e4af52d926ac32a73245f03ae2d2065205e9cf25')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/harfbuzz/COPYING"
+}
diff --git a/extra/hefur/Check-that-added-torrents-from-the-disk-are-still-on.patch b/extra/hefur/Check-that-added-torrents-from-the-disk-are-still-on.patch
new file mode 100644
index 000000000..8ad67ee74
--- /dev/null
+++ b/extra/hefur/Check-that-added-torrents-from-the-disk-are-still-on.patch
@@ -0,0 +1,93 @@
+From dbd00cfc3805b6f1ff794f7de0b52b1a7893401f Mon Sep 17 00:00:00 2001
+From: Alexandre Bique <bique.alexandre@gmail.com>
+Date: Thu, 15 Nov 2012 20:43:41 +0100
+Subject: [PATCH 07/12] Check that added torrents from the disk are still on
+ the disk.
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ hefur/fs-tree-white-list.cc | 20 ++++++++++++++++++++
+ hefur/fs-tree-white-list.hh |  1 +
+ hefur/torrent-db.hh         |  4 +++-
+ 3 files changed, 24 insertions(+), 1 deletion(-)
+
+diff --git a/hefur/fs-tree-white-list.cc b/hefur/fs-tree-white-list.cc
+index f493e95..61714d0 100644
+--- a/hefur/fs-tree-white-list.cc
++++ b/hefur/fs-tree-white-list.cc
+@@ -54,10 +54,30 @@ namespace hefur
+   }
+ 
+   void
++  FsTreeWhiteList::check()
++  {
++    std::vector<m::StringRef> keys;
++    auto db = Hefur::instance().torrentDb();
++    m::SharedMutex::Locker locker(db->torrents_lock_);
++    db->torrents_.foreach([this, &keys] (Torrent::Ptr torrent) {
++        if (::strncmp(torrent->path().c_str(), root_.c_str(), root_.size()))
++          return;
++
++        struct ::stat st;
++        if (::stat(torrent->path().c_str(), &st) && errno == ENOENT)
++          keys.push_back(torrent->key());
++      });
++
++    for (auto it = keys.begin(); it != keys.end(); ++it)
++      db->torrents_.erase(*it);
++  }
++
++  void
+   FsTreeWhiteList::loopScan()
+   {
+     do {
+       scan();
++      check();
+     } while (!stop_.timedWait(m::time() + rescan_interval_));
+   }
+ }
+diff --git a/hefur/fs-tree-white-list.hh b/hefur/fs-tree-white-list.hh
+index c32bcd4..643fb78 100644
+--- a/hefur/fs-tree-white-list.hh
++++ b/hefur/fs-tree-white-list.hh
+@@ -30,6 +30,7 @@ namespace hefur
+      * When a .torrent is found, call TorrentDb::addTorrent().
+      */
+     void scan();
++    void check();
+ 
+   private:
+     /**
+diff --git a/hefur/torrent-db.hh b/hefur/torrent-db.hh
+index a1e5d38..e25ed33 100644
+--- a/hefur/torrent-db.hh
++++ b/hefur/torrent-db.hh
+@@ -17,6 +17,7 @@ namespace hefur
+ {
+   class StatHandler;
+   class PeersHandler;
++  class FsTreeWhiteList;
+ 
+   /**
+    * This is the "in memory" torrent database.
+@@ -63,6 +64,7 @@ namespace hefur
+     friend class StatHandler;
+     friend class PeersHandler;
+     friend class FileHandler;
++    friend class FsTreeWhiteList;
+ 
+     /** helper to use torrent->key() as a key for the trie */
+     static inline m::StringRef torrentKey(Torrent::Ptr torrent) {
+@@ -77,7 +79,7 @@ namespace hefur
+     m::Future<bool> cleanup_stop_;
+     m::Thread       cleanup_thread_;
+     m::SharedMutex  torrents_lock_;
+-    torrents_type        torrents_;
++    torrents_type   torrents_;
+   };
+ }
+ 
+-- 
+1.8.0.1
+
diff --git a/extra/hefur/PKGBUILD b/extra/hefur/PKGBUILD
new file mode 100644
index 000000000..3a17f4b1f
--- /dev/null
+++ b/extra/hefur/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 172176 2012-11-30 21:59:44Z thomas $
+# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+# Contributor: Alexandre Bique <bique.alexandre@gmail.com>
+
+pkgname=hefur
+pkgver=0.3
+pkgrel=4
+pkgdesc='A standalone and lightweight BitTorrent tracker'
+arch=('i686' 'x86_64' 'mips64el')
+url='http://github.com/abique/hefur'
+license=('MIT')
+makedepends=('cmake')
+depends=('gnutls' 'xz')
+source=("https://github.com/downloads/abique/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+        'hefurd.service'
+        'Check-that-added-torrents-from-the-disk-are-still-on.patch'
+        'Replace-by-amp-in-stat.html.patch')
+md5sums=('446ca4e659ce0ca3c8f32b0990ee7f5f'
+         '731d5be04d74a52541450b5127abeff3'
+         'f912a75467a30251403923c0a7abe049'
+         'f11af93e9a8074c8ba73f7a47e978362')
+
+build() {
+	cd ${srcdir}/${pkgname}-${pkgver}
+	patch -p1 -i ${srcdir}/Check-that-added-torrents-from-the-disk-are-still-on.patch
+	patch -p1 -i ${srcdir}/Replace-by-amp-in-stat.html.patch
+	mkdir build
+	cd build
+	cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+	make
+}
+
+package() {
+	cd ${srcdir}/${pkgname}-${pkgver}/build
+	DESTDIR=${pkgdir} make install
+	install -D -m644 ${srcdir}/hefurd.service ${pkgdir}/usr/lib/systemd/system/hefurd.service
+	install -D -m644 ${srcdir}/${pkgname}-${pkgver}/LICENSE ${pkgdir}/usr/share/licenses/hefur/LICENSE
+	install -d -m755 ${pkgdir}/var/lib/hefurd
+}
diff --git a/extra/hefur/Replace-by-amp-in-stat.html.patch b/extra/hefur/Replace-by-amp-in-stat.html.patch
new file mode 100644
index 000000000..a11406a2f
--- /dev/null
+++ b/extra/hefur/Replace-by-amp-in-stat.html.patch
@@ -0,0 +1,27 @@
+From 6986df22d293b7a149f51d4d8ba4a995645a4560 Mon Sep 17 00:00:00 2001
+From: Alexandre Bique <bique.alexandre@gmail.com>
+Date: Sun, 4 Nov 2012 14:08:47 +0100
+Subject: [PATCH 03/12] Replace & by &amp; in stat.html.
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ www/tpl/stat.html | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/www/tpl/stat.html b/www/tpl/stat.html
+index 3234679..1e3b148 100644
+--- a/www/tpl/stat.html
++++ b/www/tpl/stat.html
+@@ -21,7 +21,7 @@
+     {{*torrents}}
+     <tr>
+       <td>
+-        <a href="magnet:?xt=urn:btih:{{info_sha1|b16}}&dn={{name|u}}&tr={{tracker_udp|u}}&tr={{tracker_http|u}}"
++        <a href="magnet:?xt=urn:btih:{{info_sha1|b16}}&amp;dn={{name|u}}&amp;tr={{tracker_udp|u}}&amp;tr={{tracker_http|u}}"
+            title="Magnet link">
+           <img src="/img/magnet-icon.gif"/>
+         </a>
+-- 
+1.8.0.1
+
diff --git a/extra/hefur/hefurd.service b/extra/hefur/hefurd.service
new file mode 100644
index 000000000..a5766225f
--- /dev/null
+++ b/extra/hefur/hefurd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=A standalone and lightweight BitTorrent tracker
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/hefurd -torrent-dir /var/lib/hefurd
+User=nobody
+Group=nobody
+CPUSchedulingPolicy=batch
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/hspell/PKGBUILD b/extra/hspell/PKGBUILD
index a7006ade0..5477adb4b 100644
--- a/extra/hspell/PKGBUILD
+++ b/extra/hspell/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=hspell
 pkgname=('hspell' 'hunspell-he')
 pkgver=1.2
-pkgrel=1
+pkgrel=1.1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.ivrix.org.il/projects/spell-checker/"
diff --git a/extra/htop/PKGBUILD b/extra/htop/PKGBUILD
index 13201a46e..4266349dc 100644
--- a/extra/htop/PKGBUILD
+++ b/extra/htop/PKGBUILD
@@ -1,38 +1,39 @@
-# $Id: PKGBUILD 150717 2012-02-21 01:27:23Z angvp $
+# $Id: PKGBUILD 170397 2012-11-07 01:25:17Z dreisner $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=htop
-pkgver=1.0.1
-pkgrel=1.1
+pkgver=1.0.2
+pkgrel=1
 pkgdesc="Interactive process viewer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://htop.sourceforge.net/"
 license=('GPL')
 depends=('ncurses')
 makedepends=('python2')
-optdepends=('lsof' 'strace')
+optdepends=('lsof: show files opened by a process'
+            'strace: attach to a running process')
 options=('!emptydirs')
-changelog=ChangeLog
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d3b80d905a6bff03f13896870787f901')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('0d01cca8df3349c74569cefebbd9919e')
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
 
-	sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c configure 
-	sed -i 's|python|python2|' scripts/MakeHeader.py
+  sed -i 's|ncursesw/curses.h|curses.h|' RichString.[ch] configure
+  sed -i 's|python|python2|' scripts/MakeHeader.py
 
-	./configure --prefix=/usr \
+  ./configure \
+      --prefix=/usr \
       --enable-unicode \
       --enable-openvz \
-	  --enable-vserver \
+      --enable-vserver \
       --enable-cgroup
-	make 
+
+  make
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install 
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 }
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index 4dfec6da9..f8f3b55a9 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 168523 2012-10-13 06:26:15Z allan $
+# $Id: PKGBUILD 169748 2012-10-27 23:41:52Z eric $
 # Maintainer: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Dominik Ryba <domryba@post.pl>
 
 pkgname=hugin
 pkgver=2011.4.0
-pkgrel=6
+pkgrel=7
 pkgdesc="A frontend to the panorama-tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hugin.sourceforge.net/"
 license=('GPL')
 depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c'
          'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool')
-makedepends=('zip' 'cmake' 'boost' 'tclap')
+makedepends=('zip' 'cmake' 'boost' 'tclap' 'mesa')
 install=hugin.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         gcc47.patch)
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD
index 941cececf..18b609e4e 100644
--- a/extra/hwloc/PKGBUILD
+++ b/extra/hwloc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 167416 2012-10-02 00:13:40Z stephane $
+# $Id: PKGBUILD 170363 2012-11-06 14:16:10Z stephane $
 # Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Sylvain HENRY <hsyl20@yahoo.fr>
 # Contributor: Hervé YVIQUEL <elldekaa@gmail.com>
 
 pkgname=hwloc
-pkgver=1.5
+pkgver=1.5.1
 pkgrel=1
 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('sh' 'pciutils' 'cairo' 'libxml2')
 makedepends=('pkg-config')
 options=('!libtool' '!docs')
 source=(http://www.open-mpi.org/software/hwloc/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('b2e60bd40cfc6ca79dde68b19a83e8a4719d6b14')
+sha1sums=('5ce00444d7ffc261ff7877ce685a920fb38a771a')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD
new file mode 100644
index 000000000..0f0898843
--- /dev/null
+++ b/extra/ibus/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 170696 2012-11-09 20:17:29Z eric $
+# Contributor: Rainy <rainylau(at)gmail(dot)com>
+# Contributor: Lee.MaRS <leemars at gmail dot com>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer: Brad Fanella <bradfanella@archlinux.us>
+
+pkgname=ibus
+pkgver=1.4.99.20121109
+pkgrel=1
+pkgdesc="Next Generation Input Bus for Linux"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://ibus.googlecode.com"
+license=('LGPL')
+depends=('hicolor-icon-theme' 'gtk2' 'gtk3' 'python2-xdg' 'python2-gobject')
+makedepends=('gobject-introspection' 'dconf' 'iso-codes' 'intltool')
+options=('!libtool')
+install=ibus.install
+source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('e534d836117b968b8d0eab2eea5a1fac09ea85fb')
+
+build() {
+  cd ${pkgname}-${pkgver}
+  export PYTHON=python2
+  ./configure \
+    --prefix=/usr \
+    --libexecdir=/usr/lib/ibus \
+    --sysconfdir=/etc \
+    --disable-gconf \
+    --enable-dconf \
+    --disable-memconf \
+    --enable-ui \
+    --enable-python-library
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/ibus/ibus.install b/extra/ibus/ibus.install
new file mode 100644
index 000000000..e4e446693
--- /dev/null
+++ b/extra/ibus/ibus.install
@@ -0,0 +1,17 @@
+post_install() {
+    gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+    gtk-query-immodules-3.0 --update-cache 
+
+    gtk-update-icon-cache -fq -t usr/share/icons/hicolor
+
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_remove() {
+    gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+    gtk-query-immodules-3.0 --update-cache 
+
+    gtk-update-icon-cache -fq -t usr/share/icons/hicolor
+
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+}
diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD
index 39bd6c1cb..756c16915 100644
--- a/extra/icedtea-web-java7/PKGBUILD
+++ b/extra/icedtea-web-java7/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=icedtea-web-java7
 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
-pkgver=1.3
+pkgver=1.3.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
@@ -11,7 +11,7 @@ license=('GPL2')
 makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany')
 noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot
 source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
-sha256sums=('d46ec10700732cea103da2aae64ff01e717cb1281b83e1797ce48cc53280b49f')
+sha256sums=('20c7fd1eef6c79cbc6478bb01236a3eb2f0af6184eaed24baca59a3c37eafb56')
 
 _javaver=7
 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
@@ -45,6 +45,7 @@ package_icedtea-web-java7() {
 
   pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
   depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils')
+  provides=('java-web-start=7')
   install=${pkgname}.install
 
   cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD
index 728c30756..a4939af38 100644
--- a/extra/icedtea-web/PKGBUILD
+++ b/extra/icedtea-web/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 166335 2012-09-06 15:46:37Z andyrtr $
+# $Id: PKGBUILD 170458 2012-11-07 20:07:26Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=icedtea-web
 pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.3
+pkgver=1.3.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
@@ -11,7 +11,7 @@ license=('GPL2')
 makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany')
 noextract=$pkgname-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot
 source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz)
-sha256sums=('d46ec10700732cea103da2aae64ff01e717cb1281b83e1797ce48cc53280b49f')
+sha256sums=('20c7fd1eef6c79cbc6478bb01236a3eb2f0af6184eaed24baca59a3c37eafb56')
 
 _javaver=6
 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
@@ -44,6 +44,7 @@ package_icedtea-web() {
 
   pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
   depends=('openjdk6' 'gtk2' 'desktop-file-utils')
+  provides=('java-web-start=6')
   install=$pkgname.install
 
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD
index 4ea33a20d..af6d7e4fe 100644
--- a/extra/icu/PKGBUILD
+++ b/extra/icu/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163969 2012-07-23 03:03:14Z allan $
+# $Id: PKGBUILD 171516 2012-11-18 10:27:49Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Art Gramlich <art@gramlich-net.com>
 
 pkgname=icu
-pkgver=49.1.2
+pkgver=50.1
 pkgrel=2
 pkgdesc="International Components for Unicode library"
 arch=(i686 x86_64 'mips64el')
@@ -12,20 +12,31 @@ license=('custom:"icu"')
 depends=('gcc-libs>=4.7.1-5' 'sh')
 source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz
 	    http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz
-	    icu.8198.revert.icu5431.patch)
-md5sums=('bbc609fe5237202d7abf016141012a45'
-         'ebd5470fc969c75e52baf4af94a9ee82')
+	    icu.8198.revert.icu5431.patch changeset_32780.diff)
+md5sums=('cf7bf9e56aa6c2057a8b6f464046483e'
+         'ebd5470fc969c75e52baf4af94a9ee82'
+         '58f4b655e40dddc8e316600019b491b2')
 
 build() {
   cd ${srcdir}/icu/source
+
   # fix Malayalam encoding https://bugzilla.redhat.com/show_bug.cgi?id=654200
   patch -Rp3 -i ${srcdir}/icu.8198.revert.icu5431.patch
+
+  # fix building clients without c++11 http://bugs.icu-project.org/trac/changeset/32780
+  patch -Np4 -i ${srcdir}/changeset_32780.diff
+
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--mandir=/usr/share/man
   make
 }
 
+check() {
+  cd "$srcdir/icu/source"
+  make -k check # passes all
+}
+
 package() {
   cd ${srcdir}/icu/source
   make -j1 DESTDIR=${pkgdir} install
diff --git a/extra/icu/changeset_32780.diff b/extra/icu/changeset_32780.diff
new file mode 100644
index 000000000..a06c3d2ab
--- /dev/null
+++ b/extra/icu/changeset_32780.diff
@@ -0,0 +1,67 @@
+Index: /icu/trunk/source/test/intltest/strtest.cpp

+===================================================================

+--- /icu/trunk/source/test/intltest/strtest.cpp	(revision 32779)

++++ /icu/trunk/source/test/intltest/strtest.cpp	(revision 32780)

+@@ -1,5 +1,5 @@

+ /********************************************************************

+  * COPYRIGHT: 

+- * Copyright (c) 1997-2011, International Business Machines Corporation and

++ * Copyright (c) 1997-2012, International Business Machines Corporation and

+  * others. All Rights Reserved.

+  ********************************************************************/

+@@ -95,5 +95,5 @@

+ StringTest::Test_U_STRING() {

+     U_STRING_INIT(ustringVar, "aZ0 -", 5);

+-    if( sizeof(ustringVar)/sizeof(*ustringVar)!=6 ||

++    if( u_strlen(ustringVar)!=5 ||

+         ustringVar[0]!=0x61 ||

+         ustringVar[1]!=0x5a ||

+Index: /icu/trunk/source/common/unicode/ustring.h

+===================================================================

+--- /icu/trunk/source/common/unicode/ustring.h	(revision 32779)

++++ /icu/trunk/source/common/unicode/ustring.h	(revision 32780)

+@@ -940,5 +940,5 @@

+  */

+ #if defined(U_DECLARE_UTF16)

+-#   define U_STRING_DECL(var, cs, length) static const UChar var[(length)+1]=U_DECLARE_UTF16(cs)

++#   define U_STRING_DECL(var, cs, length) static const UChar *var=(const UChar *)U_DECLARE_UTF16(cs)

+     /**@stable ICU 2.0 */

+ #   define U_STRING_INIT(var, cs, length)

+Index: /icu/trunk/source/common/unicode/platform.h

+===================================================================

+--- /icu/trunk/source/common/unicode/platform.h	(revision 32779)

++++ /icu/trunk/source/common/unicode/platform.h	(revision 32780)

+@@ -665,7 +665,7 @@

+      * gcc 4.4 defines the __CHAR16_TYPE__ macro to a usable type but

+      * does not support u"abc" string literals.

+-     * C++11 requires support for UTF-16 literals

++     * C++11 and C11 require support for UTF-16 literals

+      */

+-#   if (defined(__cplusplus) && __cplusplus >= 201103L)

++#   if (defined(__cplusplus) && __cplusplus >= 201103L) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L)

+ #       define U_HAVE_CHAR16_T 1

+ #   else

+Index: /icu/trunk/source/common/unicode/umachine.h

+===================================================================

+--- /icu/trunk/source/common/unicode/umachine.h	(revision 32779)

++++ /icu/trunk/source/common/unicode/umachine.h	(revision 32780)

+@@ -257,5 +257,5 @@

+ /**

+  * \var UChar

+- * Define UChar to be char16_t, if available,

++ * Define UChar to be UCHAR_TYPE, if that is #defined (for example, to char16_t),

+  * or wchar_t if that is 16 bits wide; always assumed to be unsigned.

+  * If neither is available, then define UChar to be uint16_t.

+@@ -267,8 +267,8 @@

+  * @stable ICU 4.4

+  */

+-

+-/* Define UChar to be compatible with char16_t or wchar_t if possible. */

+-#if U_HAVE_CHAR16_T

+-    typedef char16_t UChar;

++#if defined(UCHAR_TYPE)

++    typedef UCHAR_TYPE UChar;

++/* Not #elif U_HAVE_CHAR16_T -- because that is type-incompatible with pre-C++11 callers

++    typedef char16_t UChar;  */

+ #elif U_SIZEOF_WCHAR_T==2

+     typedef wchar_t UChar;

diff --git a/extra/ilmbase/PKGBUILD b/extra/ilmbase/PKGBUILD
index b4fb11cd2..15d8c2f54 100644
--- a/extra/ilmbase/PKGBUILD
+++ b/extra/ilmbase/PKGBUILD
@@ -2,34 +2,34 @@
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=ilmbase
-pkgver=1.0.2
-pkgrel=1.1
+pkgver=1.0.3
+pkgrel=1
 depends=('gcc-libs')
 pkgdesc="Base libraries from ILM for OpenEXR"
 arch=(i686 x86_64 mips64el)
+url="http://www.openexr.com"
 license=('custom')
 options=('!libtool')
-source=(http://savannah.nongnu.org/download/openexr/$pkgname-$pkgver.tar.gz
-        tests-compile-fixes.patch)
-url="http://www.openexr.com"
-md5sums=('26c133ee8ca48e1196fbfb3ffe292ab4'
-         '2687ab9ac01b417ee5cf8c0174b72e43')
+source=(https://github.com/downloads/openexr/openexr/$pkgname-$pkgver.tar.gz 
+        ilmbase-IexMath.patch)
+md5sums=('d99962ec7e2bfac0647aaabf6b91d5de'
+         '9c8efaf15f60bccf79749ec879657962')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
-  patch -Np1 -i ${srcdir}/tests-compile-fixes.patch
+  cd "${srcdir}/$pkgname-$pkgver"
+  patch -p0 -i "${srcdir}/ilmbase-IexMath.patch"
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}/$pkgname-$pkgver"
   # one of the tests fails randomly for an unknown reason
   make check || true
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
-  install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+  cd "${srcdir}/$pkgname-$pkgver"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
diff --git a/extra/ilmbase/ilmbase-IexMath.patch b/extra/ilmbase/ilmbase-IexMath.patch
new file mode 100644
index 000000000..546034966
--- /dev/null
+++ b/extra/ilmbase/ilmbase-IexMath.patch
@@ -0,0 +1,12 @@
+--- IexMath/IexMathFpu.cpp.orig	2012-07-26 20:51:55.000000000 +0200
++++ IexMath/IexMathFpu.cpp	2012-10-04 15:30:47.000000000 +0200
+@@ -27,8 +27,7 @@
+ #endif
+ 
+ 
+-#ifdef HAVE_UCONTEXT_H
+-
++#if defined(HAVE_UCONTEXT_H) && (defined(x86_64) || defined(i386_))
+ 
+ #include <ucontext.h>
+ #include <signal.h>
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 745801964..0dcd27398 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 168520 2012-10-13 05:48:33Z eric $
+# $Id: PKGBUILD 169750 2012-10-27 23:41:58Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.9.8
-pkgrel=2
+pkgver=6.8.0.3
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.imagemagick.org/"
 license=('custom')
 makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
              'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr')
-source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
+source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
         perlmagick.rpath.patch)
-sha1sums=('dc61335f931ea637e7bd2e711b520d221bfe464c'
+sha1sums=('3f3dfa63445081ece9a47825a2d692ca11d97cab'
           '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {
@@ -33,7 +33,7 @@ build() {
 
 check() {
   cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-#  make check
+  make check
 }
 
 package_imagemagick() {
@@ -80,6 +80,3 @@ package_imagemagick-doc() {
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE"
   install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE"
 }
-
-sha1sums=('bce339533e05ec4c973ce5621b5ff552a88d8981'
-          '23405f80904b1de94ebd7bd6fe2a332471b8c283')
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index d69825e0b..919e9eeba 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 169386 2012-10-20 09:31:39Z andyrtr $
+# $Id: PKGBUILD 169751 2012-10-27 23:42:02Z eric $
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=inkscape
 pkgver=0.48.3.1
-pkgrel=6
+pkgrel=7
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 license=('GPL' 'LGPL')
diff --git a/extra/intel-tbb/PKGBUILD b/extra/intel-tbb/PKGBUILD
new file mode 100644
index 000000000..e98b0f201
--- /dev/null
+++ b/extra/intel-tbb/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 172195 2012-12-02 04:41:05Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Denis Martinez <deuns.martinez AT gmail.com>
+
+pkgname=intel-tbb
+pkgver=4.1_20121003
+pkgrel=1
+pkgdesc='High level abstract threading library'
+arch=('i686' 'x86_64')
+url='http://www.threadingbuildingblocks.org/'
+license=('GPL')
+depends=('gcc-libs')
+source=("http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${pkgver/\./}oss_src.tgz")
+sha1sums=('072333068fa278635582846eaaa22d51c0100e09')
+
+build() {
+  cd "${srcdir}"/tbb${pkgver/\./}oss
+
+  make
+}
+
+package() {
+  cd "${srcdir}"/tbb${pkgver/\./}oss
+
+  install -d "${pkgdir}"/usr/lib
+  install -m755 build/linux_*/*.so* "${pkgdir}"/usr/lib
+
+  install -d "${pkgdir}"/usr/include
+  cp -a include/tbb "${pkgdir}"/usr/include
+}
diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD
index f4005ea97..216d709b6 100644
--- a/extra/irqbalance/PKGBUILD
+++ b/extra/irqbalance/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Martin Striz <ms@poruba.net>
 
 pkgname=irqbalance
-pkgver=1.0.4
+pkgver=1.0.5
 pkgrel=1
 pkgdesc="IRQ balancing daemon for SMP systems"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,11 +11,11 @@ license=('GPL')
 depends=(glib2 numactl libcap-ng)
 makedepends=(pkgconfig)
 backup=(etc/conf.d/irqbalance)
-source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.bz2
+source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.gz
         irqbalance.conf.d
         irqbalance.rc.d
         irqbalance.service)
-md5sums=('f7ca283c46331db73f27e686a643dcfb'
+md5sums=('b6403fa067c96adce448a48c9993654d'
          '336c1ee99818f9ecda1687e34c69fd6b'
          'fb82fc5d267d39110baf720d81282a7c'
          '9e82dc471128117982a8dd0c4bd5f246')
diff --git a/extra/jhead/LICENSE b/extra/jhead/LICENSE
deleted file mode 100644
index 63ad89ebc..000000000
--- a/extra/jhead/LICENSE
+++ /dev/null
@@ -1,12 +0,0 @@
-License:
-
-    Jhead is public domain software - that is, you can do whatever you want
-    with it, and include it software that is licensesed under the GNU or the 
-    BSD license, or whatever other licence you chose, including proprietary
-    closed source licenses.  Although not part of the liscense, I do expect
-    common courtesy, please.
-
-    If you do integrate the code into some software of yours, I'd appreciate
-    knowing about it though. 
-
-Matthias Wandel
diff --git a/extra/jhead/PKGBUILD b/extra/jhead/PKGBUILD
deleted file mode 100644
index bf8716c86..000000000
--- a/extra/jhead/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 163023 2012-07-05 21:03:35Z eric $
-# Maintainer: François Charette <francois ατ archlinux δοτ org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=jhead
-pkgver=2.96
-pkgrel=1
-pkgdesc="EXIF JPEG info parser and thumbnail remover"
-url="http://www.sentex.net/~mwandel/jhead/"
-arch=('i686' 'x86_64' 'mips64el')
-license=('custom')
-depends=('glibc')
-optdepends=('libjpeg: to up-right images according to rotation tag')
-source=(http://www.sentex.net/~mwandel/${pkgname}/${pkgname}-${pkgver}.tar.gz 
-        LICENSE)
-md5sums=('562b45d4d82f64196debed8c520c1cab'
-         '1f0db611d2642a981719f45252762a45')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -D -m755 jhead "${pkgdir}/usr/bin/jhead"
-  install -D -m644 jhead.1 "${pkgdir}/usr/share/man/man1/jhead.1"
-  install -D -m644 ${srcdir}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/json-glib/PKGBUILD b/extra/json-glib/PKGBUILD
index 2c4275bc1..649a47d70 100644
--- a/extra/json-glib/PKGBUILD
+++ b/extra/json-glib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141211 2011-10-26 14:49:31Z ibiru $
+# $Id: PKGBUILD 169945 2012-10-30 22:46:18Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=json-glib
-pkgver=0.14.2
-pkgrel=1.1
+pkgver=0.15.2
+pkgrel=1
 pkgdesc="JSON library built on GLib"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/JsonGlib"
@@ -11,8 +11,8 @@ license=('GPL')
 depends=('glib2')
 makedepends=('gobject-introspection')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.14/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('b816a5fa3e5664b08679a6972a6e5693d6cc1990ff4a6f94c07554db96be94a7')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.15/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('f090cd94acc85989e033d72028fa70863d05092ae5bba6b454e70c132b24cdde')
 
 build(){
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -24,3 +24,8 @@ package(){
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }
+
+check(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD
index 209a30fc6..7291f00a8 100644
--- a/extra/kactivities/PKGBUILD
+++ b/extra/kactivities/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 167762 2012-10-03 14:39:04Z andrea $
+# $Id: PKGBUILD 170751 2012-11-10 22:29:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kactivities
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='API for using and interacting with the Activity Manager'
 url='https://projects.kde.org/projects/kde/kdelibs/kactivities'
 license=('GPL' 'FDL')
 depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
+makedepends=('cmake' 'automoc4' 'mesa')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('7e5ec2aa1492450ea1de40f9e110561f6221b5ca')
+sha1sums=('79a9c14e10147c7deb20bfe924de9d63a8edb1ab')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD
index a496b0819..8824ff80b 100644
--- a/extra/kdeaccessibility-jovie/PKGBUILD
+++ b/extra/kdeaccessibility-jovie/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167790 2012-10-03 14:41:24Z andrea $
+# $Id: PKGBUILD 170607 2012-11-09 08:26:49Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-jovie
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='A text to speech application'
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdeaccessibility-kttsd')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz")
-sha1sums=('fbf63de8b286e8238383f49991ffb7651f9099d2')
+sha1sums=('116caae94fb3aee0270ce9c6069a5da82289ff70')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD
index 38966a9cb..f2e92b345 100644
--- a/extra/kdeaccessibility-kaccessible/PKGBUILD
+++ b/extra/kdeaccessibility-kaccessible/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167791 2012-10-03 14:41:27Z andrea $
+# $Id: PKGBUILD 170608 2012-11-09 08:26:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kaccessible
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Provides accessibility services like focus tracking and a screenreader'
@@ -12,7 +12,7 @@ groups=('kde' 'kdeaccessibility')
 depends=('kdelibs' 'speech-dispatcher')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz")
-sha1sums=('e55ccb92ce22250a8d8139d2367ef9f35c5b34d1')
+sha1sums=('6ea2b1751d97643bd2be1e625bed9d634d628a33')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD
index f8b9b85f4..37f1e6a78 100644
--- a/extra/kdeaccessibility-kmag/PKGBUILD
+++ b/extra/kdeaccessibility-kmag/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167792 2012-10-03 14:41:32Z andrea $
+# $Id: PKGBUILD 170609 2012-11-09 08:26:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmag
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Screen Magnifier'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz")
-sha1sums=('4429196f346271a825e721be56e92189a3c0da2a')
+sha1sums=('6d6fe858e504ed088bc7813854b5655431cf1ed5')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD
index c66320e64..4c7484848 100644
--- a/extra/kdeaccessibility-kmousetool/PKGBUILD
+++ b/extra/kdeaccessibility-kmousetool/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167793 2012-10-03 14:41:38Z andrea $
+# $Id: PKGBUILD 170610 2012-11-09 08:26:59Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmousetool
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Clicks the mouse for you, reducing the effects of RSI'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz")
-sha1sums=('c9e27c71fd9bb01ee498cb0799d848611d031dcc')
+sha1sums=('e76d255b2333cf0b964a4b904d558c0b58a495a2')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD
index 500f07a34..12fcb35c5 100644
--- a/extra/kdeaccessibility-kmouth/PKGBUILD
+++ b/extra/kdeaccessibility-kmouth/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167794 2012-10-03 14:41:44Z andrea $
+# $Id: PKGBUILD 170611 2012-11-09 08:27:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmouth
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Speech Synthesizer Frontend'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz")
-sha1sums=('7e982aa5a57a9f671ec69f3504ca4dc50076778d')
+sha1sums=('6f82859510cd90594c4f9b5bb74f35413c9cb4c1')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD
index dfb98ca52..3b4d3921d 100644
--- a/extra/kdeadmin/PKGBUILD
+++ b/extra/kdeadmin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167795 2012-10-03 14:41:51Z andrea $
+# $Id: PKGBUILD 170612 2012-11-09 08:27:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -7,7 +7,7 @@ pkgname=('kdeadmin-kcron'
          'kdeadmin-ksystemlog'
          'kdeadmin-kuser'
          'kdeadmin-system-config-printer-kde')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
@@ -15,7 +15,7 @@ groups=('kde' 'kdeadmin')
 makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'syslog-path.patch')
-sha1sums=('0b97528870a23440ba450f87be878e3abdf9e0e1'
+sha1sums=('3fa7f1c3018f156b6185a806b66364c8daf7547c'
           '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
 
 build() {
diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD
index 10e566d4e..7d0698fd6 100644
--- a/extra/kdeartwork/PKGBUILD
+++ b/extra/kdeartwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167796 2012-10-03 14:41:55Z andrea $
+# $Id: PKGBUILD 170613 2012-11-09 08:27:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -13,16 +13,16 @@ pkgname=('kdeartwork-aurorae'
          'kdeartwork-styles'
          'kdeartwork-wallpapers'
          'kdeartwork-weatherwallpapers')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeartwork')
 makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace'
-             'libkexiv2')
+             'libkexiv2' 'mesa')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('6a93ed5fd33b27b88b653c15c546b223ed880a4d')
+sha1sums=('777e3b50546e3a75bc2253ee13962bd1955db921')
 
 build() {
 	cd $srcdir
diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD
index ebda98fae..bd3e0d0f6 100644
--- a/extra/kdebase-konsole/PKGBUILD
+++ b/extra/kdebase-konsole/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167797 2012-10-03 14:41:59Z andrea $
+# $Id: PKGBUILD 170614 2012-11-09 08:27:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebase-konsole
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://kde.org/applications/system/konsole/'
@@ -12,7 +12,7 @@ groups=('kde' 'kdebase')
 depends=('kdebase-runtime' 'kdebase-lib')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz")
-sha1sums=('bab9dcab839cc975fb3b94ac383d25b94066fe92')
+sha1sums=('6d6f0894350ca1976c7403b8eb5d8c197b57c884')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD
deleted file mode 100644
index d25dd1a5f..000000000
--- a/extra/kdebase-runtime/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 164845 2012-08-06 23:13:19Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-runtime
-pkgver=4.9.0
-pkgrel=3
-pkgdesc="Plugins and applications necessary for the running of KDE applications"
-arch=('i686' 'x86_64' 'mips64el')
-url='https://projects.kde.org/projects/kde/kde-runtime'
-license=('GPL' 'LGPL')
-depends=('nepomuk-core' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth'
-         'kactivities')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen'
-             'networkmanager')
-optdepends=('kdepimlibs: to generate drkonqi reports'
-            'htdig: to build the search index in khelpcenter'
-            'rarian: needed by khelpcenter'
-            'gdb: drkonq crash handler')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz")
-sha1sums=('89a9e5c7e52cb925217b45a568a354cc041bc28d')
-
-build() {
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../kde-runtime-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DWITH_QNtrack=OFF \
-        -DWITH_Xine=OFF
-	make
-}
-
-package() {
-	cd "$srcdir/build"
-	make DESTDIR="$pkgdir" install
-	rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
-
-    ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
-}
diff --git a/extra/kdebase-runtime/kdebase-runtime.install b/extra/kdebase-runtime/kdebase-runtime.install
deleted file mode 100644
index c77e68041..000000000
--- a/extra/kdebase-runtime/kdebase-runtime.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 5235d0f37..7d2e4cb5e 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 168704 2012-10-14 16:38:05Z thomas $
+# $Id: PKGBUILD 170596 2012-11-09 08:26:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
-pkgver=4.9.2
-pkgrel=4
+pkgver=4.9.3
+pkgrel=1
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -15,49 +15,39 @@ groups=('kde')
 # 	not detected by namcap because libgl depends on it
 #	but nvidia providing libgl does not depend on libxdamage
 depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate'
-         'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage'
+         'qimageblitz' 'polkit-kde' 'xorg-xprop' 'libxdamage'
          'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
          'xorg-xrdb' 'libgles' 'libegl' 'libxres' 'xorg-xrandr'
          'xorg-xmessage' 'libusb-compat' 'kde-base-artwork')
-makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager')
+makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager' 'mesa')
 optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces')
 install="${pkgname}.install"
-backup=('usr/share/config/kdm/kdmrc'
-        'etc/pam.d/kde'
-        'etc/pam.d/kde-np'
-        'etc/pam.d/kscreensaver')
-options=('emptydirs')
+backup=('usr/share/config/kdm/kdmrc')
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
-        'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service'
-        'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
-        'kdm.logrotate'
-        'logind-support.patch')
-sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488'
+        'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
+        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+sha1sums=('f6c527361e76aacae980f661294b32a7f3df46a0'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
           '660eae40a707d2711d8d7f32a93214865506b795'
-          'b7980f2e199963caf8e92b499042d244ece2fca0'
+          '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
-          'd7b5883f7e65c6839b1f65f94d58026673dd0226'
-          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514'
           'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
-          'ccde71c42e19feaf40d3bd76e7396a0cb6df012f')
+          'c079ebd157c836ba996190f0d2bcea1a7828d02c'
+          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
+          'd509dac592bd8b310df27991b208c95b6d907514')
 
 build() {
 	cd ${_pkgname}-${pkgver}
 
+    # reads the shell scripts in /etc/kde/
+    patch -p0 -i "${srcdir}"/etc-scripts.patch
     # FS#26120
 	patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
 
-	patch -p0 -i "${srcdir}"/fixpath.patch
-
     # KDEBUG#202629
 	patch -p0 -i "${srcdir}"/terminate-server.patch
 
-    # KDEBUG#307412 (fixed upstream)
-    patch -p1 -i "${srcdir}"/logind-support.patch
-
     cd ../
 
 	mkdir build
@@ -69,7 +59,8 @@ build() {
         -DWITH_Xmms=OFF \
         -DWITH_Googlegadgets=OFF \
         -DWITH_libgps=OFF \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2
+        -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+        -DWITH_CkConnector=OFF
 	make
 }
 
diff --git a/extra/kdebase-workspace/etc-scripts.patch b/extra/kdebase-workspace/etc-scripts.patch
new file mode 100644
index 000000000..903a90a53
--- /dev/null
+++ b/extra/kdebase-workspace/etc-scripts.patch
@@ -0,0 +1,11 @@
+--- startkde.cmake.orig	2009-01-15 14:24:44.000000000 +0100
++++ startkde.cmake	2009-01-15 14:33:08.000000000 +0100
+@@ -206,7 +190,7 @@
+ # For anything else (that doesn't set env vars, or that needs a window manager),
+ # better use the Autostart folder.
+ 
+-libpath=`kde4-config --path lib | tr : '\n'`
++libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
+ 
+ for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+   for file in "$prefix"*.sh; do
diff --git a/extra/kdebase-workspace/fix-mesa9.patch b/extra/kdebase-workspace/fix-mesa9.patch
new file mode 100644
index 000000000..4c5fca408
--- /dev/null
+++ b/extra/kdebase-workspace/fix-mesa9.patch
@@ -0,0 +1,60 @@
+commit 6cf057777555a5d0c834de3a0165a62916cf3b40
+Author: Fredrik Höglund <fredrik@kde.org>
+Date:   Tue Oct 30 18:20:00 2012 +0100
+
+    kwin/glx: Avoid MSAA configs in initBufferConfigs()
+    
+    It appears that we're accidentally choosing an MSAA config with the
+    Intel driver in Mesa 9.0. So change the algorithm to take the values
+    of GLX_SAMPLES and GLX_SAMPLE_BUFFERS into account.
+    
+    Found by Kenneth Graunke.
+
+diff --git a/kwin/scene_opengl_glx.cpp b/kwin/scene_opengl_glx.cpp
+index 1fe2f18..cf7933b 100644
+--- a/kwin/scene_opengl_glx.cpp
++++ b/kwin/scene_opengl_glx.cpp
+@@ -270,12 +270,15 @@ bool SceneOpenGL::initBufferConfigs()
+     fbcbuffer_nondb = NULL;
+ 
+     for (int i = 0; i < 2; i++) {
+-        int back, stencil, depth, caveat, alpha;
++        int back, stencil, depth, caveat, msaa_buffers, msaa_samples, alpha;
+         back = i > 0 ? INT_MAX : 1;
+         stencil = INT_MAX;
+         depth = INT_MAX;
+         caveat = INT_MAX;
++        msaa_buffers = INT_MAX;
++        msaa_samples = INT_MAX;
+         alpha = 0;
++
+         for (int j = 0; j < cnt; j++) {
+             XVisualInfo *vi;
+             int visual_depth;
+@@ -322,10 +325,26 @@ bool SceneOpenGL::initBufferConfigs()
+                                  GLX_CONFIG_CAVEAT, &caveat_value);
+             if (caveat_value > caveat)
+                 continue;
++
++            int msaa_buffers_value;
++            glXGetFBConfigAttrib(display(), fbconfigs[j], GLX_SAMPLE_BUFFERS,
++                                 &msaa_buffers_value);
++            if (msaa_buffers_value > msaa_buffers)
++                continue;
++
++            int msaa_samples_value;
++            glXGetFBConfigAttrib(display(), fbconfigs[j], GLX_SAMPLES,
++                                 &msaa_samples_value);
++            if (msaa_samples_value > msaa_samples)
++                continue;
++
+             back = back_value;
+             stencil = stencil_value;
+             depth = depth_value;
+             caveat = caveat_value;
++            msaa_buffers = msaa_buffers_value;
++            msaa_samples = msaa_samples_value;
++
+             if (i > 0)
+                 fbcbuffer_nondb = fbconfigs[ j ];
+             else
diff --git a/extra/kdebase-workspace/kde-np.pam b/extra/kdebase-workspace/kde-np.pam
index eccaa08f4..2a4a940c7 100644
--- a/extra/kdebase-workspace/kde-np.pam
+++ b/extra/kdebase-workspace/kde-np.pam
@@ -3,7 +3,7 @@ auth		required	pam_tally.so	onerr=succeed file=/var/log/faillog
 auth		required	pam_shells.so
 auth		requisite	pam_nologin.so
 auth		required	pam_env.so
-auth		optional	pam_permit.s
+auth		optional	pam_permit.so
 
 account		include      system-login
 
diff --git a/extra/kdebase-workspace/kdebase-workspace.install b/extra/kdebase-workspace/kdebase-workspace.install
index f7d6d305b..c52c06417 100644
--- a/extra/kdebase-workspace/kdebase-workspace.install
+++ b/extra/kdebase-workspace/kdebase-workspace.install
@@ -4,6 +4,7 @@ post_install() {
 	chown -R 135:135 var/lib/kdm &>/dev/null
 	xdg-icon-resource forceupdate --theme hicolor &>/dev/null
     update-desktop-database -q
+    genkdmconf --no-old --no-backup &>/dev/null
 }
 
 post_upgrade() {
@@ -12,6 +13,7 @@ post_upgrade() {
 	chown -R 135:135 var/lib/kdm &>/dev/null
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
     update-desktop-database -q
+    genkdmconf &>/dev/null
 }
 
 post_remove() {
@@ -22,4 +24,8 @@ post_remove() {
 	  groupdel kdm
 	fi
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+
+    if [ -d usr/share/apps/kdm/faces ]; then
+        rm -r usr/share/apps/kdm/faces
+    fi
 }
diff --git a/extra/kdebase-workspace/logind-support2.patch b/extra/kdebase-workspace/logind-support2.patch
new file mode 100644
index 000000000..e36757f6a
--- /dev/null
+++ b/extra/kdebase-workspace/logind-support2.patch
@@ -0,0 +1,124 @@
+commit 80e9e6e48ff5b84962f3a8543ee06bcd4f122623
+Author: Lukáš Tinkl <lukas@kde.org>
+Date:   Tue Oct 30 11:32:52 2012 +0100
+
+    move systemd inhibition initialization to a slot
+    
+    and call it on resume. It looks like the filedescriptor
+    goes away when you suspend so we need to recreate it.
+    
+    BUG: 307412
+
+diff --git a/powerdevil/daemon/powerdevilcore.cpp b/powerdevil/daemon/powerdevilcore.cpp
+index df79667..7f24cbb 100644
+--- a/powerdevil/daemon/powerdevilcore.cpp
++++ b/powerdevil/daemon/powerdevilcore.cpp
+@@ -127,8 +127,6 @@ void Core::onBackendReady()
+             this, SLOT(onAcAdapterStateChanged(PowerDevil::BackendInterface::AcAdapterState)));
+     connect(m_backend, SIGNAL(batteryRemainingTimeChanged(qulonglong)),
+             this, SLOT(onBatteryRemainingTimeChanged(qulonglong)));
+-    connect(m_backend, SIGNAL(resumeFromSuspend()),
+-            this, SLOT(onResumeFromSuspend()));
+     connect(KIdleTime::instance(), SIGNAL(timeoutReached(int,int)),
+             this, SLOT(onKIdleTimeoutReached(int,int)));
+     connect(KIdleTime::instance(), SIGNAL(resumingFromIdle()),
+@@ -139,6 +137,9 @@ void Core::onBackendReady()
+     // Set up the policy agent
+     PowerDevil::PolicyAgent::instance()->init();
+ 
++    connect(m_backend, SIGNAL(resumeFromSuspend()),
++            this, SLOT(onResumeFromSuspend()));
++
+     // Initialize the action pool, which will also load the needed startup actions.
+     PowerDevil::ActionPool::instance()->init(this);
+ 
+@@ -601,6 +602,7 @@ void Core::onResumeFromSuspend()
+                                              "/ScreenSaver",
+                                              QDBusConnection::sessionBus());
+     iface.SimulateUserActivity();
++    PowerDevil::PolicyAgent::instance()->setupSystemdInhibition();
+ 
+     emit resumingFromSuspend();
+ }
+diff --git a/powerdevil/daemon/powerdevilpolicyagent.cpp b/powerdevil/daemon/powerdevilpolicyagent.cpp
+index 70588db..0777846 100644
+--- a/powerdevil/daemon/powerdevilpolicyagent.cpp
++++ b/powerdevil/daemon/powerdevilpolicyagent.cpp
+@@ -88,6 +88,7 @@ PolicyAgent *PolicyAgent::instance()
+ PolicyAgent::PolicyAgent(QObject* parent)
+     : QObject(parent)
+     , m_sdAvailable(false)
++    , m_systemdInhibitFd(-1)
+     , m_ckAvailable(false)
+     , m_sessionIsBeingInterrupted(false)
+     , m_lastCookie(0)
+@@ -223,23 +224,7 @@ void PolicyAgent::onSessionHandlerRegistered(const QString & serviceName)
+ 
+         onActiveSessionChanged(m_activeSessionPath);
+ 
+-        // inhibit systemd handling of power/sleep/lid buttons
+-        // http://www.freedesktop.org/wiki/Software/systemd/inhibit
+-        kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing);
+-
+-        QVariantList args;
+-        args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what
+-        args << "PowerDevil"; // who
+-        args << "KDE handles power events"; // why
+-        args << "block"; // mode
+-        QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args);
+-        desc.waitForFinished();
+-        if (desc.isValid()) {
+-            m_systemdInhibitFd = desc.value();
+-            kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor();
+-        }
+-        else
+-            kWarning() << "failed to inhibit systemd powersave handling";
++        setupSystemdInhibition();
+ 
+         kDebug() << "systemd support initialized";
+     } else if (serviceName == CONSOLEKIT_SERVICE) {
+@@ -552,6 +537,31 @@ void PolicyAgent::releaseAllInhibitions()
+     }
+ }
+ 
++void PolicyAgent::setupSystemdInhibition()
++{
++    if (m_systemdInhibitFd.fileDescriptor() != -1)
++        return;
++
++    // inhibit systemd handling of power/sleep/lid buttons
++    // http://www.freedesktop.org/wiki/Software/systemd/inhibit
++    QDBusInterface managerIface(SYSTEMD_LOGIN1_SERVICE, SYSTEMD_LOGIN1_PATH, SYSTEMD_LOGIN1_MANAGER_IFACE, QDBusConnection::systemBus());
++    kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing);
++
++    QVariantList args;
++    args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what
++    args << "PowerDevil"; // who
++    args << "KDE handles power events"; // why
++    args << "block"; // mode
++    QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args);
++    desc.waitForFinished();
++    if (desc.isValid()) {
++        m_systemdInhibitFd = desc.value();
++        kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor();
++    }
++    else
++        kWarning() << "failed to inhibit systemd powersave handling";
++}
++
+ }
+ 
+ #include "powerdevilpolicyagent.moc"
+diff --git a/powerdevil/daemon/powerdevilpolicyagent.h b/powerdevil/daemon/powerdevilpolicyagent.h
+index a046497..f1e8c03 100644
+--- a/powerdevil/daemon/powerdevilpolicyagent.h
++++ b/powerdevil/daemon/powerdevilpolicyagent.h
+@@ -74,6 +74,8 @@ public:
+ 
+     RequiredPolicies unavailablePolicies();
+ 
++    void setupSystemdInhibition();
++
+ public Q_SLOTS:
+     // Exported slots
+     uint AddInhibition(uint types, const QString &appName, const QString &reason);
diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD
index 0981c517e..387764bca 100644
--- a/extra/kdebase/PKGBUILD
+++ b/extra/kdebase/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167779 2012-10-03 14:40:36Z andrea $
+# $Id: PKGBUILD 170597 2012-11-09 08:26:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -11,7 +11,7 @@ pkgname=('kdebase-dolphin'
          'kdebase-konq-plugins'
          'kdebase-lib'
          'kdebase-plasma')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -19,7 +19,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz")
-sha1sums=('8b5a45cfd77e7e67a57c06cdbf387692e8547b66')
+sha1sums=('282b8704d54f081a16894bb94aa901e72eb5e694')
 
 build() {
 	cd ${srcdir}
diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD
index 291cbf193..35b5e7a68 100644
--- a/extra/kdebindings-kimono/PKGBUILD
+++ b/extra/kdebindings-kimono/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167798 2012-10-03 14:42:03Z andrea $
+# $Id: PKGBUILD 170615 2012-11-09 08:27:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-kimono
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the KDE libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/csharp/kimono"
@@ -13,7 +13,7 @@ depends=('kdebindings-qyoto' 'kdebindings-smokekde')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs')
 conflicts=('kdebindings-csharp')
 source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz")
-sha1sums=('d8c762a6a65323f80e47cadbfa732b529a07dbc1')
+sha1sums=('8f9571ede6e2801eba40ab59c44d47a3854e04dc')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD
index 8a4ccc1d0..3b4efa630 100644
--- a/extra/kdebindings-korundum/PKGBUILD
+++ b/extra/kdebindings-korundum/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167799 2012-10-03 14:42:08Z andrea $
+# $Id: PKGBUILD 170616 2012-11-09 08:27:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-korundum
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Ruby bindings for libraries created by the KDE community"
 url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum"
@@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
 conflicts=('kdebindings-ruby')
 source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz"
         'ruby19.patch')
-sha1sums=('efa6b6b6bae89f8e16cbbcf8c5840c6cbdab57e3'
+sha1sums=('ade552b7a0ddd3117dcd18ac0c70016c01f19fc5'
           'c074f027bac3b9bffe70a2c2304a6a7be12be034')
 
 build() {
diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD
index 9edae1f92..5dc868c51 100644
--- a/extra/kdebindings-kross/PKGBUILD
+++ b/extra/kdebindings-kross/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 167800 2012-10-03 14:42:11Z andrea $
+# $Id: PKGBUILD 170617 2012-11-09 08:27:25Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-kross
 pkgname=('kdebindings-kross-python'
 #         'kdebindings-kross-ruby'
          'kdebindings-kross-java')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment')
 source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz")
-sha1sums=('9208e4ad1b8ad97f1220cd6696f22d8b1eab29cb')
+sha1sums=('862cff197c21d102d1687fb36c25b0f8cabb2397')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD
index 4dfceecc3..872a5898e 100644
--- a/extra/kdebindings-perlkde/PKGBUILD
+++ b/extra/kdebindings-perlkde/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167801 2012-10-03 14:42:15Z andrea $
+# $Id: PKGBUILD 170618 2012-11-09 08:27:29Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlkde
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Perl bindings for the KDE libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde"
@@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
             'kdegraphics-okular' 'kdesdk-kate')
 source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz")
-sha1sums=('7ed1e54f5216e5bfd6b9709900d3df6b606910b5')
+sha1sums=('9504e5f31787df5f31686aabab96d30af96f33b7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD
index 103932ec0..3b028c44d 100644
--- a/extra/kdebindings-perlqt/PKGBUILD
+++ b/extra/kdebindings-perlqt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167773 2012-10-03 14:39:50Z andrea $
+# $Id: PKGBUILD 170591 2012-11-09 08:25:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlqt
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Perl bindings for the Qt libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt"
@@ -12,7 +12,7 @@ groups=('kdebindings')
 depends=('kdebindings-smokeqt' 'perl-list-moreutils')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz")
-sha1sums=('1f7d70401c84fa54e937979a7c03d3fa8d7d59c2')
+sha1sums=('b41f57df71d7001b9fb079b9eb64fe7b5e08690c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
index c2619bd68..bfc4d3c31 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -1,29 +1,23 @@
-# $Id: PKGBUILD 168996 2012-10-17 10:19:28Z allan $
+# $Id: PKGBUILD 170592 2012-11-09 08:25:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-python
 pkgname=('kdebindings-python'
          'kdebindings-python2')
-pkgver=4.9.2
-pkgrel=2
+pkgver=4.9.3
+pkgrel=1
 url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
-             'pyqt' 'qscintilla' 'python2-sip' 'python-sip')
-source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz"
-        'pyqt495.patch')
-sha1sums=('44b3f02797c43a59f8c3a91131a2488a733cfa11'
-          '0935c32e55806873f2d088613594559285da7e9c')
+             'pyqt' 'qscintilla' 'python2-sip' 'python-sip' 'mesa')
+source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
+sha1sums=('4a72a307d5780f013e12607b9cddb425f81ffeef')
 
 build() {
   export PYTHONDONTWRITEBYTECODE="TRUE"
 
-  cd pykde4-${pkgver}
-  patch -p1 -i "${srcdir}"/pyqt495.patch
-  cd ../ 
-
   mkdir build
   cd build
   cmake ../pykde4-${pkgver} \
diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD
index e41246811..f399d0547 100644
--- a/extra/kdebindings-qtruby/PKGBUILD
+++ b/extra/kdebindings-qtruby/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167776 2012-10-03 14:40:01Z andrea $
+# $Id: PKGBUILD 170594 2012-11-09 08:25:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qtruby
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Ruby bindings for the Qt libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby"
@@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-ruby')
 source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz")
-sha1sums=('7d74ef9d0c66ef6c54fd25aeff89de7f06685dda')
+sha1sums=('f4cc60e378c4bf0d235affba5d042d0031560009')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD
index 0293f9086..88eab809b 100644
--- a/extra/kdebindings-qyoto/PKGBUILD
+++ b/extra/kdebindings-qyoto/PKGBUILD
@@ -1,22 +1,28 @@
-# $Id: PKGBUILD 167775 2012-10-03 14:39:58Z andrea $
+# $Id: PKGBUILD 170593 2012-11-09 08:25:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qyoto
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the Qt libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 depends=('kdebindings-smokeqt' 'mono')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-csharp')
-source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz")
-sha1sums=('549f386325cf02662c685f83b1844c72149255d1')
+source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz"
+        'cmake2810.patch')
+sha1sums=('24397a09c50ccc2e87dcd5d07f33d74cc9c5113f'
+          'f7745cb0fc4768dc8cab0e0d58b1159fb19805f5')
 
 build() {
-  cd "${srcdir}"
+  cd qyoto-${pkgver}
+  # KDEBUG#209652
+  patch -p1 -i "${srcdir}"/cmake2810.patch
+  cd ../
+ 
   mkdir build
   cd build
   cmake ../qyoto-${pkgver} \
@@ -26,6 +32,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdebindings-qyoto/cmake2810.patch b/extra/kdebindings-qyoto/cmake2810.patch
new file mode 100644
index 000000000..9c0343a27
--- /dev/null
+++ b/extra/kdebindings-qyoto/cmake2810.patch
@@ -0,0 +1,15 @@
+diff -up qyoto-4.9.3/cmake/CMakeDetermineCSharpCompiler.cmake.cmake_2_8_10 qyoto-4.9.3/cmake/CMakeDetermineCSharpCompiler.cmake
+--- qyoto-4.9.3/cmake/CMakeDetermineCSharpCompiler.cmake.cmake_2_8_10	2012-08-13 04:00:53.000000000 -0500
++++ qyoto-4.9.3/cmake/CMakeDetermineCSharpCompiler.cmake	2012-11-06 15:31:18.719822193 -0600
+@@ -84,6 +84,9 @@ endif (CMAKE_CSharp_COMPILER)
+ get_filename_component(script_dir ${CMAKE_CURRENT_LIST_FILE} PATH)
+ 
+ # configure variables set in this file for fast reload later on
+-configure_file(${script_dir}/CMakeCSharpCompiler.cmake.in
+-  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCSharpCompiler.cmake IMMEDIATE @ONLY)
++ if(NOT CMAKE_PLATFORM_INFO_DIR) # pre-2.8.10
++   set(CMAKE_PLATFORM_INFO_DIR ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY})
++ endif()
++ configure_file(${script_dir}/CMakeCSharpCompiler.cmake.in
++   ${CMAKE_PLATFORM_INFO_DIR}/CMakeCSharpCompiler.cmake IMMEDIATE @ONLY)
+ set(CMAKE_CSharp_COMPILER_ENV_VAR "CSC")
diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD
index 5b8aae4c5..eef3f7d83 100644
--- a/extra/kdebindings-smokegen/PKGBUILD
+++ b/extra/kdebindings-smokegen/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167766 2012-10-03 14:39:21Z andrea $
+# $Id: PKGBUILD 170586 2012-11-09 08:25:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokegen
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A general purpose C++ parser with a plugin infrastructure"
 url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen"
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz")
-sha1sums=('f7ac776e18ad0df7535280ca5e6ea951cde159fb')
+sha1sums=('0f5fc7634140434fad6c96f59055d91754b8f784')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD
index d32e065f9..f215922fb 100644
--- a/extra/kdebindings-smokekde/PKGBUILD
+++ b/extra/kdebindings-smokekde/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167772 2012-10-03 14:39:47Z andrea $
+# $Id: PKGBUILD 170779 2012-11-11 09:42:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokekde
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Language independent library for KDE bindings"
 url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde"
@@ -11,12 +11,13 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 depends=('kdebindings-smokeqt')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
-             'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
+             'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate'
+             'mesa')
 optdepends=('kdesdk-kate: Kate bindings'
             'kdegraphics-okular: Okular bindings')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz")
-sha1sums=('ad541046cf64df5a9ffda29979f8868a9c29c354')
+sha1sums=('4cc26577b84cf78253aac5fbfed88da9667dbcea')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD
index 33d493f70..8b7d8aa8e 100644
--- a/extra/kdebindings-smokeqt/PKGBUILD
+++ b/extra/kdebindings-smokeqt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167767 2012-10-03 14:39:25Z andrea $
+# $Id: PKGBUILD 170776 2012-11-11 09:41:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokeqt
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Language independent library for Qt bindings"
 url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt"
@@ -10,10 +10,10 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla')
-makedepends=('cmake' 'automoc4')
+makedepends=('cmake' 'automoc4' 'mesa')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz")
-sha1sums=('a2f70eb2cb67942456604a6538e9cabe8a48aad5')
+sha1sums=('08ffb9d5bfe8c624f1da28b49f26dfa746fc8bcf')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD
index 086238e07..b900b6a7f 100644
--- a/extra/kdeedu-analitza/PKGBUILD
+++ b/extra/kdeedu-analitza/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167787 2012-10-03 14:41:10Z andrea $
+# $Id: PKGBUILD 170604 2012-11-09 08:26:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-analitza
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A library to add mathematical features to your program"
 url="https://projects.kde.org/projects/kde/kdeedu/analitza"
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz")
-sha1sums=('065e449af454e08f02ece846fe5b28db09bda1be')
+sha1sums=('96fc22e59b86fdd22d9f716b342c2635013c4807')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD
index 1414d8ea9..c0aa2bbe8 100644
--- a/extra/kdeedu-blinken/PKGBUILD
+++ b/extra/kdeedu-blinken/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167802 2012-10-03 14:42:22Z andrea $
+# $Id: PKGBUILD 170619 2012-11-09 08:27:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-blinken
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Memory Enhancement Game"
 url="http://kde.org/applications/education/blinken/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz")
-sha1sums=('4f13e61086929da9ba75ee3b73612540054888b1')
+sha1sums=('b979cbcd000266f49b620f556811a6846d434e2d')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD
index 19d613ddb..70e99915a 100644
--- a/extra/kdeedu-cantor/PKGBUILD
+++ b/extra/kdeedu-cantor/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167803 2012-10-03 14:42:27Z andrea $
+# $Id: PKGBUILD 170620 2012-11-09 08:27:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-cantor
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="KDE Frontend to Mathematical Software"
 url="http://kde.org/applications/education/cantor/"
@@ -16,7 +16,7 @@ optdepends=('maxima: Maxima backend'
             'r: R backend')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz")
-sha1sums=('51b6cf08d43b6ea9fc285283a8ee1d8097b7349b')
+sha1sums=('01526ddfe5f9abf26e9eba3914e8439596ea594e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD
index be31fcb0d..60dad3d70 100644
--- a/extra/kdeedu-kalgebra/PKGBUILD
+++ b/extra/kdeedu-kalgebra/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167804 2012-10-03 14:42:32Z andrea $
+# $Id: PKGBUILD 170621 2012-11-09 08:27:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalgebra
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Graph Calculator"
 url="http://kde.org/applications/education/kalgebra/"
@@ -10,10 +10,10 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza')
-makedepends=('cmake' 'automoc4')
+makedepends=('cmake' 'automoc4' 'mesa')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz")
-sha1sums=('93aceea871e10eff771645f627563517684a11a5')
+sha1sums=('5c61c468af41246242c25bf9a483ea36a39d8b22')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD
index 9c25f6a5e..ff3309501 100644
--- a/extra/kdeedu-kalzium/PKGBUILD
+++ b/extra/kdeedu-kalzium/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167805 2012-10-03 14:42:37Z andrea $
+# $Id: PKGBUILD 170622 2012-11-09 08:27:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalzium
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Periodic Table of Elements"
 url="http://kde.org/applications/education/kalzium/"
@@ -12,10 +12,17 @@ groups=('kde' 'kdeedu')
 depends=('kdelibs' 'avogadro' 'ocaml' 'facile')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz")
-sha1sums=('d328ad31f50a33aefeb009411a1adb51c29850a2')
+source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz"
+        'fix-linking.patch')
+sha1sums=('7b4a50aabd960752d6b746740cc6b4bf6cae3b30'
+          '478697adc8ae191355ee64b824f30e11bd7af682')
 
 build() {
+  # KDEBUG#308939 (Fixed upstream)
+  cd kalzium-${pkgver}
+  patch -p1 -i "${srcdir}"/fix-linking.patch
+  cd ../
+
   cd "${srcdir}"
   mkdir build
   cd build
diff --git a/extra/kdeedu-kalzium/fix-linking.patch b/extra/kdeedu-kalzium/fix-linking.patch
new file mode 100644
index 000000000..6b0c1df7c
--- /dev/null
+++ b/extra/kdeedu-kalzium/fix-linking.patch
@@ -0,0 +1,24 @@
+commit ffac09556f6f3d5d758bac9ba2b91117e6014ea7
+Author: Christoph Feck <christoph@maxiom.de>
+Date:   Fri Nov 2 17:31:48 2012 +0100
+
+    SVN_SILENT link
+    
+    If possible, please include this build fix in 4.9.3 tag.
+    
+    BUG: 308939
+    CCMAIL: kde-release-team@kde.org
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 03eabf3..c8f425a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -138,7 +138,7 @@ target_link_libraries(kalzium ${KDE4_KHTML_LIBRARY} ${KDE4_KNEWSTUFF3_LIBS} ${KD
+ if (OPENBABEL2_FOUND)
+    target_link_libraries(kalzium ${OPENBABEL2_LIBRARIES})
+    if (EIGEN2_FOUND AND Avogadro_FOUND)
+-      target_link_libraries(kalzium compoundviewer avogadro)
++      target_link_libraries(kalzium ${QT_QTOPENGL_LIBRARY} compoundviewer avogadro)
+    endif (EIGEN2_FOUND AND Avogadro_FOUND)
+ endif (OPENBABEL2_FOUND)
+ 
diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD
index 1965ff15b..ba2bddd41 100644
--- a/extra/kdeedu-kanagram/PKGBUILD
+++ b/extra/kdeedu-kanagram/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167806 2012-10-03 14:42:42Z andrea $
+# $Id: PKGBUILD 170623 2012-11-09 08:27:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kanagram
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Letter Order Game"
 url="http://kde.org/applications/education/kanagram/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz")
-sha1sums=('b6fd76d854473ab6dbfdfdcb09347e7c4363a580')
+sha1sums=('e0ba84ac0d091dad0fb5af712a680a98abc17355')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD
index fe1b394dc..37bb5b02e 100644
--- a/extra/kdeedu-kbruch/PKGBUILD
+++ b/extra/kdeedu-kbruch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167807 2012-10-03 14:42:47Z andrea $
+# $Id: PKGBUILD 170624 2012-11-09 08:27:49Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kbruch
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Exercise Fractions"
 url="http://kde.org/applications/education/kbruch/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz")
-sha1sums=('82c7c573d6c0c248ae2d8db24504d1943824d0da')
+sha1sums=('9676d6866e28a33cb65dbe3f4b8da1d0041a0596')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD
index 683ce3581..c10aff27b 100644
--- a/extra/kdeedu-kgeography/PKGBUILD
+++ b/extra/kdeedu-kgeography/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167808 2012-10-03 14:42:53Z andrea $
+# $Id: PKGBUILD 170625 2012-11-09 08:27:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kgeography
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Geography Trainer"
 url="http://kde.org/applications/education/kgeography/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz")
-sha1sums=('a68b02fd9ba765bce5d95b754dfd7eef70fa5743')
+sha1sums=('15d6f44bed780afbd75fe5d89c0d2e041904af25')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD
index 547829b37..b93d62a75 100644
--- a/extra/kdeedu-khangman/PKGBUILD
+++ b/extra/kdeedu-khangman/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167809 2012-10-03 14:42:58Z andrea $
+# $Id: PKGBUILD 170626 2012-11-09 08:27:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-khangman
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Hangman Game"
 url="http://kde.org/applications/education/khangman/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz")
-sha1sums=('6c11cf05fca993b7ddb7f92f68299a34470b5cd5')
+sha1sums=('75f08151c66a14adee3f5a2494439aba12e1dd66')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD
index 4c413fb9e..800f5fe61 100644
--- a/extra/kdeedu-kig/PKGBUILD
+++ b/extra/kdeedu-kig/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167810 2012-10-03 14:43:03Z andrea $
+# $Id: PKGBUILD 170627 2012-11-09 08:28:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kig
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Interactive Geometry"
 url="http://kde.org/applications/education/kig/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz")
-sha1sums=('13b3d40b0d33b1a60b36278760e35f337089cc73')
+sha1sums=('ed999bf98caef1107e01ddec90f1b5b9b09d75c8')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD
index ab83d92ac..5b4d8f1fe 100644
--- a/extra/kdeedu-kiten/PKGBUILD
+++ b/extra/kdeedu-kiten/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167811 2012-10-03 14:43:09Z andrea $
+# $Id: PKGBUILD 170628 2012-11-09 08:28:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kiten
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Japanese Reference/Study Tool"
 url="http://kde.org/applications/education/kiten/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz")
-sha1sums=('86b4bd5f4b7ccc4f6e0769a8360e55ffebdc2eaf')
+sha1sums=('8bbfd5de164aff394bad508f1e15509f65d6efea')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD
index 97128cf76..0c95b6f1b 100644
--- a/extra/kdeedu-klettres/PKGBUILD
+++ b/extra/kdeedu-klettres/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167812 2012-10-03 14:43:15Z andrea $
+# $Id: PKGBUILD 170629 2012-11-09 08:28:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-klettres
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Learn The Alphabet"
 url="http://kde.org/applications/education/klettres/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz")
-sha1sums=('177413e9f9e490a4c72d8f85d3bdd36ffd1ba934')
+sha1sums=('a651c0ee96ba4cdfe0cbbd3dc555f52218eb0830')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD
index df0ea51e7..ef4543958 100644
--- a/extra/kdeedu-kmplot/PKGBUILD
+++ b/extra/kdeedu-kmplot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167813 2012-10-03 14:43:21Z andrea $
+# $Id: PKGBUILD 170630 2012-11-09 08:28:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kmplot
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Mathematical Function Plotter"
 url="http://kde.org/applications/education/kmplot/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz")
-sha1sums=('66fba97fc152925f87551be2dd283d4cbf06683f')
+sha1sums=('f89aa657b98a36e357c65567c0a2df85c2600611')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD
index d0f3fda38..31206022c 100644
--- a/extra/kdeedu-kstars/PKGBUILD
+++ b/extra/kdeedu-kstars/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167814 2012-10-03 14:43:26Z andrea $
+# $Id: PKGBUILD 170773 2012-11-11 09:39:58Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kstars
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Desktop Planetarium"
 url="http://kde.org/applications/education/kstars/"
@@ -10,10 +10,10 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libindi')
-makedepends=('cmake' 'automoc4' 'eigen')
+makedepends=('cmake' 'automoc4' 'eigen' 'mesa')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz")
-sha1sums=('144409ebfb2a2c3d040ab4a1ad130b5677dd23b6')
+sha1sums=('35f88135c42483144d17013c520243e7a77bde95')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD
index 5f9808f73..9f75dff3f 100644
--- a/extra/kdeedu-ktouch/PKGBUILD
+++ b/extra/kdeedu-ktouch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167815 2012-10-03 14:43:31Z andrea $
+# $Id: PKGBUILD 170632 2012-11-09 08:28:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-ktouch
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Touch Typing Tutor"
 url="http://kde.org/applications/education/ktouch/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz")
-sha1sums=('99133b52b29a7ee4d3dd6da664ad8c47fd637b71')
+sha1sums=('921f60e26097c63373b157a5c4b7ca53512d95e6')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD
index a5bf70a1f..6c8220eee 100644
--- a/extra/kdeedu-kturtle/PKGBUILD
+++ b/extra/kdeedu-kturtle/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167816 2012-10-03 14:43:37Z andrea $
+# $Id: PKGBUILD 170633 2012-11-09 08:28:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kturtle
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Educational Programming Environment"
 url="http://kde.org/applications/education/kturtle/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz")
-sha1sums=('c30e80f71dc622b818d6539054f91584b0dce444')
+sha1sums=('c1077d3190c931b740360be4b1b343e279f94b6a')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD
index 7d823b9da..f3dfbbcac 100644
--- a/extra/kdeedu-kwordquiz/PKGBUILD
+++ b/extra/kdeedu-kwordquiz/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167817 2012-10-03 14:43:43Z andrea $
+# $Id: PKGBUILD 170634 2012-11-09 08:28:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kwordquiz
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Flash Card Trainer"
 url="http://kde.org/applications/education/kwordquiz/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz")
-sha1sums=('53c702a88bd9cb0c8fba54d6353d06005760bd71')
+sha1sums=('bacfc371da7c0612fa8bf730280b12f0e29bdc46')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD
index f3000c88a..791d04862 100644
--- a/extra/kdeedu-marble/PKGBUILD
+++ b/extra/kdeedu-marble/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167781 2012-10-03 14:40:47Z andrea $
+# $Id: PKGBUILD 170599 2012-11-09 08:26:23Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-marble
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Desktop Globe"
 url="http://kde.org/applications/education/marble/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd')
 optdepends=('gpsd: gps support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz")
-sha1sums=('71f0ab4845a7bf5505eba0bf5b654720a59d4028')
+sha1sums=('f15e058468b5edcb0a2d274c50ef9ef98e22ad34')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD
index df3d3e7ab..6e637a89b 100644
--- a/extra/kdeedu-pairs/PKGBUILD
+++ b/extra/kdeedu-pairs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167818 2012-10-03 14:43:49Z andrea $
+# $Id: PKGBUILD 170635 2012-11-09 08:28:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-pairs
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A memory and pairs game for KDE"
 url="https://projects.kde.org/projects/kde/kdeedu/pairs"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/pairs-${pkgver}.tar.xz")
-sha1sums=('8ed40356ee7df8059935e945e070667dfffcc77b')
+sha1sums=('ad0567efd16cd024a59acd399bbbd549118334d7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD
index fd4189584..18d00efde 100644
--- a/extra/kdeedu-parley/PKGBUILD
+++ b/extra/kdeedu-parley/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167819 2012-10-03 14:43:55Z andrea $
+# $Id: PKGBUILD 170636 2012-11-09 08:28:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-parley
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Vocabulary Trainer"
 url="http://kde.org/applications/education/parley/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz")
-sha1sums=('397e58d783f75f48e8cf5a3a35f1fa441010b50b')
+sha1sums=('98f10445a5d983ea81a812e288bc00991b9b247c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD
index 06753ef96..4b0c03689 100644
--- a/extra/kdeedu-rocs/PKGBUILD
+++ b/extra/kdeedu-rocs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167820 2012-10-03 14:43:59Z andrea $
+# $Id: PKGBUILD 170637 2012-11-09 08:28:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-rocs
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Rocs Graph Theory"
 url="http://kde.org/applications/education/rocs/"
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'boost')
 source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz")
-sha1sums=('8c3ba1c2b15a795147110f246853217d301f903b')
+sha1sums=('bbd95c3e058c106e8b88a132a642c6af39c1c10d')
 options=('!makeflags')
 
 build() {
diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD
index 0b2e19d7c..82885e6cf 100644
--- a/extra/kdeedu-step/PKGBUILD
+++ b/extra/kdeedu-step/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167821 2012-10-03 14:44:05Z andrea $
+# $Id: PKGBUILD 170760 2012-11-11 00:05:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-step
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Interactive Physical Simulator"
 url="http://kde.org/applications/education/step/"
@@ -10,10 +10,10 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libqalculate' 'gsl')
-makedepends=('cmake' 'automoc4' 'eigen')
+makedepends=('cmake' 'automoc4' 'eigen' 'mesa')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz")
-sha1sums=('7545eee07323935773466cfd3a241fbd8786ef13')
+sha1sums=('822b8f7266f7bd8170db1c02510480bb98d03e6f')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD
index 556b94758..de5205c73 100644
--- a/extra/kdegames/PKGBUILD
+++ b/extra/kdegames/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167822 2012-10-03 14:44:33Z andrea $
+# $Id: PKGBUILD 170639 2012-11-09 08:28:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -43,16 +43,16 @@ pkgname=('kdegames-bomber'
          'kdegames-libkmahjongg'
          'kdegames-lskat'
          'kdegames-palapeli')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 makedepends=('cmake' 'automoc4' 'twisted' 'kdebindings-python2'
-             'openal')
+             'openal' 'mesa')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('a751f6b9ed6c24f8a420d6737be87f2bbb0c2cb3')
+sha1sums=('c5b61b6df2d6683fa96f294bebeb09b1403ce6d8')
 
 build() {
 	cd $srcdir
diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD
index 58fde8283..2c947fee0 100644
--- a/extra/kdegraphics-gwenview/PKGBUILD
+++ b/extra/kdegraphics-gwenview/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167823 2012-10-03 14:44:39Z andrea $
+# $Id: PKGBUILD 170748 2012-11-10 22:28:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-gwenview
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A fast and easy to use image viewer for KDE"
 url="http://kde.org/applications/graphics/gwenview/"
@@ -10,11 +10,11 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegraphics')
 depends=('kdebase-lib' 'libkipi')
-makedepends=('cmake' 'automoc4')
+makedepends=('cmake' 'automoc4' 'mesa')
 optdepends=('kipi-plugins: extra plugins to share photos')
 install=$pkgname.install
 source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz")
-sha1sums=('5a48c195d4c305f166b2d9fc1a483457c4698156')
+sha1sums=('ec383c32b5a277e7f9567af67c48bcf19b6128e8')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD
index 1b5626b30..0f610c2eb 100644
--- a/extra/kdegraphics-kamera/PKGBUILD
+++ b/extra/kdegraphics-kamera/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168467 2012-10-12 06:40:18Z andrea $
+# $Id: PKGBUILD 170641 2012-11-09 08:28:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kamera
-pkgver=4.9.2
-pkgrel=2
+pkgver=4.9.3
+pkgrel=1
 pkgdesc="Configure Kamera"
 url="http://kde.org/applications/graphics/kamera/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'libgphoto2')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz")
-sha1sums=('5b5b68b8996fdb1cb6541704c03d36cf506e8827')
+sha1sums=('add7f186d05fe5896f1a6c0b470f6539aa803a42')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD
index b1bed1554..53c9dff2e 100644
--- a/extra/kdegraphics-kcolorchooser/PKGBUILD
+++ b/extra/kdegraphics-kcolorchooser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167825 2012-10-03 14:44:49Z andrea $
+# $Id: PKGBUILD 170642 2012-11-09 08:28:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kcolorchooser
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Color Chooser"
 url="http://kde.org/applications/graphics/kcolorchooser/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz")
-sha1sums=('7e34705505140cc3e6085fc057365ce4cab2c0a0')
+sha1sums=('777c6158427906609d6ad429a88c53ba239b18d2')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD
index 43e7ebfd1..182562cd6 100644
--- a/extra/kdegraphics-kgamma/PKGBUILD
+++ b/extra/kdegraphics-kgamma/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167826 2012-10-03 14:44:53Z andrea $
+# $Id: PKGBUILD 170643 2012-11-09 08:28:58Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kgamma
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A monitor calibration tool"
 url="http://kde.org/applications/graphics/kgamma/"
@@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'libxxf86vm')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz")
-sha1sums=('553d40c87000c57a10f64f01313ca519148530da')
+sha1sums=('c53d48a1b883a26b084fa91c016c3a543e067d6c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD
index 3ecdca0e9..d721144da 100644
--- a/extra/kdegraphics-kolourpaint/PKGBUILD
+++ b/extra/kdegraphics-kolourpaint/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167827 2012-10-03 14:44:58Z andrea $
+# $Id: PKGBUILD 170644 2012-11-09 08:29:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kolourpaint
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Paint Program"
 url="http://kde.org/applications/graphics/kolourpaint/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz")
-sha1sums=('a7a8fb6c63dc87e239bb54c2f178d2d5412296f3')
+sha1sums=('245706ffc337a44b55f88010088a7531ac37c4fe')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD
index 7e37f68da..c158c5335 100644
--- a/extra/kdegraphics-kruler/PKGBUILD
+++ b/extra/kdegraphics-kruler/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167828 2012-10-03 14:45:04Z andrea $
+# $Id: PKGBUILD 170645 2012-11-09 08:29:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kruler
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Screen Ruler"
 url="http://kde.org/applications/graphics/kruler/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz")
-sha1sums=('59fe8c2246d3d7e8c8307a4d72fae78caec20681')
+sha1sums=('7ca618561f7bb96db04e0978d69dc0984f892bd3')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD
index b000ff708..216f4f56e 100644
--- a/extra/kdegraphics-ksaneplugin/PKGBUILD
+++ b/extra/kdegraphics-ksaneplugin/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167829 2012-10-03 14:45:07Z andrea $
+# $Id: PKGBUILD 170646 2012-11-09 08:29:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksaneplugin
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A scan plugin that implements the scanning"
 url="https://projects.kde.org/projects/kde/kdegraphics/ksaneplugin"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz")
-sha1sums=('91b1ef55620bc621a81d0e75643e47d0a115e524')
+sha1sums=('0e403a2bd1d6f05c8bd958197246b4a9d6223bce')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD
index 81c9f60d9..5f55148d5 100644
--- a/extra/kdegraphics-ksnapshot/PKGBUILD
+++ b/extra/kdegraphics-ksnapshot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167830 2012-10-03 14:45:13Z andrea $
+# $Id: PKGBUILD 170647 2012-11-09 08:29:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksnapshot
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Screen Capture Program"
 url="http://kde.org/applications/graphics/ksnapshot/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('kipi-plugins')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz")
-sha1sums=('3496d070420f8aff10e69c98728c5c1ca34f6d47')
+sha1sums=('61bc95baed704821d597686ccb16e9bba40965fe')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD
index 73c6a0564..3c2738c8f 100644
--- a/extra/kdegraphics-mobipocket/PKGBUILD
+++ b/extra/kdegraphics-mobipocket/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167831 2012-10-03 14:45:19Z andrea $
+# $Id: PKGBUILD 170648 2012-11-09 08:29:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-mobipocket
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A collection of plugins to handle mobipocket files"
 url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket"
@@ -15,7 +15,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('81590d0958cebc3a052a4d973334f3fe4a9eabe4')
+sha1sums=('a7a5e63c8a4df1f079fb9381106df2f10b6f47ba')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD
index edc6f651d..76ddef2c1 100644
--- a/extra/kdegraphics-okular/PKGBUILD
+++ b/extra/kdegraphics-okular/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167768 2012-10-03 14:39:31Z andrea $
+# $Id: PKGBUILD 170588 2012-11-09 08:25:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-okular
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='Document Viewer'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('kdegraphics-mobipocket: mobipocket support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz")
-sha1sums=('2260afa2f0b7bf6afb2da5129fefd95b144dcd74')
+sha1sums=('33e6f1c3f282bf384d09f3fd1d535a35af572df6')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD
index 075c2263c..bc8868a93 100644
--- a/extra/kdegraphics-strigi-analyzer/PKGBUILD
+++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167832 2012-10-03 14:45:23Z andrea $
+# $Id: PKGBUILD 170649 2012-11-09 08:29:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-strigi-analyzer
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Strigi analyzers for various graphics file formats"
 url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-strigi-analyzer"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('d9923f5e52fc58c50bf83d7854ce1ec615407753')
+sha1sums=('72739f16b23fb2ea51fd2a1f64d350214649e898')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD
index e2659e5c9..6459ff4c9 100644
--- a/extra/kdegraphics-svgpart/PKGBUILD
+++ b/extra/kdegraphics-svgpart/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167833 2012-10-03 14:45:27Z andrea $
+# $Id: PKGBUILD 170650 2012-11-09 08:29:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-svgpart
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A KPart for viewing SVGs"
 url="https://projects.kde.org/projects/kde/kdegraphics/svgpart"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz")
-sha1sums=('06584ae6652d0ea2265c47599dbb6789c973f1fc')
+sha1sums=('b2fff50f76dcaaf0d2505679060cfa3175731b48')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD
index 55ec1426e..38f184ac5 100644
--- a/extra/kdegraphics-thumbnailers/PKGBUILD
+++ b/extra/kdegraphics-thumbnailers/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167835 2012-10-03 14:45:31Z andrea $
+# $Id: PKGBUILD 170651 2012-11-09 08:29:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-thumbnailers
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Thumbnailers for various graphics file formats"
 url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-thumbnailers"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('c87d00fa6af8fd1d57b0da74cdb382dd7d6f5311')
+sha1sums=('d14e20809c3d6703ba7029169fa2fa83d04ba5e2')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD
index b4ee9f2cc..b8e4ebbe7 100644
--- a/extra/kdelibs3/PKGBUILD
+++ b/extra/kdelibs3/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 168525 2012-10-13 06:35:43Z eric $
+# $Id: PKGBUILD 169753 2012-10-27 23:42:09Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kdelibs3
 pkgver=3.5.10
-pkgrel=14
+pkgrel=15
 pkgdesc='KDE3 Core Libraries'
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
 depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD
index 1e463204b..520ca3c7b 100644
--- a/extra/kdemultimedia-audiocd-kio/PKGBUILD
+++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167836 2012-10-03 14:45:35Z andrea $
+# $Id: PKGBUILD 170652 2012-11-09 08:29:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-audiocd-kio
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Kioslave for accessing audio CDs"
 url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio'
@@ -14,7 +14,7 @@ groups=('kde' 'kdemultimedia')
 replaces=('kdemultimedia-kioslave')
 conflicts=('kdemultimedia-kioslave')
 source=("http://download.kde.org/stable/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz")
-sha1sums=('822b2a151cb03cdf2708d3731a07b0fa23ee8e34')
+sha1sums=('55628ce0d00e98067abba2eb33e210a273bc404b')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD
index 79e79db3f..cb5457e41 100644
--- a/extra/kdemultimedia-dragonplayer/PKGBUILD
+++ b/extra/kdemultimedia-dragonplayer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167837 2012-10-03 14:45:41Z andrea $
+# $Id: PKGBUILD 170653 2012-11-09 08:29:30Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-dragonplayer
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A multimedia player where the focus is on simplicity, instead of
 features"
@@ -14,7 +14,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/dragon-${pkgver}.tar.xz")
-sha1sums=('ebe0021892c76f2b7ffd637ebf035801851ed3b5')
+sha1sums=('a5b8319414c6d4980ee4c4f5cd33318c499597b3')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
index 3fa6f937b..c48bff925 100644
--- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
+++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167838 2012-10-03 14:45:44Z andrea $
+# $Id: PKGBUILD 170654 2012-11-09 08:29:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-ffmpegthumbs
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='FFmpeg-based thumbnail creator for video files'
 url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs'
@@ -12,7 +12,7 @@ groups=('kde' 'kdemultimedia')
 depends=('kdelibs' 'ffmpeg')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz")
-sha1sums=('a0083c2cda9c194663676b70beb6d23dba0d4f1d')
+sha1sums=('f2cecd0677b9d57e60af394b4ba4815bf95a10d0')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD
index 8ee70ba24..3fddae263 100644
--- a/extra/kdemultimedia-juk/PKGBUILD
+++ b/extra/kdemultimedia-juk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167839 2012-10-03 14:45:51Z andrea $
+# $Id: PKGBUILD 170655 2012-11-09 08:29:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-juk
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='A jukebox, tagger and music collection manager'
 url='http://kde.org/applications/multimedia/juk/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'taglib')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/juk-${pkgver}.tar.xz")
-sha1sums=('64e0c7ea030434cba9bdc9db05901aa81e1aaa97')
+sha1sums=('e5fd939da08de0ca0b080812b36ef6eef02036fd')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD
index f92e467cb..36b582e1a 100644
--- a/extra/kdemultimedia-kmix/PKGBUILD
+++ b/extra/kdemultimedia-kmix/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167840 2012-10-03 14:45:56Z andrea $
+# $Id: PKGBUILD 170656 2012-11-09 08:29:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-kmix
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="KDE volume control program"
 url='http://kde.org/applications/multimedia/kmix/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz")
-sha1sums=('581955c6a097c69f3cf511a6c55c58d2d2d9ceb7')
+sha1sums=('9eeb903eeaa464b4f15205b4a7c4c204e13a56d7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD
index 642edcc6c..99b6ded30 100644
--- a/extra/kdemultimedia-kscd/PKGBUILD
+++ b/extra/kdemultimedia-kscd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167841 2012-10-03 14:46:02Z andrea $
+# $Id: PKGBUILD 170657 2012-11-09 08:29:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-kscd
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="KDE CD player"
 url='http://kde.org/applications/multimedia/kscd/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'libmusicbrainz3')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kscd-${pkgver}.tar.xz")
-sha1sums=('9130d1f35713f5ebb2f81a4f1b91f3fe16f18861')
+sha1sums=('42aa1db2d61fbb3e17b605aeb3f16517f3237a7a')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD
index 920088785..d55ea05c8 100644
--- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD
+++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167842 2012-10-03 14:46:05Z andrea $
+# $Id: PKGBUILD 170658 2012-11-09 08:29:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-mplayerthumbs
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="MPlayer based thumbnail generator for video files"
 url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs'
@@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime' 'mplayer')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/mplayerthumbs-${pkgver}.tar.xz")
-sha1sums=('a70d8f522d31529444ba957cdadd97c22dab7090')
+sha1sums=('6ff6a8d536bf8fda538f68d6da90525832d0b594')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD
deleted file mode 100644
index 7b73b977f..000000000
--- a/extra/kdemultimedia/PKGBUILD
+++ /dev/null
@@ -1,111 +0,0 @@
-# $Id: PKGBUILD 163152 2012-07-08 09:31:34Z ibiru $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdemultimedia
-pkgname=('kdemultimedia-dragonplayer'
-         'kdemultimedia-ffmpegthumbs'
-         'kdemultimedia-juk'
-         'kdemultimedia-kioslave'
-         'kdemultimedia-kmix'
-         'kdemultimedia-kscd'
-         'kdemultimedia-mplayerthumbs')
-pkgver=4.8.4
-pkgrel=2
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-makedepends=('cmake' 'automoc4' 'kdelibs' 'ffmpeg' 'mplayer' 'libpulse'
-             'libmusicbrainz3' 'taglib' 'libcanberra')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'mplayerthumbs.config'
-        'ffmpeg0.11.patch')
-sha1sums=('dac721e82308a6347d578361e25da7c466a26ba7'
-          'ba016fa2563c14ffcba852c62506b66bfc6ee683'
-          '48331f7e2dab760c20708b81fe6c4d47c83a63e7')
-
-build() {
-    cd ${srcdir}/${pkgbase}-${pkgver}/ffmpegthumbs
-    patch -p1 -i ${srcdir}/ffmpeg0.11.patch
-
-    cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DWITH_TunePimp=OFF
-	make
-}
-
-package_kdemultimedia-dragonplayer() {
-	pkgdesc='Video Player'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/multimedia/dragonplayer/"
-	install='kdemultimedia-dragonplayer.install'
-	cd $srcdir/build/dragonplayer
-	make DESTDIR=$pkgdir install
-    cd $srcdir/build/dragonplayer/doc
-    make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-ffmpegthumbs() {
-	pkgdesc='Video Files (ffmpegthumbs)'
-	depends=('kdebase-runtime' 'ffmpeg')
-	install='kdemultimedia.install'
-	cd $srcdir/build/ffmpegthumbs
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-juk() {
-	pkgdesc='Music Player'
-    depends=('kdebase-runtime' 'taglib')
-	url="http://kde.org/applications/multimedia/juk"
-	install='kdemultimedia.install'
-	cd $srcdir/build/juk
-	make DESTDIR=$pkgdir install
-    cd $srcdir/build/juk/doc
-    make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-kioslave() {
-	pkgdesc='Audio CD Browser'
-	depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia')
-	conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
-	replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
-	for i in kioslave libkcddb libkcompactdisc; do
-		cd $srcdir/build/${i}
-		make DESTDIR=$pkgdir install
-	done
-}
-
-package_kdemultimedia-kmix() {
-	pkgdesc='Sound Mixer'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/multimedia/kmix"
-	install='kdemultimedia.install'
-	cd $srcdir/build/kmix
-	make DESTDIR=$pkgdir install
-    cd $srcdir/build/kmix/doc
-    make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-kscd() {
-	pkgdesc='CD Player'
-	depends=('kdebase-runtime' 'libmusicbrainz3')
-	url="http://kde.org/applications/multimedia/kscd"
-	install='kdemultimedia.install'
-	cd $srcdir/build/kscd
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-mplayerthumbs() {
-	pkgdesc='Video Files (MPlayerThumbs)'
-	depends=('kdebase-runtime' 'mplayer')
-	replaces=('mplayerthumbs')
-	conflicts=('mplayerthumbs')
-	cd $srcdir/build/mplayerthumbs
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs
-}
diff --git a/extra/kdemultimedia/ffmpeg0.11.patch b/extra/kdemultimedia/ffmpeg0.11.patch
deleted file mode 100644
index 527ac3992..000000000
--- a/extra/kdemultimedia/ffmpeg0.11.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Christoph Feck <christoph@maxiom.de>
-Date: Tue, 29 May 2012 13:53:18 +0000
-Subject: Two deprecated calls have been removed from ffmpeg 0.11.
-X-Git-Tag: v4.8.80
-X-Git-Url: http://quickgit.kde.org/?p=ffmpegthumbs.git&amp;a=commitdiff&amp;h=4f03b20614c122e3e14473d42a000c0bffdce39c
----
-Two deprecated calls have been removed from ffmpeg 0.11.
-
-BUG:300732
----
-
-
---- a/ffmpegthumbnailer/moviedecoder.cpp
-+++ b/ffmpegthumbnailer/moviedecoder.cpp
-@@ -52,12 +52,11 @@ MovieDecoder::~MovieDecoder()
- void MovieDecoder::initialize(const QString& filename)
- {
-     av_register_all();
--    avcodec_init();
-     avcodec_register_all();
- 
-     QFileInfo fileInfo(filename);
- 
--    if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, fileInfo.absoluteFilePath().toUtf8().data(), NULL, 0, NULL) != 0) {
-+    if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, fileInfo.absoluteFilePath().toLocal8Bit().data(), NULL, NULL) != 0) {
-         kDebug() <<  "Could not open input file: " << fileInfo.absoluteFilePath();
-         return;
-     }
-
diff --git a/extra/kdemultimedia/kdemultimedia-dragonplayer.install b/extra/kdemultimedia/kdemultimedia-dragonplayer.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/extra/kdemultimedia/kdemultimedia-dragonplayer.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/kdemultimedia/kdemultimedia.install b/extra/kdemultimedia/kdemultimedia.install
deleted file mode 100644
index e70c054ec..000000000
--- a/extra/kdemultimedia/kdemultimedia.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kdemultimedia/mplayerthumbs.config b/extra/kdemultimedia/mplayerthumbs.config
deleted file mode 100644
index 761a17953..000000000
--- a/extra/kdemultimedia/mplayerthumbs.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[MPlayerThumbsCfg]
-backend=0
diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD
index da60f5049..69254eee8 100644
--- a/extra/kdenetwork/PKGBUILD
+++ b/extra/kdenetwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167843 2012-10-03 14:46:17Z andrea $
+# $Id: PKGBUILD 170699 2012-11-09 20:50:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -10,21 +10,26 @@ pkgname=('kdenetwork-filesharing'
          'kdenetwork-kppp'
          'kdenetwork-krdc'
          'kdenetwork-krfb')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
-makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
+makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp'
 	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
     'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
     'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('6779039e5354fae02cf7faa3442385b95befb430')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
+        'use-libotr3.patch')
+sha1sums=('2a0b31a292f4805224fdb0ba26a9426e1126f4f6'
+          '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384')
 
 build() {
-    cd "${srcdir}"
+    cd ${pkgbase}-${pkgver}
+    patch -p1 -i "${srcdir}"/use-libotr3.patch
+    cd ../
+
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \
@@ -66,7 +71,7 @@ package_kdenetwork-kget() {
 
 package_kdenetwork-kopete() {
 	pkgdesc='Instant Messenger'
-	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn'
+	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn'
 	         'libidn' 'qimageblitz' 'libgadu' 'mediastreamer')
 	url="http://kde.org/applications/internet/kopete/"
 	install='kdenetwork-kopete.install'
diff --git a/extra/kdenetwork/use-libotr3.patch b/extra/kdenetwork/use-libotr3.patch
new file mode 100644
index 000000000..1e96c98d6
--- /dev/null
+++ b/extra/kdenetwork/use-libotr3.patch
@@ -0,0 +1,71 @@
+diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake
+--- a/kopete/cmake/modules/FindLibOTR.cmake	2012-08-12 18:08:59.000000000 -0600
++++ b/kopete/cmake/modules/FindLibOTR.cmake	2012-11-09 12:14:24.251450904 -0700
+@@ -13,13 +13,13 @@
+     SET(LIBOTR_FIND_QUIETLY TRUE)
+ ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY)
+ 
+-FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h)
++FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h)
+ 
+-FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr)
++FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3)
+ 
+-# Determine version information from libotr/version.h
++# Determine version information from libotr3/version.h
+ IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY )
+-  EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output)
++  EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output)
+   STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}")
+   STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}")
+   # Check if version is at least 3.2.0
+diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h
+--- a/kopete/plugins/otr/authenticationwizard.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/authenticationwizard.h	2012-11-09 12:15:11.181265336 -0700
+@@ -26,7 +26,7 @@
+   */
+ 
+ extern "C"{
+-#include "libotr/proto.h"
++#include "libotr3/proto.h"
+ }
+ 
+ #include "kopetechatsession.h"
+diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h
+--- a/kopete/plugins/otr/otrlchatinterface.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/otrlchatinterface.h	2012-11-09 12:16:10.141032744 -0700
+@@ -36,10 +36,10 @@
+ #include "authenticationwizard.h"
+ 
+ extern "C" {
+-#include <libotr/privkey.h>
+-#include <libotr/proto.h>
+-#include <libotr/message.h>
+-#include <libotr/userstate.h>
++#include <libotr3/privkey.h>
++#include <libotr3/proto.h>
++#include <libotr3/message.h>
++#include <libotr3/userstate.h>
+ }
+ 
+ 
+diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h
+--- a/kopete/plugins/otr/otrlconfinterface.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/otrlconfinterface.h	2012-11-09 12:15:56.961084991 -0700
+@@ -32,11 +32,11 @@
+ #include <kopetechatsession.h>
+ 
+ extern "C" {
+-#include <libotr/privkey.h>
+-#include <libotr/proto.h>
+-#include <libotr/message.h>
+-#include <libotr/userstate.h>
+-#include <libotr/context.h>
++#include <libotr3/privkey.h>
++#include <libotr3/proto.h>
++#include <libotr3/message.h>
++#include <libotr3/userstate.h>
++#include <libotr3/context.h>
+ }
+ 
+ class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject
diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD
index 51b66e09d..69035d0d6 100644
--- a/extra/kdepim-runtime/PKGBUILD
+++ b/extra/kdepim-runtime/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 167765 2012-10-03 14:39:17Z andrea $
+# $Id: PKGBUILD 171973 2012-11-25 15:28:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepim-runtime
-pkgver=4.9.2
-pkgrel=1
+pkgver=4.9.3
+pkgrel=2
 pkgdesc='Extends the functionality of kdepim'
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdepim-runtime'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'kdepimlibs' 'libkgapi')
 makedepends=('cmake' 'automoc4' 'boost')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('4eeef5c706ea786d35ebaddf6c46084cf666680a')
+sha1sums=('85e293b3894e5a6c529c33e5ed72964a0172e920')
 
 build() {
     cd "${srcdir}"
diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index b962a1f29..c9cec4cab 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167844 2012-10-03 14:46:36Z andrea $
+# $Id: PKGBUILD 170659 2012-11-09 08:29:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -20,7 +20,7 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-ktimetracker'
          'kdepim-ktnef'
          'kdepim-libkdepim')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org'
@@ -30,7 +30,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
              'kde-agent')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'fix-build.patch')
-sha1sums=('49e33e54e61bc499e54cdcd3470719cb4c22d2be'
+sha1sums=('5f0786a85db599a7b566a5d02d19c55222a64bcc'
           '974056ad2c3a00b33a8ac9403b369ab636000832')
 
 build() {
diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD
index c909790c1..9d446d43c 100644
--- a/extra/kdepimlibs/PKGBUILD
+++ b/extra/kdepimlibs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 167759 2012-10-03 14:38:52Z andrea $
+# $Id: PKGBUILD 170580 2012-11-09 08:25:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepimlibs
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="KDE PIM Libraries"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison')
 makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl')
 install='kdepimlibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('247820f8f8de5bcd66e19c45afc2033e50f0fd01')
+sha1sums=('a1aa00a83cfd7c1998927dcedc3843a0a0006740')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD
index e29894932..e12b3fc04 100644
--- a/extra/kdeplasma-addons/PKGBUILD
+++ b/extra/kdeplasma-addons/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167845 2012-10-03 14:46:47Z andrea $
+# $Id: PKGBUILD 171969 2012-11-25 15:04:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -75,8 +75,8 @@ pkgname=('kdeplasma-addons-applets-bball'
          'kdeplasma-addons-wallpapers-potd'
          'kdeplasma-addons-wallpapers-virus'
          'kdeplasma-addons-wallpapers-weather')
-pkgver=4.9.2
-pkgrel=1
+pkgver=4.9.3
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
@@ -84,7 +84,7 @@ groups=('kde' 'kdeplasma-addons')
 makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen'
              'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'qjson')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('9f6493d52beb2ed723038e60f5f9ab53beec4e44')
+sha1sums=('e8b642b325acf2f7c8819e57176bbc2357cf78bd')
 
 build() {
 	mkdir build
diff --git a/extra/kdeplasma-addons/fix-spell-crash.patch b/extra/kdeplasma-addons/fix-spell-crash.patch
new file mode 100644
index 000000000..75c26c6ad
--- /dev/null
+++ b/extra/kdeplasma-addons/fix-spell-crash.patch
@@ -0,0 +1,267 @@
+commit 124e35885b8cd1b593b7b83a070bd0bdb5758661
+Author: Simeon Bird <bladud@gmail.com>
+Date:   Fri Oct 19 21:16:34 2012 -0400
+
+    Fix the plasma spellchecker's 'foreign language' support.
+    Previously this caused segfaults (even if not used) because
+    it called setLanguage(), which is not thread-safe, in match().
+    
+    Instead, this patch constructs a new speller safely for each new
+    language, without deleting the old one. Old spellers are instead
+    deleted on the teardown() signal.
+    
+    While we're at it, amend the language detection so that the user
+    can type natural language names (eg, 'german') and have the
+    spell-checker find the right language.
+    
+    REVIEW: 106244
+    BUG: 303831
+    BUG: 264779
+    FIXED-IN: 4.9.3
+
+diff --git a/runners/spellchecker/spellcheck.cpp b/runners/spellchecker/spellcheck.cpp
+index 672732d..cc6aeb2 100644
+--- a/runners/spellchecker/spellcheck.cpp
++++ b/runners/spellchecker/spellcheck.cpp
+@@ -24,6 +24,7 @@
+ // #include <KDebug>
+ #include <KGlobal>
+ #include <KIcon>
++#include <QSet>
+ 
+ SpellCheckRunner::SpellCheckRunner(QObject* parent, const QVariantList &args)
+     : Plasma::AbstractRunner(parent, args)
+@@ -43,13 +44,64 @@ void SpellCheckRunner::init()
+ {
+     Plasma::AbstractRunner::init();
+ 
+-    //store all language names, makes it posible to type "spell german TERM" if english locale is set
++    //Connect prepare and teardown signals
++    connect(this, SIGNAL(prepare()), this, SLOT(loaddata()));
++    connect(this, SIGNAL(teardown()), this, SLOT(destroydata()));
++}
++
++//Load a default dictionary and some locale names
++void SpellCheckRunner::loaddata()
++{
++    //Load the default speller, with the default language
++    if (!m_spellers.contains("")) {
++        m_spellers[""] = QSharedPointer<Sonnet::Speller> (new Sonnet::Speller(""));
++    }
++    //store all language names, makes it possible to type "spell german TERM" if english locale is set
++    //Need to construct a map between natual language names and names the spell-check recognises.
+     KLocale *locale = KGlobal::locale();
+-    QStringList codes = locale->allLanguagesList();
+-    foreach (const QString &code, codes) {
+-        const QString name = locale->languageCodeToName(code);
+-        m_languages[name.toLower()] = code;
++    const QStringList avail = m_spellers[""]->availableLanguages();
++    //We need to filter the available languages so that we associate the natural language
++    //name (eg. 'german') with one sub-code.
++    QSet<QString> families;
++    //First get the families
++    foreach (const QString &code, avail) {
++        families +=code.left(2);
++    }
++    //Now for each family figure out which is the main code.
++    foreach (const QString &fcode,families) {
++        QStringList family = avail.filter(fcode);
++        QString code;
++        //If we only have one code, use it.
++        //If a string is the default language, use it
++        if (family.contains(m_spellers[""]->language())) {
++            code = m_spellers[""]->language();
++        } else if (fcode == QLatin1String("en")) {
++            //If the family is english, default to en_US.
++            if (family.contains("en_US")) {
++                code = QLatin1String("en_US");
++            }
++        } else if (family.contains(fcode+QLatin1String("_")+fcode.toUpper())) {
++            //If we have a speller of the form xx_XX, try that.
++            //This gets us most European languages with more than one spelling.
++            code =  fcode+QLatin1String("_")+fcode.toUpper();
++        } else {
++            //Otherwise, pick the first value as it is highest priority.
++            code = family.first();
++        }
++        //Finally, add code to the map.
++        const QString name = locale->languageCodeToName(fcode);
++        if (!name.isEmpty()) {
++            m_languages[name.toLower()] = code;
++        }
++//         kDebug() << "SPELL lang: " << fcode<< "::"<< name << "  :  " << code;
+     }
++
++}
++
++void SpellCheckRunner::destroydata()
++{
++    //Clear the data arrays to save memory
++    m_spellers.clear();
+ }
+ 
+ void SpellCheckRunner::reloadConfiguration()
+@@ -73,13 +125,52 @@ void SpellCheckRunner::reloadConfiguration()
+     setSyntaxes(syns);
+ }
+ 
++/* Take the input query, split into a list, and see if it contains a language to spell in.
++ * Return the empty string if we can't match a language. */
++QString SpellCheckRunner::findlang(const QStringList& terms)
++{
++    //If first term is a language code (like en_GB), set it as the spell-check language
++    if (terms.count() >= 1 && m_spellers[""]->availableLanguages().contains(terms[0])) {
++        return terms[0];
++    }
++    //If we have two terms and the first is a language name (eg 'french'),
++    //set it as the available language
++    else if (terms.count() >=2) {
++        QString code;
++        {
++            //Is this a descriptive language name?
++            QMap<QString, QString>::const_iterator it = m_languages.constFind(terms[0].toLower());
++            if (it != m_languages.constEnd()) {
++                code = *it;
++            }
++            //Maybe it is a subset of a language code?
++            else {
++                QStringList codes = QStringList(m_languages.values()).filter(terms[0]);
++                if (!codes.isEmpty()) {
++                    code = codes.first();
++                }
++            }
++        }
++
++        if (!code.isEmpty()) {
++            //We found a valid language! Check still available
++            const QStringList avail = m_spellers[""]->availableLanguages();
++            //Does the spell-checker like it?
++            if (avail.contains(code)) {
++                return code;
++            }
++        }
++        //FIXME: Support things like 'british english' or 'canadian french'
++    }
++    return QLatin1String("");
++}
++
+ void SpellCheckRunner::match(Plasma::RunnerContext &context)
+ {
+     if (!context.isValid()) {
+         return;
+     }
+ 
+-
+     const QString term = context.query();
+     QString query = term;
+ 
+@@ -88,53 +179,46 @@ void SpellCheckRunner::match(Plasma::RunnerContext &context)
+         if (query.left(len) != m_triggerWord) {
+             return;
+         }
+-
+-        QString language = m_speller.defaultLanguage();
+         query = query.mid(len).trimmed();
+-        QStringList terms = query.split(' ');
+-
+-        //two terms specified, check if first is a language
+-        QString customLanguage;
+-        if (terms.count() == 2) {
+-            customLanguage = terms[0];
+-            query = terms[1];
+-        }
+-        //three terms specified, check if first two are a language, e.g. "american english"
+-        if (terms.count() == 3) {
+-            customLanguage = terms[0] + ' ' + terms[1];
+-            query = terms[2];
+-        }
+-
+-        if (!customLanguage.isEmpty()) {
+-            language = customLanguage;
+-            m_speller.setLanguage(language);
++    }
+ 
+-            //not valid, maybe it is a language name, not a code
+-            if (!m_speller.isValid()) {
+-                QHash<QString, QString>::const_iterator it = m_languages.constFind(language.toLower());
+-                //is a valid language name
+-                if (it != m_languages.constEnd()) {
+-                    language = *it;
++    //Pointer to speller object with our chosen language
++    QSharedPointer<Sonnet::Speller> speller = m_spellers[""];
++
++    if (speller->isValid()) {
++        QStringList terms = query.split(' ', QString::SkipEmptyParts);
++        QString lang = findlang(terms);
++        //If we found a language, create a new speller object using it.
++        if (!lang.isEmpty()) {
++            //First term is the language
++            terms.removeFirst();
++            //New speller object if we don't already have one
++            if (!m_spellers.contains(lang)) {
++                QMutexLocker lock (&m_spellLock);
++                //Check nothing happened while we were acquiring the lock
++                if (!m_spellers.contains(lang)) {
++                    m_spellers[lang] = QSharedPointer<Sonnet::Speller>(new Sonnet::Speller(lang));
+                 }
+             }
++            speller = m_spellers[lang];
++            //Rejoin the strings
++            query = terms.join(QLatin1String(" "));
+         }
+-
+-        m_speller.setLanguage(language);
+     }
+ 
+-    if (query.size() < 3) {
++    if (query.size() < 2) {
+         return;
+     }
+ 
+     Plasma::QueryMatch match(this);
+     match.setType(Plasma::QueryMatch::InformationalMatch);
+ 
+-    if (m_speller.isValid()) {
++    if (speller->isValid()) {
+         QStringList suggestions;
+-        const bool correct = m_speller.checkAndSuggest(query,suggestions);
++        const bool correct = speller->checkAndSuggest(query,suggestions);
+         if (correct) {
+             match.setIcon(KIcon(QLatin1String( "checkbox" )));
+-            match.setText(i18n("Correct"));
++            match.setText(i18n("Correct")+QLatin1String(": ")+query);
+         } else {
+             match.setIcon(KIcon(QLatin1String( "edit-delete" )));
+             const QString recommended = i18n("Suggested words: %1", suggestions.join(i18nc("seperator for a list of words", ", ")));
+diff --git a/runners/spellchecker/spellcheck.h b/runners/spellchecker/spellcheck.h
+index 492c370..ca65452 100644
+--- a/runners/spellchecker/spellcheck.h
++++ b/runners/spellchecker/spellcheck.h
+@@ -22,6 +22,7 @@
+ #include <sonnet/speller.h>
+ 
+ #include <plasma/abstractrunner.h>
++#include <QSharedPointer>
+ 
+ /**
+  * This checks the spelling of query
+@@ -41,12 +42,17 @@ public:
+ 
+ protected slots:
+     void init();
++    void loaddata();
++    void destroydata();
+ 
+ private:
++    QString findlang(const QStringList &terms);
++
+     QString m_triggerWord;
+-    QHash<QString, QString> m_languages;//key=language name, value=language code
++    QMap<QString, QString> m_languages;//key=language name, value=language code
+     bool m_requireTriggerWord;
+-    Sonnet::Speller m_speller;
++    QMap<QString, QSharedPointer<Sonnet::Speller> > m_spellers; //spellers
++    QMutex m_spellLock; //Lock held when constructing a new speller
+ };
+ 
+ K_EXPORT_PLASMA_RUNNER(spellcheckrunner, SpellCheckRunner)
diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD
index 2857c1465..2ddbc1262 100644
--- a/extra/kdesdk-kate/PKGBUILD
+++ b/extra/kdesdk-kate/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 167771 2012-10-03 14:39:42Z andrea $
+# $Id: PKGBUILD 170589 2012-11-09 08:25:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdesdk-kate
 pkgname=('kdebase-katepart'
          'kdebase-kwrite'
          'kdesdk-kate')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 makedepends=('kdelibs ''cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz"
         'pkgbuild-syntax-highlight.patch')
-sha1sums=('d3a1f58a5207b305e62a2a3dc7a34802289be42e'
+sha1sums=('d48c4671dfc13cefecf95e595403a5f75bc56d5b'
           '0a928253bd2077f0264d96a6c8823c69c47b6a8d')
 
 build() {
diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD
index da34cecf1..803824ef1 100644
--- a/extra/kdesdk/PKGBUILD
+++ b/extra/kdesdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167846 2012-10-03 14:47:10Z andrea $
+# $Id: PKGBUILD 170661 2012-11-09 08:30:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -20,7 +20,7 @@ pkgname=('kdesdk-cervisia'
          'kdesdk-scripts'
          'kdesdk-strigi-analyzer'
          'kdesdk-umbrello')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -30,7 +30,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs'
              'kdebase-lib')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'fix-python2-path.patch')
-sha1sums=('8acefc3701f12834b1e5606b635aef4b500e0aee'
+sha1sums=('ad45975bcda3a23fc7b77d93c7e7c0bd5f2f351c'
           '923cabd7a877cf9a68efeb24fbf3d5827e1d949e')
 
 build() {
@@ -167,7 +167,7 @@ package_kdesdk-kuiviewer() {
 
 package_kdesdk-lokalize() {
 	pkgdesc='Computer-Aided Translation System'
-	depends=('kdebase-runtime' 'kdebindings-python2')
+	depends=('kdebase-runtime' 'kdebindings-python2' 'kdesdk-strigi-analyzer')
 	url="http://kde.org/applications/development/lokalize/"
 	optdepends=('translate-toolkit: enable extra python script')
 	install='kdesdk-lokalize.install'
diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD
index ab89c5f9f..9b51647dd 100644
--- a/extra/kdetoys/PKGBUILD
+++ b/extra/kdetoys/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167847 2012-10-03 14:47:16Z andrea $
+# $Id: PKGBUILD 170662 2012-11-09 08:30:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -6,7 +6,7 @@ pkgbase=kdetoys
 pkgname=('kdetoys-amor'
          'kdetoys-kteatime'
          'kdetoys-ktux')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdetoys')
 makedepends=('cmake' 'automoc4' 'kdebase-workspace')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('fe26e217edb2bc88ee3510bbe2fd32c3acd941b6')
+sha1sums=('2a5c07734fd4b65e181ddc2bce47ab57c5a1a557')
 
 build() {
 	cd $srcdir
diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD
index edc83bb59..439b0259a 100644
--- a/extra/kdeutils-filelight/PKGBUILD
+++ b/extra/kdeutils-filelight/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167849 2012-10-03 14:47:27Z andrea $
+# $Id: PKGBUILD 170664 2012-11-09 08:30:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-filelight
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='View disk usage information'
 url='http://kde.org/applications/utilities/filelight'
@@ -15,7 +15,7 @@ replaces=('filelight')
 conflicts=('filelight')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz")
-sha1sums=('f1d4c7604fb94a4bbe36e136955dd5f6f0f1fdf1')
+sha1sums=('c339bf9918e4f8e3bd12f31a89262a9580e500d6')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD
index c63b74c31..b715f71af 100644
--- a/extra/kdeutils-kcalc/PKGBUILD
+++ b/extra/kdeutils-kcalc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167850 2012-10-03 14:47:33Z andrea $
+# $Id: PKGBUILD 170665 2012-11-09 08:30:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kcalc
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='Scientific Calculator'
 url='http://kde.org/applications/utilities/kcalc/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz")
-sha1sums=('f28ed638e433c26e43c7e57e0193cdec67de9f22')
+sha1sums=('d426f061fba14bd311927f04bd3ba655d4a7fef7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD
index 3ced40f7b..48b1875df 100644
--- a/extra/kdeutils-kcharselect/PKGBUILD
+++ b/extra/kdeutils-kcharselect/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167851 2012-10-03 14:47:36Z andrea $
+# $Id: PKGBUILD 170666 2012-11-09 08:30:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kcharselect
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='Character Selector'
 url="http://kde.org/applications/utilities/kcharselect/"
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz")
-sha1sums=('77f9077f2ec75de8f764140306c63c1a79888d33')
+sha1sums=('f97cd586a1d461ece4401388693a2a60389c6464')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD
index f9059a699..c1743ccf3 100644
--- a/extra/kdeutils-kdf/PKGBUILD
+++ b/extra/kdeutils-kdf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167852 2012-10-03 14:47:41Z andrea $
+# $Id: PKGBUILD 170667 2012-11-09 08:30:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kdf
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 url="http://kde.org/applications/system/kdiskfree/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz")
-sha1sums=('022151b4f2170411037be31d2bbf9ce26f003313')
+sha1sums=('a14ab2740ec4d5be1839ad8b0650fd02106c0ce7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD
index d1465dd5e..48ef2841b 100644
--- a/extra/kdeutils-kfloppy/PKGBUILD
+++ b/extra/kdeutils-kfloppy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167853 2012-10-03 14:47:46Z andrea $
+# $Id: PKGBUILD 170668 2012-11-09 08:30:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kfloppy
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='Floppy Formatter'
 url='http://kde.org/applications/utilities/kfloppy/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz")
-sha1sums=('dbf5ceed22cd0ef0d898dacc466ea6db3da7c980')
+sha1sums=('5ea028f8e2628cef27b331b2a5c087efb45c4864')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD
index 536fe9181..e5d18e769 100644
--- a/extra/kdeutils-kgpg/PKGBUILD
+++ b/extra/kdeutils-kgpg/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167854 2012-10-03 14:47:51Z andrea $
+# $Id: PKGBUILD 170669 2012-11-09 08:30:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kgpg
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='A GnuPG frontend'
 url='http://kde.org/applications/utilities/kgpg/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz")
-sha1sums=('2ec3ceb0d623ce1c2345025292a8a3c2e6b9923a')
+sha1sums=('3acc06395c17c68ff2e74f613d8d8565c43ca2d6')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD
index eccb2ec36..4b62c6797 100644
--- a/extra/kdeutils-kremotecontrol/PKGBUILD
+++ b/extra/kdeutils-kremotecontrol/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kremotecontrol
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='Configure your remote controls for use with applications'
 url='http://kde.org/applications/utilities/kremotecontrol/'
@@ -15,7 +15,7 @@ replaces=('kdeutils-kdelirc')
 conflicts=('kdeutils-kdelirc')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz")
-sha1sums=('142a28d72f07690a5b342c554493fcfb2e7ae6b5')
+sha1sums=('59cac67bb4f19688c0ce17b7cc5c69db5b01f745')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-ksecrets/PKGBUILD b/extra/kdeutils-ksecrets/PKGBUILD
deleted file mode 100644
index 677ed70f8..000000000
--- a/extra/kdeutils-ksecrets/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161247 2012-06-08 06:39:24Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-ksecrets
-pkgver=4.8.4
-pkgrel=1
-pkgdesc='Secrets Management Infrastructure for KDE'
-url='http://techbase.kde.org/Projects/Utils/ksecretsservice'
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-workspace' 'qca-ossl')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ksecrets-${pkgver}.tar.xz")
-sha1sums=('d0fd2c601833cf1ffe52760472e22d667a6a6408')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ksecrets-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/kdeutils-ksecrets/kdeutils-ksecrets.install b/extra/kdeutils-ksecrets/kdeutils-ksecrets.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/extra/kdeutils-ksecrets/kdeutils-ksecrets.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD
index 882f6f921..e27a4f8bc 100644
--- a/extra/kdeutils-ktimer/PKGBUILD
+++ b/extra/kdeutils-ktimer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167856 2012-10-03 14:48:01Z andrea $
+# $Id: PKGBUILD 170671 2012-11-09 08:31:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-ktimer
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='Countdown Launcher'
 url='http://kde.org/applications/utilities/ktimer/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz")
-sha1sums=('e621ca273d1cb2490f9212f3c2ecf8d57a6efdd3')
+sha1sums=('817ea9617fc1264f7340a42e04efdd0fd8190cfa')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD
index f97326710..a81ba7d2a 100644
--- a/extra/kdeutils-kwallet/PKGBUILD
+++ b/extra/kdeutils-kwallet/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167857 2012-10-03 14:48:06Z andrea $
+# $Id: PKGBUILD 170672 2012-11-09 08:31:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kwallet
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='Wallet Management Tool'
 url='http://kde.org/applications/system/kwalletmanager/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz")
-sha1sums=('e77e2cbf91f14e95ccd45fb1931df274f6c68cc7')
+sha1sums=('135e563de2724b923ee7359ec4439097a5c0485b')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD
index bb5443bf6..e5a3904d7 100644
--- a/extra/kdeutils-superkaramba/PKGBUILD
+++ b/extra/kdeutils-superkaramba/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167860 2012-10-03 14:48:13Z andrea $
+# $Id: PKGBUILD 170674 2012-11-09 08:31:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-superkaramba
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='An engine for cool desktop eyecandy'
 url='http://kde.org/applications/utilities/superkaramba/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz")
-sha1sums=('3e2e42316fe7ac357c58fbfa1e1387c347c31b30')
+sha1sums=('2558e05331a62ea3949d8949aa66e6aae29d95da')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD
index b519bb335..0a5480e2e 100644
--- a/extra/kdeutils-sweeper/PKGBUILD
+++ b/extra/kdeutils-sweeper/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167861 2012-10-03 14:48:16Z andrea $
+# $Id: PKGBUILD 170675 2012-11-09 08:31:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-sweeper
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='System Cleaner'
 url='http://kde.org/applications/utilities/sweeper'
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz")
-sha1sums=('31732ac3dd0be4864f6db9a7810b67a1634fc57d')
+sha1sums=('13a6ac2aa84643a615d09137cb10b0a9847f0d1d')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdevelop-pg-qt/PKGBUILD b/extra/kdevelop-pg-qt/PKGBUILD
index 11ebeeb07..0f4f472d3 100644
--- a/extra/kdevelop-pg-qt/PKGBUILD
+++ b/extra/kdevelop-pg-qt/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 151356 2012-02-25 16:59:11Z andrea $
+# $Id: PKGBUILD 169711 2012-10-27 00:50:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdevelop-pg-qt
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="KDevelop Parser Generator, a LL(1) parser generator used by KDevelop language plugins"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kdevelop.org/"
 license=('GPL')
-depends=('kdevelop')
+depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('468bc91c5be16061dc265e9471f75462b32b73d5')
 
 build() {
-  cd ${srcdir}
   mkdir build
   cd build 
   cmake ../${pkgname}-${pkgver} \
@@ -24,6 +23,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd build
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD
index 305724577..f08f3fff7 100644
--- a/extra/kdevelop-php/PKGBUILD
+++ b/extra/kdevelop-php/PKGBUILD
@@ -1,33 +1,32 @@
-# $Id: PKGBUILD 168356 2012-10-09 06:48:14Z andrea $
+# $Id: PKGBUILD 170180 2012-11-04 07:52:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdevelop-php
-pkgver=1.3.90
-_pkgver=4.3.90
+pkgver=1.4.1
+_pkgver=4.4.1
 pkgrel=1
 pkgdesc="PHP language and documentation plugin for KDevelop/Quanta"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kdevelop.org/"
 license=('GPL')
-depends=('kdevelop-pg-qt')
-makedepends=('cmake' 'automoc4')
+depends=('kdevelop')
+makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt')
 replaces=('kdevelop-php-docs')
 conflicts=('kdevelop-php-docs')
-source=(http://download.kde.org/unstable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2)
-sha1sums=('11f9b3d2d27ad93aa666edae60d08f64ea82bb8d'
-          'f11194f5672d78406b6c54d53b10c02384e5bf99')
+source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2)
+sha1sums=('f3523acfc27d0fd68c2b1f970b4ac42dcda38ced'
+          '3a1b20c4527abf489df20a23177dd9befc2e1d3c')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release
   make
+  cd ../
 
   # kdevelop-php-docs
-  cd "${srcdir}"
   mkdir build-docs
   cd build-docs
   cmake ../${pkgname}-docs-${pkgver} \
@@ -37,10 +36,11 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build"
+  cd build
   make DESTDIR="${pkgdir}" install
+  cd ../
 
   # kdevelop-php-docs
-  cd "${srcdir}"/build-docs
+  cd build-docs
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdevelop-python/PKGBUILD b/extra/kdevelop-python/PKGBUILD
new file mode 100644
index 000000000..1a5551ab5
--- /dev/null
+++ b/extra/kdevelop-python/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 172007 2012-11-26 13:00:02Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdevelop-python
+pkgver=1.4.1
+pkgrel=1
+pkgdesc="Python language and documentation plugin for KDevelop"
+arch=('i686' 'x86_64')
+url="http://www.kdevelop.org/"
+license=('GPL')
+depends=('kdevelop')
+makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt')
+source=("http://download.kde.org/stable/kdevelop/kdev-python/${pkgver}/src/kdev-python-v${pkgver}.tar.bz2")
+sha1sums=('b887811d9a79eee3323cf3ad1be093c5801d31d6')
+
+build() {
+  mkdir build
+  cd build
+  cmake ../kdev-python-v${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+      "${pkgdir}"/usr/share/apps/kdevpythonsupport/encodings/encodings/rot_13.py
+}
diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD
index 75e6278c3..7e50d20e7 100644
--- a/extra/kdevelop/PKGBUILD
+++ b/extra/kdevelop/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 168354 2012-10-09 06:46:57Z andrea $
+# $Id: PKGBUILD 170179 2012-11-04 07:52:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevelop
-pkgver=4.3.90
+pkgver=4.4.1
 pkgrel=1
 pkgdesc="A C/C++ development environment for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kdevelop.org/"
 license=('GPL')
-depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta' 'kdebase-katepart')
-makedepends=('cmake' 'automoc4')
+depends=('kdebase-workspace' 'kdevplatform' 'kdebase-katepart')
+makedepends=('cmake' 'automoc4' 'kdesdk-okteta')
+optdepends=('kdesdk-okteta: hex editor'
+            'kdebase-konsole: embedded terminal'
+            'git: git support'
+            'gdb: gdb support'
+            'qt-doc: qt documentation integration')
 install="${pkgname}.install"
-source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('18ed2dccdeef8abe41c135cd3038038790b4e50a')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('31bd10ffdbf2a6f2b3a75ecc8c1877d1bcc5b685')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build 
   cmake ../${pkgname}-${pkgver} \
@@ -26,6 +30,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD
index e124ac776..14db29b72 100644
--- a/extra/kdevplatform/PKGBUILD
+++ b/extra/kdevplatform/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 168355 2012-10-09 06:47:34Z andrea $
+# $Id: PKGBUILD 171963 2012-11-25 14:40:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevplatform
-pkgver=1.3.90
-_pkgver=4.3.90
-pkgrel=1
+pkgver=1.4.1
+_pkgver=4.4.1
+pkgrel=2
 pkgdesc="A C/C++ development platform for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kdevelop.org/"
@@ -14,20 +14,20 @@ depends=('kdelibs' 'subversion' 'qjson')
 optdepends=("kdesdk-kompare: difference checking")
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
-source=("http://download.kde.org/unstable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('88300217681caa5c69f09b6428f2a6298cbd4733')
+source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('48f2b40256e96aa015fa40978d5a9a93056fba75')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build 
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_BUILD_TYPE=Release
   make
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD
index 8d0ae6d12..acfa0b195 100644
--- a/extra/kdewebdev/PKGBUILD
+++ b/extra/kdewebdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167862 2012-10-03 14:48:24Z andrea $
+# $Id: PKGBUILD 170676 2012-11-09 08:31:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -7,7 +7,7 @@ pkgname=('kdewebdev-kfilereplace'
          'kdewebdev-kimagemapeditor'
          'kdewebdev-klinkstatus'
          'kdewebdev-kommander')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -15,7 +15,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdewebdev')
 makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('b811adaa5e996d9f588215be411a6a8d07f493ef')
+sha1sums=('590a6da889357c16246ac8b5e0a16b7fb4679414')
 
 build() {
 	cd $srcdir
diff --git a/extra/kexec-tools/PKGBUILD b/extra/kexec-tools/PKGBUILD
index ce1ca7244..7c50cd51c 100644
--- a/extra/kexec-tools/PKGBUILD
+++ b/extra/kexec-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162395 2012-06-26 19:28:54Z tpowa $
+# $Id: PKGBUILD 170845 2012-11-12 15:18:26Z tpowa $
 # Contributor: Camille Moncelier <pix@devlife.org>, simo <simo@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kexec-tools
 pkgver=2.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Load another kernel from the currently executing Linux kernel"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kernel.org/pub/linux/utils/kernel/kexec/"
@@ -18,7 +18,7 @@ license=('GPL2')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --without-lzma
   make
 }
 
diff --git a/extra/kismet/PKGBUILD b/extra/kismet/PKGBUILD
index 0fb18cc6d..d31664fdb 100644
--- a/extra/kismet/PKGBUILD
+++ b/extra/kismet/PKGBUILD
@@ -1,31 +1,31 @@
-# $Id: PKGBUILD 150900 2012-02-23 13:55:06Z allan $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# $Id: PKGBUILD 171085 2012-11-16 14:51:57Z allan $
+# Maintainer:
+# Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Jason Chu <jason@archlinux.org>
 # Contributor: Juergen Hoetzel <jason@archlinux.org>
 
 pkgname=kismet
 pkgver=2011_03_R2
 _realver="${pkgver//_/-}"
-pkgrel=4.1
+pkgrel=5
 pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kismetwireless.net/"
 license=('GPL')
-depends=('libcap' 'libnl1' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl') # already in core: ('linux-api-headers' 'glibc' 'libusb' 'libusb-compat')
-makedepends=() # already in core: ('grep' 'gcc-libs')
+depends=('libcap' 'libnl1' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl' 'libusb-compat')
 optdepends=('gpsd: log coordinates of detected networks'
             'wireshark-cli: provide OUI files used to determine device manufacturer'
             'wireshark-cli: mergecap, to merge multiple capture files'
             'sox: provide the default kismet sound playback binary'
             'festival: text-to-speech support'
             'flite:  alternative/lightweight text-to-speech support'
-            'mac80211-driver: full rfmon support'
             'ruby: ruby interface')
 backup=('etc/kismet.conf' 'etc/kismet_drone.conf')
 install=kismet.install
 changelog=kismet.changelog
-source=("http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.gz")
-md5sums=('8bf077e8111e6dc8c12cadefdf40aadd')
+source=("http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.gz"{,.asc})
+md5sums=('8bf077e8111e6dc8c12cadefdf40aadd'
+         '500deff918ede6d0bc392a0419322833')
 
 build() {
     cd "${srcdir}/${pkgname}-${_realver}"
diff --git a/extra/konversation/PKGBUILD b/extra/konversation/PKGBUILD
index 4ccc6a798..ff8df1217 100644
--- a/extra/konversation/PKGBUILD
+++ b/extra/konversation/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 168997 2012-10-17 10:19:30Z allan $
+# $Id: PKGBUILD 172103 2012-11-28 12:37:26Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: James Rayner <iphitus@gmail.com>
@@ -6,17 +6,19 @@
 
 pkgname=konversation
 pkgver=1.4
-pkgrel=3
+pkgrel=5
 pkgdesc="A user friendly IRC client for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://konversation.kde.org"
 depends=('kdebase-runtime' 'kdepimlibs')
 makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml')
-optdepends=('python: python scripting support')
+optdepends=('python: python scripting support'
+            'kdebase-konsole: open a terminal in konversation'
+            'qca-ossl: Diffie-Hellman key exchange and Blowfish ECB/CBC support')
 license=('GPL2' 'FDL')
 install=${pkgname}.install
 options=('!makeflags')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+source=("http://download.kde.org/download.php?url=stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('90741721f68a02d4345b9006a8ae53bc49ef3777')
 
 build() {
diff --git a/extra/kshutdown/PKGBUILD b/extra/kshutdown/PKGBUILD
index e312b3db4..cf8efe0e2 100644
--- a/extra/kshutdown/PKGBUILD
+++ b/extra/kshutdown/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 157339 2012-04-27 07:13:20Z eric $
+# $Id: PKGBUILD 172105 2012-11-28 13:15:50Z stephane $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kshutdown
-pkgver=3.0beta4
+pkgver=3.0beta5
 pkgrel=1
 pkgdesc="Shutdown Utility for KDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('kdebase-workspace')
 makedepends=('cmake' 'automoc4')
 install='kshutdown.install'
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.zip")
-sha1sums=('1dcdaa84b7e87560d9861209d6be6ea1d793ca78')
+sha1sums=('108e27a7d1cef505c296656f92ab071d8c53bce3')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/ktorrent/PKGBUILD b/extra/ktorrent/PKGBUILD
index 925a7cb4e..f7aa1b67d 100644
--- a/extra/ktorrent/PKGBUILD
+++ b/extra/ktorrent/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 166483 2012-09-08 08:54:47Z ronald $
+# $Id: PKGBUILD 171523 2012-11-18 10:30:03Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Travis Willard <travisw@wmpub.ca>
 # Contributor: Georg Grabler <ggrabler@gmail.com>
 
 pkgname=ktorrent
 pkgver=4.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A powerful BitTorrent client for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://ktorrent.org/'
@@ -13,16 +13,21 @@ license=('GPL2')
 depends=('libktorrent' 'kdebase-workspace' 'taglib')
 makedepends=('automoc4' 'cmake' 'boost')
 source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
-        'httpserver.patch')
+        'httpserver.patch' 'groupmiewmodel.diff')
 install=${pkgname}.install
 sha1sums=('60400c6286f58934dde7ab471f56188b68d69f7b'
-          'cef22b24af540e1bfcf13da60e4846ade106c303')
+          'cef22b24af540e1bfcf13da60e4846ade106c303'
+	  '5b91b40e38afb15452bcb0644cd7ba57bc9db6eb' )
+
+options=(strip)
+
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	# build time patch
 	patch -p0 -i "${srcdir}/httpserver.patch"
+	patch -p0 -i "${srcdir}/groupmiewmodel.diff"
 
 	cd "${srcdir}"
 	mkdir build
diff --git a/extra/ktorrent/groupmiewmodel.diff b/extra/ktorrent/groupmiewmodel.diff
new file mode 100644
index 000000000..f16bdc57b
--- /dev/null
+++ b/extra/ktorrent/groupmiewmodel.diff
@@ -0,0 +1,87 @@
+commit 1009ba89b5d603ae7f1a95ef65a818c760c367cf
+Author: Joris Guisson <joris.guisson@gmail.com>
+Date:   Mon Oct 22 20:07:21 2012 +0200
+
+    Backport to 4.3: Fix crash in GroupViewModel when dragging torrents over groups
+    
+    BUG: 308733
+
+diff --git a/ktorrent/groups/groupviewmodel.cpp b/ktorrent/groups/groupviewmodel.cpp
+index f2e99d2..b4dca7e 100644
+--- ktorrent/groups/groupviewmodel.cpp
++++ ktorrent/groups/groupviewmodel.cpp
+@@ -55,6 +55,9 @@ namespace kt
+ 	QVariant GroupViewModel::data(const QModelIndex& index, int role) const
+ 	{
+ 		Item* item = (Item*)index.internalPointer();
++        if(!item)
++            return QVariant();
++        
+ 		switch(role)
+ 		{
+ 			case Qt::DisplayRole:
+@@ -72,6 +75,9 @@ namespace kt
+ 			return false;
+ 		
+ 		Item* item = (Item*)index.internalPointer();
++        if(!item)
++            return false;
++        
+ 		Group* group = item->group;
+ 		QString new_name = value.toString();
+ 		if(new_name.isEmpty() || gman->find(new_name))
+@@ -96,13 +102,16 @@ namespace kt
+ 			return 1;
+ 		
+ 		Item* item = (Item*)parent.internalPointer();
+-		return item->children.size();
++        if(!item)
++            return 0;
++        else
++            return item->children.size();
+ 	}
+ 
+ 	QModelIndex GroupViewModel::parent(const QModelIndex& child) const
+ 	{
+ 		Item* item = (Item*)child.internalPointer();
+-		if(!item->parent)
++		if(!item || !item->parent)
+ 			return QModelIndex();
+ 		else
+ 			return createIndex(item->parent->row, 0, (void*)item->parent);
+@@ -114,7 +123,7 @@ namespace kt
+ 			return createIndex(row, column, (void*)&root);
+ 		
+ 		Item* item = (Item*)parent.internalPointer();
+-		if(row < 0 || row >= item->children.count())
++		if(!item || row < 0 || row >= item->children.count())
+ 			return QModelIndex();
+ 		
+ 		return createIndex(row, column, (void*)&item->children.at(row));
+@@ -157,7 +166,7 @@ namespace kt
+ 	Qt::ItemFlags GroupViewModel::flags(const QModelIndex& index) const
+ 	{
+ 		Item* item = (Item*)index.internalPointer();
+-		if(item->group && !item->group->isStandardGroup())
++		if(item && item->group && !item->group->isStandardGroup())
+ 			return Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled;
+ 		else
+ 			return Qt::ItemIsEnabled;
+@@ -218,8 +227,11 @@ namespace kt
+ 	
+ 	bool GroupViewModel::removeRows(int row, int count, const QModelIndex& parent)
+ 	{
++        Item* item = (Item*)parent.internalPointer();
++        if(!item)
++            return false;
++        
+ 		beginRemoveRows(parent, row, row + count);
+-		Item* item = (Item*)parent.internalPointer();
+ 		for(int i = 0; i < count; i++)
+ 			item->children.removeAt(row);
+ 		int row_index = 0;
+@@ -436,3 +448,4 @@ namespace kt
+ 
+ 
+ }
++
diff --git a/extra/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD
index 707d0991b..2545b0593 100644
--- a/extra/kwebkitpart/PKGBUILD
+++ b/extra/kwebkitpart/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 166348 2012-09-06 20:40:12Z andrea $
+# $Id: PKGBUILD 171905 2012-11-23 07:53:25Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kwebkitpart
-pkgver=1.3.0
+pkgver=1.3.1
 pkgrel=1
 pkgdesc="A WebKit browser component for KDE"
-url="http://opendesktop.org/content/show.php?content=127960"
+url="https://projects.kde.org/projects/extragear/base/kwebkitpart/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('27f72c8044fc798add9f4cbf9c799154')
+md5sums=('aec1820fe59ea8f4fe62c81503560f8e')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -25,6 +24,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD
index a237c4b09..ab7971c4d 100644
--- a/extra/lablgtk2/PKGBUILD
+++ b/extra/lablgtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 166399 2012-09-07 16:43:18Z tpowa $
+# $Id: PKGBUILD 170201 2012-11-05 08:17:35Z tpowa $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=lablgtk2
 pkgver=2.16.0
-pkgrel=1
+pkgrel=2
 pkgdesc=" An Objective Caml interface to gtk2"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
diff --git a/extra/lapack/PKGBUILD b/extra/lapack/PKGBUILD
index 1fc4e5d89..14b50033c 100644
--- a/extra/lapack/PKGBUILD
+++ b/extra/lapack/PKGBUILD
@@ -1,56 +1,66 @@
-# $Id: PKGBUILD 164763 2012-08-04 18:50:35Z ronald $
+# $Id: PKGBUILD 171531 2012-11-18 12:48:44Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Jason Taylor <jftaylor21@gmail.com>
 
-pkgname=lapack
-pkgver=3.4.1
+pkgbase=lapack
+pkgname=('lapack' 'blas')
+pkgver=3.4.2
 pkgrel=1
 url="http://www.netlib.org/lapack"
 pkgdesc="Linear Algebra PACKage"
-makedepends=('gcc-fortran')
-depends=("blas=${pkgver}")
+makedepends=('gcc-fortran' 'cmake')
+depends=('gcc-libs')
 arch=('i686' 'x86_64' 'mips64el')
 license=("custom")
-source=(http://www.netlib.org/${pkgname}/${pkgname}-${pkgver}.tgz
-        Makefile.lapack) 
-sha1sums=('910109a931524f8dcc2734ce23fe927b00ca199f'
-          '2bedfe0d778b401b24d1fbf0eb1dc576d374be28')
-
+source=(http://www.netlib.org/${pkgbase}/${pkgbase}-${pkgver}.tgz
+        LICENSE.blas)
+sha1sums=('93a6e4e6639aaf00571d53a580ddc415416e868b'
+          '2491a151a37f0162b25fc4e4e9a8ac444b574a76')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  cp -f INSTALL/make.inc.gfortran make.inc
-  cp -f "${srcdir}/Makefile.lapack" SRC/Makefile
-
-  export FC=gfortran
-
-  pushd INSTALL
-  make clean
-  make NOOPT="${CFLAGS/-O?/-O0} -fPIC" OPTS="${CFLAGS} -fPIC"
-  popd
-  # make sure no files with '_', *vxx.o *vfx.o and *2.O as defined in *ASRC
-  #  are in OBJS
-  pushd SRC
-  make clean
-  
-  make FFLAGS="${CFLAGS} -fPIC" CFLAGS="${CFLAGS} -fPIC" shared
-  cp liblapack.so.${pkgver} "${srcdir}/${pkgname}-${pkgver}/"
-  popd
+  cd "${srcdir}"
+
+  install -d build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DBUILD_SHARED_LIBS=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_Fortran_COMPILER=gfortran
+  make
 }
 
-package() {
-  install -m755 -d "${pkgdir}/usr/lib"
-  install -m755 "${srcdir}/${pkgname}-${pkgver}/liblapack.so.${pkgver}" \
-    "${pkgdir}/usr/lib/"
-  ln -sf liblapack.so.${pkgver} "${pkgdir}/usr/lib/liblapack.so"
-  ln -sf liblapack.so.${pkgver} "${pkgdir}/usr/lib/liblapack.so.3"
+package_lapack() {
+  depends=("blas=${pkgver}")
 
+  install -m755 -d ${pkgdir}/usr/{lib,bin}
+  
+  for libname in liblapack libtmglib; do
+    install -m755 "${srcdir}/build/lib/${libname}.so" \
+      "${pkgdir}/usr/lib/"
+    ln -sf liblapack.so "${pkgdir}/usr/lib/${libname}.so.${pkgver}"
+    ln -sf liblapack.so "${pkgdir}/usr/lib/${libname}.so.3"
+  done
+  
+  install -m755 ${srcdir}/build/bin/* ${pkgdir}/usr/bin
   install -m755 -d "${pkgdir}/usr/share/licenses/lapack"
   install -m644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" \
     "${pkgdir}/usr/share/licenses/lapack/"
 }
 
-sha1sums=('c115223ac1bac9ab971aae865d3e95442bc979bc'
-          '4ea739a743e2de248ad150873137432261d5b630')
+package_blas() {
+  pkgdesc="Basic Linear Algebra Subprograms"
+
+  install -m755 -d "${pkgdir}/usr/lib"
+  install -m755 "${srcdir}/build/lib/libblas.so" \
+      "${pkgdir}/usr/lib/"
+  ln -sf libblas.so "${pkgdir}/usr/lib/libblas.so.${pkgver}"
+  ln -sf libblas.so "${pkgdir}/usr/lib/libblas.so.3"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/blas"
+  install -m644 "${srcdir}/LICENSE.blas" \
+    "${pkgdir}/usr/share/licenses/blas/"
+}
diff --git a/extra/latex2rtf/PKGBUILD b/extra/latex2rtf/PKGBUILD
index 31638e319..b2032ff4f 100644
--- a/extra/latex2rtf/PKGBUILD
+++ b/extra/latex2rtf/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164721 2012-08-04 06:54:39Z remy $
+# $Id: PKGBUILD 171488 2012-11-18 03:22:38Z eric $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=latex2rtf
 pkgver=2.2.1c
-pkgrel=1
+pkgrel=2
 pkgdesc="LaTeX to RTF converter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://latex2rtf.sourceforge.net/"
@@ -15,12 +15,13 @@ checkdepends=(
   'texlive-core'
   'texlive-latexextra' # for a4wide package
 )
+install=latex2rtf.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 sha1sums=('3fd5874de8988cf45f8862d2b3db8ed13a04caa4')
 
 build() {
   cd "${srcdir}/${pkgname}-2.2.1"
-  make
+  make DESTDIR=/usr
 }
 
 check() {
@@ -30,6 +31,6 @@ check() {
 
 package() {
   cd "${srcdir}/${pkgname}-2.2.1"
-  make DESTDIR=${pkgdir}/usr install
-  sed -i -e 's|error "no input file specified"| echo "error: no input file specified"|' ${pkgdir}/usr/bin/latex2png
+  make DESTDIR="${pkgdir}/usr" install install-info
+  sed -i -e 's|error "no input file specified"| echo "error: no input file specified"|' "${pkgdir}/usr/bin/latex2png"
 }
diff --git a/extra/latex2rtf/latex2rtf.install b/extra/latex2rtf/latex2rtf.install
new file mode 100644
index 000000000..8dbcca926
--- /dev/null
+++ b/extra/latex2rtf/latex2rtf.install
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+file=latex2rtf.info
+
+post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
+  install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
+  install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+}
diff --git a/extra/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD
index 23b59b1da..70f0ffc81 100644
--- a/extra/leveldb/PKGBUILD
+++ b/extra/leveldb/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 166942 2012-09-22 20:23:58Z dreisner $
+# $Id: PKGBUILD 169703 2012-10-26 19:01:07Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: feydaykyn <feydaykyn@yahoo.fr>
 
 pkgname=leveldb
-pkgver=1.5.0
-pkgrel=4
+pkgver=1.7.0
+pkgrel=1
 pkgdesc="A fast and lightweight key/value database library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://code.google.com/p/leveldb/"
 license=('BSD')
 depends=('gperftools' 'snappy')
 source=("https://leveldb.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-sha1sums=('b5b45ff74065f242c37f465b13dafb925972ca43')
+sha1sums=('82332ac97d48ad5da02aab4785658c06d0351be1')
 
 build() {
   # buildsys doesn't play nicely with -Wl,--as-needed
@@ -32,7 +32,7 @@ package() {
       "$pkgdir"/usr/share/doc/"$pkgname"
 
   # libraries
-  install -m755 -t "$pkgdir/usr/lib" libleveldb.so.1.5 libleveldb.a
+  install -m755 -t "$pkgdir/usr/lib" "libleveldb.so.${pkgver%.?*}" libleveldb.a
   cp -P libleveldb.so{,.1} "$pkgdir/usr/lib"
 
   # headers
diff --git a/extra/libcanberra/PKGBUILD b/extra/libcanberra/PKGBUILD
index b8e312874..5e62b6ae1 100644
--- a/extra/libcanberra/PKGBUILD
+++ b/extra/libcanberra/PKGBUILD
@@ -1,28 +1,34 @@
-# $Id: PKGBUILD 160365 2012-06-01 12:58:34Z dreisner $
+# $Id: PKGBUILD 170401 2012-11-07 07:11:35Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
-pkgver=0.28
-pkgrel=5
+pkgver=0.30
+pkgrel=2
 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification"
 arch=(i686 x86_64 'mips64el')
-license=('LGPL')
-depends=('libvorbis' 'libltdl' 'alsa-lib' 'tdb')
-makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10' 'gtk2' 'gtk3')
+license=(LGPL)
+depends=(libvorbis libltdl alsa-lib tdb)
+makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3)
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra
-source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz
+source=("$url/$pkgbase-$pkgver.tar.xz"
         libcanberra.xinit)
-sha256sums=('eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c'
+sha256sums=('c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72'
             '68a68d66b7491f99d5aa09fe7c6ef4eb38352a2a8ff7997d184d1cbc5e80c0d3')
 
+_plugindir=usr/lib/$pkgbase-$pkgver
+
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd $pkgbase-$pkgver
   ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
       --disable-static --with-builtin=dso --enable-null --disable-oss \
       --enable-alsa --enable-gstreamer --enable-pulse \
       --with-systemdsystemunitdir=/usr/lib/systemd/system
+
+  # Fight unused direct deps
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
   make
 }
 
@@ -31,40 +37,34 @@ package_libcanberra() {
   optdepends=("$pkgbase-pulse: PulseAudio driver"
               "$pkgbase-gstreamer: GStreamer driver")
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -j1 DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}"/usr/lib/libcanberra-gtk*.la
-  rm -f "${pkgdir}"/usr/lib/gtk-{2,3}.0/modules/*.la
+  cd $pkgbase-$pkgver
 
-  install -d "${pkgdir}/usr/share/gconf" 
-  mv "${pkgdir}/etc/gconf/schemas" "${pkgdir}/usr/share/gconf/"
+  make -j1 DESTDIR="$pkgdir" install
+  rm "$pkgdir"/usr/lib/libcanberra-gtk*.la
+  rm "$pkgdir"/usr/lib/gtk-{2,3}.0/modules/*.la
 
-  install -D "${srcdir}/libcanberra.xinit" \
-    "${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module"
+  install -D "$srcdir/libcanberra.xinit" \
+    "$pkgdir/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module"
 
   # Split plugins
   for _p in pulse gstreamer; do
-    mkdir $_p-plugin
-    mv "${pkgdir}"/usr/lib/${pkgbase}-${pkgver}/${pkgbase}-$_p.* $_p-plugin
+    mkdir ../$_p-plugin
+    mv "$pkgdir/$_plugindir"/libcanberra-$_p.* ../$_p-plugin
   done
 }
 
 package_libcanberra-pulse() {
   pkgdesc="PulseAudio plugin for libcanberra"
-  depends=("$pkgbase=$pkgver-$pkgrel" 'libpulse')
+  depends=("$pkgbase=$pkgver-$pkgrel" libpulse)
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}"
-  mv pulse-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" 
+  install -d "$pkgdir/$_plugindir"
+  mv pulse-plugin/* "$pkgdir/$_plugindir"
 }
 
 package_libcanberra-gstreamer() {
   pkgdesc="GStreamer plugin for libcanberra"
-  depends=("$pkgbase=$pkgver-$pkgrel" 'gstreamer0.10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  depends=("$pkgbase=$pkgver-$pkgrel" gstreamer)
 
-  mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}"
-  mv gstreamer-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" 
+  install -d "$pkgdir/$_plugindir"
+  mv gstreamer-plugin/* "$pkgdir/$_plugindir"
 }
diff --git a/extra/libcanberra/libcanberra.install b/extra/libcanberra/libcanberra.install
index 7f5012199..6027540fd 100644
--- a/extra/libcanberra/libcanberra.install
+++ b/extra/libcanberra/libcanberra.install
@@ -1,23 +1,5 @@
-pkgname=libcanberra
-
-post_install() {
-  if [ -x usr/sbin/gconfpkg ]; then
-    usr/sbin/gconfpkg --install ${pkgname}
-  fi
-}
-
 pre_upgrade() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    pre_remove
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  if [ -x usr/sbin/gconfpkg ]; then
-    usr/sbin/gconfpkg --uninstall ${pkgname}
+  if [ -f usr/share/gconf/schemas/libcanberra.schemas ] && [ -x usr/sbin/gconfpkg ]; then
+    usr/sbin/gconfpkg --uninstall libcanberra
   fi
 }
diff --git a/extra/libcap-ng/PKGBUILD b/extra/libcap-ng/PKGBUILD
index 2886b817d..1033cff4b 100644
--- a/extra/libcap-ng/PKGBUILD
+++ b/extra/libcap-ng/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 165245 2012-08-14 15:06:17Z ibiru $
+# $Id: PKGBUILD 171546 2012-11-19 03:43:07Z dan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
 pkgname=libcap-ng
-pkgver=0.7
+pkgver=0.7.3
 pkgrel=1
-pkgdesc="A library intended to make programming with POSIX capabilities much easier than the traditional libcap"
+pkgdesc="A library making programming with POSIX capabilities easier than traditional libcap"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://people.redhat.com/sgrubb/libcap-ng/"
 license=('GPL2' 'LGPL2.1')
 depends=('glibc')
 options=('!libtool')
 source=(http://people.redhat.com/sgrubb/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('85c14a2442a3721383a1e2284e254846')
+md5sums=('610afb774f80a8032b711281df126283')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libconfig/PKGBUILD b/extra/libconfig/PKGBUILD
index fe7ac1e23..4e46771f6 100644
--- a/extra/libconfig/PKGBUILD
+++ b/extra/libconfig/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libconfig
 pkgver=1.4.8
 pkgrel=1
 pkgdesc="C/C++ Configuration File Library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://hyperrealm.com/libconfig/libconfig.html"
 license=('LGPL')
 depends=('gcc-libs' 'texinfo')
diff --git a/extra/libcroco/PKGBUILD b/extra/libcroco/PKGBUILD
index 8d3bca02a..05ca39828 100644
--- a/extra/libcroco/PKGBUILD
+++ b/extra/libcroco/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156890 2012-04-23 09:08:27Z ibiru $
+# $Id: PKGBUILD 169947 2012-10-30 22:46:28Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libcroco
-pkgver=0.6.5
+pkgver=0.6.8
 pkgrel=1
 pkgdesc="A CSS parsing library"
 arch=('x86_64' 'i686' 'mips64el')
@@ -12,7 +12,7 @@ license=('LGPL')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz)
 url="http://www.gnome.org"
-sha256sums=('2c6959c3644e889264a61c35ddf17401c86943681d4fe3c1682ecd9acabda7e3')
+sha256sums=('ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libdrm-new/COPYING b/extra/libdrm-new/COPYING
deleted file mode 100644
index 6e74c337c..000000000
--- a/extra/libdrm-new/COPYING
+++ /dev/null
@@ -1,48 +0,0 @@
- Copyright 2005 Adam Jackson.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation on the rights to use, copy, modify, merge,
- publish, distribute, sub license, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice (including the
- next paragraph) shall be included in all copies or substantial
- portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NON-INFRINGEMENT.  IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-------------------------------------------------------------------------
-
- Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- All Rights Reserved.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice (including the
- next paragraph) shall be included in all copies or substantial
- portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT.  IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS
- SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
diff --git a/extra/libdrm-new/PKGBUILD b/extra/libdrm-new/PKGBUILD
deleted file mode 100644
index 32a85fcd1..000000000
--- a/extra/libdrm-new/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-#Id$
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libdrm-new
-pkgname=(libdrm-new libdrm-nouveau)
-pkgver=2.4.34
-pkgrel=1
-pkgdesc="Userspace interface to kernel DRM services"
-arch=(i686 x86_64)
-license=('custom')
-depends=('glibc' 'libpciaccess')
-makedepends=('cairo' 'valgrind')
-options=('!libtool' '!emptydirs')
-url="http://dri.freedesktop.org/"
-source=(http://dri.freedesktop.org/libdrm/libdrm-$pkgver.tar.bz2
-        no-pthread-stubs.patch
-        COPYING
-)
-sha1sums=('861757baff4b37e564e13f5350c1b5d01c66a181'
-          '2a5410baa3e6e078f9378ce486a88f41d22fd838'
-          'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
-
-build() {
-  cd "libdrm-$pkgver"
-  patch -Np1 -i "$srcdir/no-pthread-stubs.patch"
-
-  #libtoolize --force
-  autoreconf --force --install
-  ./configure --prefix=/usr \
-      --disable-libkms \
-      --disable-intel \
-      --disable-radeon 
-  make
-}
-
-package_libdrm-new() {
-  pkgdesc="Userspace interface to kernel DRM services - used as makedepends for xf86-video-nouveau"
-  conflicts=('libdrm')
-  provides=("libdrm=$pkgver")
-  cd "libdrm-$pkgver"
-  make DESTDIR="$pkgdir" install
-  rm "$pkgdir"/usr/lib/libdrm_nouveau.so.2*
-}
-
-package_libdrm-nouveau() {
-  pkgdesc="Userspace interface to kernel DRM services for nouveau - used as depends for xf86-video-nouveau"
-  depends=(libdrm)
-  cd "libdrm-$pkgver"
-  make DESTDIR="$pkgdir" install-libdrm_laLTLIBRARIES
-  make -C nouveau DESTDIR="$pkgdir" install
-  make DESTDIR="$pkgdir" uninstall-libdrm_laLTLIBRARIES
-  rm "$pkgdir"/usr/include/libdrm/nouveau.h  "$pkgdir"/usr/lib/pkgconfig/libdrm_nouveau.pc  "$pkgdir"/usr/lib/libdrm_nouveau.so
-}
diff --git a/extra/libdrm-new/no-pthread-stubs.patch b/extra/libdrm-new/no-pthread-stubs.patch
deleted file mode 100644
index 6745f4bc4..000000000
--- a/extra/libdrm-new/no-pthread-stubs.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Nur libdrm-2.4.34.orig/configure.ac libdrm-2.4.34/configure.ac
---- libdrm-2.4.34.orig/configure.ac	2012-05-12 14:54:06.375335490 +0000
-+++ libdrm-2.4.34/configure.ac	2012-05-12 14:54:32.075142065 +0000
-@@ -47,10 +47,6 @@
- LT_INIT([disable-static])
- 
- 
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE([udev],
-diff -Nur libdrm-2.4.34.orig/intel/Makefile.am libdrm-2.4.34/intel/Makefile.am
---- libdrm-2.4.34.orig/intel/Makefile.am	2012-05-12 14:54:06.372001955 +0000
-+++ libdrm-2.4.34/intel/Makefile.am	2012-05-12 14:55:24.164745055 +0000
-@@ -26,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	$(VALGRIND_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
-@@ -35,7 +34,6 @@
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_intel_la_LIBADD = ../libdrm.la \
--	@PTHREADSTUBS_LIBS@ \
- 	@PCIACCESS_LIBS@ \
- 	@CLOCK_LIB@
- 
-diff -Nur libdrm-2.4.34.orig/nouveau/Makefile.am libdrm-2.4.34/nouveau/Makefile.am
---- libdrm-2.4.34.orig/nouveau/Makefile.am	2012-05-12 14:54:06.331998148 +0000
-+++ libdrm-2.4.34/nouveau/Makefile.am	2012-05-12 14:56:00.941132085 +0000
-@@ -2,14 +2,13 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm \
- 	-DDEBUG
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = nouveau.c \
- 			    pushbuf.c \
-diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am
---- libdrm-2.4.34.orig/radeon/Makefile.am	2012-05-12 14:54:06.365334765 +0000
-+++ libdrm-2.4.34/radeon/Makefile.am	2012-05-12 14:55:48.084557437 +0000
-@@ -26,13 +26,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/radeon \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
- libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
diff --git a/extra/libdrm-old/COPYING b/extra/libdrm-old/COPYING
deleted file mode 100644
index 6e74c337c..000000000
--- a/extra/libdrm-old/COPYING
+++ /dev/null
@@ -1,48 +0,0 @@
- Copyright 2005 Adam Jackson.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation on the rights to use, copy, modify, merge,
- publish, distribute, sub license, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice (including the
- next paragraph) shall be included in all copies or substantial
- portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NON-INFRINGEMENT.  IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-------------------------------------------------------------------------
-
- Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- All Rights Reserved.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice (including the
- next paragraph) shall be included in all copies or substantial
- portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT.  IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS
- SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
diff --git a/extra/libdrm-old/PKGBUILD b/extra/libdrm-old/PKGBUILD
deleted file mode 100644
index f72b03e5c..000000000
--- a/extra/libdrm-old/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-#Id$
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libdrm-old
-pkgname=(libdrm-old libdrm-nouveau1)
-pkgver=2.4.33
-pkgrel=1
-pkgdesc="Userspace interface to kernel DRM services"
-arch=(i686 x86_64)
-license=('custom')
-depends=('glibc' 'libpciaccess')
-makedepends=('cairo' 'valgrind')
-options=('!libtool' '!emptydirs')
-url="http://dri.freedesktop.org/"
-source=(http://dri.freedesktop.org/libdrm/libdrm-$pkgver.tar.bz2
-        no-pthread-stubs.patch
-        COPYING
-)
-sha1sums=('4da2c635491724e44326871e6a49ccfec0b6b5a6'
-          '825ff5e0c4238b31bdea52f104bfec8949270e25'
-          'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
-
-build() {
-  cd "libdrm-$pkgver"
-  patch -Np1 -i "$srcdir/no-pthread-stubs.patch"
-
-  #libtoolize --force
-  autoreconf --force --install
-  ./configure --prefix=/usr \
-      --disable-libkms \
-      --disable-intel \
-      --disable-radeon \
-      --enable-nouveau-experimental-api
-  make
-}
-
-package_libdrm-old() {
-  pkgdesc="Userspace interface to kernel DRM services - used as makedepends for nouveau-dri"
-  conflicts=('libdrm')
-  provides=("libdrm=$pkgver")
-  cd "libdrm-$pkgver"
-  make DESTDIR="$pkgdir" install
-  rm "$pkgdir"/usr/lib/libdrm_nouveau.so.1*
-}
-
-package_libdrm-nouveau1() {
-  pkgdesc="Userspace interface to kernel DRM services for nouveau - used as depends for nouveau-dri"
-  depends=(libdrm)
-  cd "libdrm-$pkgver"
-  make DESTDIR="$pkgdir" install-libdrm_laLTLIBRARIES
-  make -C nouveau DESTDIR="$pkgdir" install
-  make DESTDIR="$pkgdir" uninstall-libdrm_laLTLIBRARIES
-  rm -rf "$pkgdir"/usr/include/  "$pkgdir"/usr/lib/pkgconfig/libdrm_nouveau.pc  "$pkgdir"/usr/lib/libdrm_nouveau.so
-}
diff --git a/extra/libdrm-old/no-pthread-stubs.patch b/extra/libdrm-old/no-pthread-stubs.patch
deleted file mode 100644
index 5430244f9..000000000
--- a/extra/libdrm-old/no-pthread-stubs.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
---- libdrm-2.4.0/configure.ac	2008-10-09 21:57:09.000000000 +0200
-+++ libdrm-2.4.0-nostubs/configure.ac	2008-10-21 10:48:24.000000000 +0200
-@@ -47,10 +47,6 @@
- LT_INIT([disable-static])
- 
- 
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE([udev],
---- libdrm-2.4.16/intel/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/intel/Makefile.am.new	2009-12-07 08:11:32.235748069 +0000
-@@ -26,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
-@@ -34,7 +33,6 @@
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_intel_la_LIBADD = ../libdrm.la \
--	@PTHREADSTUBS_LIBS@ \
- 	@PCIACCESS_LIBS@ \
- 	@CLOCK_LIB@
- 
---- libdrm-2.4.16/radeon/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/radeon/Makefile.am.new	2009-12-07 08:12:31.889075388 +0000
-@@ -26,13 +26,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/radeon \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
- libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
---- libdrm-2.4.16/nouveau/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/nouveau/Makefile.am.new	2009-12-07 08:13:01.489072320 +0000
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = \
- 			    nouveau_device.c \
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index 1b2ec8cfd..7912597db 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 165816 2012-08-30 20:33:39Z andyrtr $
+# $Id: PKGBUILD 170783 2012-11-11 10:23:15Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.39
+pkgver=2.4.40
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64 'mips64el')
@@ -16,8 +16,8 @@ url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
         no-pthread-stubs.patch
         COPYING)
-sha256sums=('386b17388980504bca16ede81ceed4c77b12c3488f46ecb7f4d48e48512a733d'
-            '66fb39be073c634abc7c2af238535a63b2a03990888eb8cc5ea79fa3ef083930'
+sha256sums=('48c14e4600ea0fde522292893eb4055d2f6d86a69d093d379c827deaccffaa1f'
+            '3915aaff4d5b0ed523c3144911e7f79ee812dece0e3933c13a88dddcf5912ded'
             '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
 
 build() {
@@ -28,7 +28,8 @@ build() {
   autoreconf --force --install
   ./configure --prefix=/usr \
       --enable-udev \
-      --enable-vmwgfx-experimental-api
+      --enable-omap-experimental-api \
+      --enable-exynos-experimental-api
   make
 }
 
diff --git a/extra/libdrm/no-pthread-stubs.patch b/extra/libdrm/no-pthread-stubs.patch
index a8de91d9d..3b05ce18d 100644
--- a/extra/libdrm/no-pthread-stubs.patch
+++ b/extra/libdrm/no-pthread-stubs.patch
@@ -68,3 +68,37 @@ diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am
  
  libdrm_radeon_la_SOURCES = \
  	radeon_bo_gem.c \
+--- libdrm-2.4.40/omap/Makefile.am	2012-06-14 23:32:50.000000000 +0200
++++ libdrm-2.4.40/omap/Makefile.am	2012-11-06 19:24:44.183224706 +0100
+@@ -2,13 +2,12 @@
+ 	$(WARN_CFLAGS) \
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/omap \
+-	$(PTHREADSTUBS_CFLAGS) \
+ 	-I$(top_srcdir)/include/drm
+ 
+ libdrm_omap_la_LTLIBRARIES = libdrm_omap.la
+ libdrm_omap_ladir = $(libdir)
+ libdrm_omap_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+-libdrm_omap_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
++libdrm_omap_la_LIBADD = ../libdrm.la
+ 
+ libdrm_omap_la_SOURCES = omap_drm.c
+ 
+--- libdrm-2.4.40/exynos/Makefile.am	2012-06-14 23:32:50.000000000 +0200
++++ libdrm-2.4.40/exynos/Makefile.am	2012-11-06 19:26:01.975323106 +0100
+@@ -2,13 +2,12 @@
+ 	$(WARN_CFLAGS) \
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/exynos \
+-	$(PTHREADSTUBS_CFLAGS) \
+ 	-I$(top_srcdir)/include/drm
+ 
+ libdrm_exynos_la_LTLIBRARIES = libdrm_exynos.la
+ libdrm_exynos_ladir = $(libdir)
+ libdrm_exynos_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+-libdrm_exynos_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
++libdrm_exynos_la_LIBADD = ../libdrm.la
+ 
+ libdrm_exynos_la_SOURCES = exynos_drm.c
+ 
diff --git a/extra/libfprint/PKGBUILD b/extra/libfprint/PKGBUILD
index a1e059763..379c38f1d 100644
--- a/extra/libfprint/PKGBUILD
+++ b/extra/libfprint/PKGBUILD
@@ -1,25 +1,24 @@
-# $Id: PKGBUILD 155974 2012-04-10 15:42:33Z tomegun $
+# $Id: PKGBUILD 171907 2012-11-23 08:19:21Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=libfprint
 pkgver=0.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Library for fingerprint readers"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.freedesktop.org/wiki/Software/fprint/libfprint"
 license=(LGPL)
 depends=(libusb nss gdk-pixbuf2)
 groups=(fprint)
 options=(!libtool !emptydirs)
-_snap=$pkgname-dfff16f3e32519ad071bdb1233c75bfe3ffa5557
+_snap=$pkgname-b2a53a459cc4294dec049d8d7f1b92ebb704f983
 source=(http://cgit.freedesktop.org/libfprint/$pkgname/snapshot/$_snap.tar.bz2)
 
 build() {
   cd "$srcdir/$_snap"
-  sed -i '\|^./configure|,+1d' autogen.sh
-  ./autogen.sh
+  NOCONFIGURE=1 ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
 }
@@ -28,4 +27,4 @@ package() {
   cd "$srcdir/$_snap"
   make DESTDIR="$pkgdir" install
 }
-md5sums=('aa2fb6b90cf8c53aebd1f0e656dd70c1')
+md5sums=('2695b689910146b753111d48d8a6cb1c')
diff --git a/extra/libgdata/PKGBUILD b/extra/libgdata/PKGBUILD
index fe511a9ff..f46623925 100644
--- a/extra/libgdata/PKGBUILD
+++ b/extra/libgdata/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 156894 2012-04-23 09:08:32Z ibiru $
+# $Id: PKGBUILD 169948 2012-10-30 22:46:31Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgdata
-pkgver=0.12.0
+pkgver=0.13.2
 pkgrel=1
 pkgdesc="GLib-based library for accessing online service APIs using the GData protocol"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('libsoup-gnome' 'liboauth')
+depends=('libsoup-gnome' 'liboauth' 'gcr' 'gnome-online-accounts')
 makedepends=('intltool' 'gobject-introspection')
 url="http://www.gnome.org"
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e5acd1ca88433306e740fc4cb3836f9710358d0acd48d4ddee1876dd77d2aca3')
+sha256sums=('3dc4e3529b4bf13d4ae4ef7cc4d74c3b5c90bd96e7d9fa83db2066a2b9a36330')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libgdiplus/PKGBUILD b/extra/libgdiplus/PKGBUILD
index 5c1573fcb..9553d8b3b 100644
--- a/extra/libgdiplus/PKGBUILD
+++ b/extra/libgdiplus/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 148818 2012-02-05 11:51:42Z ibiru $
+# $Id: PKGBUILD 171478 2012-11-18 00:00:45Z eric $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=libgdiplus
 pkgver=2.10
-pkgrel=2.1
+pkgrel=3
 pkgdesc="An Open Source Implementation of the GDI+ API"
 arch=(i686 x86_64 'mips64el')
 license=('MPL' 'LGPL')
 url="http://www.mono-project.com"
 depends=('libtiff>=3.9.2-2' 'cairo>=1.8.10' 'giflib' 'glib2>=2.24.0' 'libexif')
-makedepends=('pkgconfig')
 options=('!libtool')
 source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 libpng15.patch)
 md5sums=('451966e8f637e3a1f02d1d30f900255d'
@@ -18,12 +17,12 @@ md5sums=('451966e8f637e3a1f02d1d30f900255d'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p0 <../libpng15.patch
-  ./configure --prefix=/usr --with-cairo=system || return 1
-  
-  make || return 1
+  ./configure --prefix=/usr --with-cairo=system
+
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD
index 70d5817d7..0b836937d 100644
--- a/extra/libgee/PKGBUILD
+++ b/extra/libgee/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165194 2012-08-12 19:52:12Z ibiru $
+# $Id: PKGBUILD 170755 2012-11-10 23:14:19Z heftig $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=libgee
-pkgver=0.6.5
+pkgver=0.6.6.1
 pkgrel=1
 pkgdesc="GObject collection library"
 url="http://live.gnome.org/Libgee"
@@ -12,8 +12,8 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('glib2')
 makedepends=('gobject-introspection')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/libgee/0.6/$pkgname-$pkgver.tar.xz)
-sha256sums=('99b78db2492c533e386a07bce9aab1de4bdf23284b1a485b893683de388fff48')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('ac6598776cda8d1c8689930f48df074e88f17e9f5832bc300902ded5ab8144dd')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/extra/libggz/PKGBUILD b/extra/libggz/PKGBUILD
deleted file mode 100644
index 88807de78..000000000
--- a/extra/libggz/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 149563 2012-02-08 14:13:45Z tpowa $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=libggz
-pkgver=0.0.14.1
-pkgrel=3.1
-pkgdesc="GGZ base library, used by the GGZ Gaming Zone server (ggzd), the ggzcore library and other components"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.ggzgamingzone.org/"
-license=('LGPL')
-depends=('libgcrypt')
-options=('!libtool')
-source=("http://ftp.ggzgamingzone.org/pub/ggz/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('603739504648833779aa13b0327a1c3d')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD
index ee6a7d833..919e6472c 100644
--- a/extra/libgnome-keyring/PKGBUILD
+++ b/extra/libgnome-keyring/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 156896 2012-04-23 09:08:34Z ibiru $
+#$Id: PKGBUILD 169951 2012-10-30 22:46:41Z heftig $
 #Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=libgnome-keyring
-pkgver=3.4.1
-pkgrel=1.1
+pkgver=3.6.0
+pkgrel=1
 pkgdesc="GNOME keyring client library"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
@@ -12,7 +12,7 @@ makedepends=('intltool' 'gobject-introspection')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e74a3e4521767fe5f05cc97cda8a355239567d9763ec628280ede8c2a4a379e8')
+sha256sums=('6dca37fb7b37f800f498031ffe303a567410bec09a9bdd877a18865dafcc9830')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libgnomekbd/PKGBUILD b/extra/libgnomekbd/PKGBUILD
index e33db1eee..c3cd7b5ec 100644
--- a/extra/libgnomekbd/PKGBUILD
+++ b/extra/libgnomekbd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156898 2012-04-23 09:08:37Z ibiru $
+# $Id: PKGBUILD 169950 2012-10-30 22:46:37Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgnomekbd
-pkgver=3.4.0.2
+pkgver=3.6.0
 pkgrel=1
 pkgdesc="Gnome keyboard library"
 url="http://gswitchit.sourceforge.net"
@@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection')
 options=('!libtool' '!emptydirs')
 install=libgnomekbd.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6e6c8956adbd39f1c3a8ec5c77bcf7ffbdaa54320398015d1174cd5003664e39')
+sha256sums=('c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD
index 242c77dfd..b3a4c710f 100644
--- a/extra/libgpod/PKGBUILD
+++ b/extra/libgpod/PKGBUILD
@@ -9,9 +9,12 @@ pkgdesc="A shared library to access the contents of an iPod"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice' 'libplist')
-makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel' 'gtk-sharp-2')
-optdepends=('gtk-sharp-2: Mono bindings'
-            'python2-gobject2: python bindings')
+makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel')
+optdepends=('python2-gobject2: python bindings')
+if [ "$CARCH" != "mips64el" ]; then
+  makedepends+=('gtk-sharp-2')
+  optdepends+=('gtk-sharp-2: Mono bindings')
+fi
 url="http://www.gtkpod.org/libgpod/"
 source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2)
 options=('!libtool' '!emptydirs')
@@ -28,4 +31,3 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make PREFIX=/usr DESTDIR="${pkgdir}" install
 }
-
diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD
index 78ed106f5..c79366337 100644
--- a/extra/libgsf/PKGBUILD
+++ b/extra/libgsf/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 166587 2012-09-12 17:38:22Z jgc $
+# $Id: PKGBUILD 170960 2012-11-14 03:19:40Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=libgsf
-pkgver=1.14.24
+pkgver=1.14.25
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats"
@@ -13,7 +13,7 @@ options=('!libtool')
 depends=('libxml2' 'gdk-pixbuf2' 'bzip2')
 makedepends=('intltool' 'gobject-introspection')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz)
-sha256sums=('975fc00a1332167e2baf649f8e2637884f798db1c8bb04abece2d5141663abff')
+sha256sums=('127548f07e07951984fb139c3f89d65b9e471aefe6555387de03e1113944d1a2')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libgusb/PKGBUILD b/extra/libgusb/PKGBUILD
index 002e3d1ee..5fb10ca3b 100644
--- a/extra/libgusb/PKGBUILD
+++ b/extra/libgusb/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 144366 2011-12-05 11:59:52Z ibiru $
+# $Id: PKGBUILD 170681 2012-11-09 12:30:03Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libgusb
-pkgver=0.1.3
-pkgrel=1.1
+pkgver=0.1.4
+pkgrel=1
 pkgdesc="GLib wrapper around libusb1"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://gitorious.org/gusb/"
 license=('LGPL2.1')
-depends=('udev')
+depends=('udev' 'libusbx')
+makedepends=('gobject-introspection')
 source=(http://people.freedesktop.org/~hughsient/releases/$pkgname-$pkgver.tar.xz)
 options=('!libtool')
-sha256sums=('4eebb56700d9366c513bfa8f9321a60388f61bade0236a90d66854caea97f0e6')
+sha256sums=('64294a649e54df2009545f47577f41438ec50c2fc571dd7b08cf32cb14de37b9')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD
index 5f182ad52..0749908f3 100644
--- a/extra/libgweather/PKGBUILD
+++ b/extra/libgweather/PKGBUILD
@@ -1,29 +1,37 @@
-# $Id: PKGBUILD 156902 2012-04-23 09:08:42Z ibiru $
+# $Id: PKGBUILD 170931 2012-11-13 12:56:29Z heftig $
 # Maintainer: Jan de Groot  <jgc@archlinux.org>
 
 pkgname=libgweather
-pkgver=3.4.1
+pkgver=3.6.2
 pkgrel=1
 pkgdesc="Provides access to weather information from the net"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-depends=('gconf' 'libsoup-gnome' 'gnome-icon-theme')
+depends=('libsoup-gnome' 'gnome-icon-theme' 'gtk3')
 makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org/"
 install=libgweather.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        gettext-not-xml.patch)
-sha256sums=('ee9c4d09f33ae2b066dd1e696aa3e483a689cba6d63bcd388cc2ef95df9b1b60'
-            '3808da5c27bad1152eee824db2cead21de599af198eca017a18e1b0adb366330')
+        gettext-not-xml.patch
+        no_external_gettext.patch)
+sha256sums=('0f2aeff290751590ca51e806c3d09054bf87b86b63b89f5179043a9b3fa8a0b0'
+            '40325e0b5464ebb75eaad3c9292c0bab7b15cfefb93011d9ccc0ab82635a9533'
+            'f07ac07a70ad4999c3acd5d5b82aabd8831e6a45beb9aaed239f212057ded672')
 
 build() {
     cd "$pkgname-$pkgver"
 
     patch -Np1 -i "$srcdir/gettext-not-xml.patch"
+    patch -Np1 -i "$srcdir/no_external_gettext.patch"
     gtkdocize
     autoreconf -fi
 
+    cd po
+     intltool-update --pot
+    cd ../po-locations
+    intltool-update --gettext-package libgweather-locations --pot
+    cd ..
     ./configure --prefix=/usr --sysconfdir=/etc \
         --localstatedir=/var --disable-static \
         --enable-locations-compression
@@ -33,8 +41,4 @@ build() {
 package() {
     cd "$pkgname-$pkgver"
     make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-    install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-    gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain libgweather "$pkgdir"/etc/gconf/schemas/*.schemas
-    rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
 }
diff --git a/extra/libgweather/gettext-not-xml.patch b/extra/libgweather/gettext-not-xml.patch
index 46ea98f48..b966c5648 100644
--- a/extra/libgweather/gettext-not-xml.patch
+++ b/extra/libgweather/gettext-not-xml.patch
@@ -1,19 +1,26 @@
-diff -Nur libgweather-3.4.0.orig/configure.ac libgweather-3.4.0/configure.ac
---- libgweather-3.4.0.orig/configure.ac	2012-03-08 20:49:21.497783149 +0000
-+++ libgweather-3.4.0/configure.ac	2012-03-08 20:59:21.082941563 +0000
-@@ -43,19 +43,16 @@
- LT_PREREQ([2.2.6])
+Description: Switch to using gettext to find localized names for locations, instead of shipping very large locale-specific XML files with lots of duplicate information.
+Author: ?
+
+only in patch2:
+unchanged:
+Index: libgweather-3.5.1/configure.ac
+===================================================================
+--- libgweather-3.5.1.orig/configure.ac	2012-06-25 03:23:11.000000000 +1200
++++ libgweather-3.5.1/configure.ac	2012-07-05 10:27:51.457384292 +1200
+@@ -46,6 +46,10 @@
  LT_INIT([dlopen win32-dll disable-static])
+ LT_LIB_M
  
 +dnl IT_PROG_INTLTOOL does this for us in the case of the po/ subdir, but we're on our own for po-locations
 +AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po-locations/Makefile.in > po-locations/Makefile])
 +IT_PO_SUBDIR([po-locations])
 +
- IT_PROG_INTLTOOL([0.40.6])
  PKG_PROG_PKG_CONFIG([0.19])
  
  AC_PROG_CC
- AC_PATH_PROG(GCONFTOOL, gconftool-2)
+@@ -53,13 +57,6 @@
+ 
+ GLIB_GSETTINGS
  
 -AC_ARG_ENABLE(all-translations-in-one-xml,
 -        [AS_HELP_STRING([--enable-all-translations-in-one-xml],
@@ -25,7 +32,7 @@ diff -Nur libgweather-3.4.0.orig/configure.ac libgweather-3.4.0/configure.ac
  AC_ARG_ENABLE(locations-compression,
          [AS_HELP_STRING([--enable-locations-compression],
                          [Compress Locations.xml files])],
-@@ -178,7 +175,7 @@
+@@ -183,7 +180,7 @@
  Makefile
  doc/Makefile
  po/Makefile.in
@@ -34,7 +41,7 @@ diff -Nur libgweather-3.4.0.orig/configure.ac libgweather-3.4.0/configure.ac
  libgweather/Makefile
  libgweather/gweather-3.0.pc
  libgweather/gweather-3.0-uninstalled.pc
-@@ -187,12 +184,6 @@
+@@ -192,12 +189,6 @@
  ])
  AC_OUTPUT
  
@@ -47,17 +54,18 @@ diff -Nur libgweather-3.4.0.orig/configure.ac libgweather-3.4.0/configure.ac
  dnl ***************************************************************************
  dnl *** Display Summary                                                     ***
  dnl ***************************************************************************
-@@ -203,6 +194,4 @@
+@@ -208,6 +199,4 @@
  	Source code location:		${srcdir}
  	Compiler:			${CC}
  	Introspection support:          ${found_introspection}
 -	Locations.xml translations:	${LOCATIONS_XML_TRANSLATIONS}
 -	Locations.xml compression:	${enable_locations_compression}
  " >&2
-diff -Nur libgweather-3.4.0.orig/data/Makefile.am libgweather-3.4.0/data/Makefile.am
---- libgweather-3.4.0.orig/data/Makefile.am	2012-03-08 20:49:21.484449916 +0000
-+++ libgweather-3.4.0/data/Makefile.am	2012-03-08 21:00:28.359065326 +0000
-@@ -4,55 +4,23 @@
+Index: libgweather-3.5.1/data/Makefile.am
+===================================================================
+--- libgweather-3.5.1.orig/data/Makefile.am	2012-06-06 04:07:53.000000000 +1200
++++ libgweather-3.5.1/data/Makefile.am	2012-07-05 10:27:51.461384292 +1200
+@@ -4,61 +4,21 @@
  libgweatherlocationsdir = $(pkgdatadir)
  libgweatherlocations_in_files = Locations.xml.in
  
@@ -107,21 +115,28 @@ diff -Nur libgweather-3.4.0.orig/data/Makefile.am libgweather-3.4.0/data/Makefil
 -	if test "x$(COMPRESS_EXT)" = "x.gz"; then			\
 -		gzip --force Locations.xml;				\
 -	fi &&								\
-+$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile
-+	LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA)
-+	xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA)
-+	rm -f C/$(libgweatherlocations_DATA)
-+	test -d C && rmdir C
- 	touch $@
- 
+-	touch $@
+-
 -endif # USE_ONE_BIG_XML
 -
- ### Locations.xml.in rebuild
- rebuild-locations: locationdb.sqlite update-locations.py
- 	$(AM_V_GEN)($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in.new
-diff -Nur libgweather-3.4.0.orig/libgweather/gweather-location.c libgweather-3.4.0/libgweather/gweather-location.c
---- libgweather-3.4.0.orig/libgweather/gweather-location.c	2012-03-08 20:49:21.487783240 +0000
-+++ libgweather-3.4.0/libgweather/gweather-location.c	2012-03-08 21:00:28.359065326 +0000
+-### Locations.xml.in rebuild
+-rebuild-locations: locationdb.sqlite update-locations.py
+-	$(AM_V_GEN)($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in.new
+-
+-locationdb.sqlite: build-locationdb.pl major-cities.txt sources/nsd_cccc.txt sources/POP_PLACES.txt sources/US_CONCISE.txt sources/geonames_dd_dms_date_*.txt city-fixups.pl station-fixups.pl
+-	$(AM_V_GEN)$(srcdir)/build-locationdb.pl
++$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile
++	LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA)  && \
++	xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA) && \
++	rm -f C/$(libgweatherlocations_DATA) &&				\
++ 	touch $@
+ 
+ check:
+ 	xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in
+Index: libgweather-3.5.1/libgweather/gweather-location.c
+===================================================================
+--- libgweather-3.5.1.orig/libgweather/gweather-location.c	2012-06-15 08:15:23.000000000 +1200
++++ libgweather-3.5.1/libgweather/gweather-location.c	2012-07-05 10:27:51.461384292 +1200
 @@ -22,11 +22,14 @@
  #include <config.h>
  #endif
@@ -137,7 +152,7 @@ diff -Nur libgweather-3.4.0.orig/libgweather/gweather-location.c libgweather-3.4
  
  #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
  #include "gweather-location.h"
-@@ -185,10 +188,20 @@
+@@ -157,10 +160,20 @@
  
  	tagname = (const char *) xmlTextReaderConstName (parser->xml);
  	if (!strcmp (tagname, "name") && !loc->name) {
@@ -160,9 +175,10 @@ diff -Nur libgweather-3.4.0.orig/libgweather/gweather-location.c libgweather-3.4
  	    xmlFree (value);
  	    normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
  	    loc->sort_name = g_utf8_casefold (normalized, -1);
-diff -Nur libgweather-3.4.0.orig/libgweather/gweather-timezone.c libgweather-3.4.0/libgweather/gweather-timezone.c
---- libgweather-3.4.0.orig/libgweather/gweather-timezone.c	2012-03-08 20:49:21.487783240 +0000
-+++ libgweather-3.4.0/libgweather/gweather-timezone.c	2012-03-08 21:00:28.359065326 +0000
+Index: libgweather-3.5.1/libgweather/gweather-timezone.c
+===================================================================
+--- libgweather-3.5.1.orig/libgweather/gweather-timezone.c	2011-11-16 01:03:32.000000000 +1300
++++ libgweather-3.5.1/libgweather/gweather-timezone.c	2012-07-05 10:27:51.461384292 +1200
 @@ -23,6 +23,7 @@
  #endif
  
@@ -219,9 +235,10 @@ diff -Nur libgweather-3.4.0.orig/libgweather/gweather-timezone.c libgweather-3.4
      if (name)
  	xmlFree (name);
  
-diff -Nur libgweather-3.4.0.orig/po-locations/LINGUAS libgweather-3.4.0/po-locations/LINGUAS
---- libgweather-3.4.0.orig/po-locations/LINGUAS	1970-01-01 00:00:00.000000000 +0000
-+++ libgweather-3.4.0/po-locations/LINGUAS	2012-03-08 21:00:28.359065326 +0000
+Index: libgweather-3.5.1/po-locations/LINGUAS
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ libgweather-3.5.1/po-locations/LINGUAS	2012-07-05 10:27:51.461384292 +1200
 @@ -0,0 +1,78 @@
 +ang
 +ar
@@ -301,9 +318,10 @@ diff -Nur libgweather-3.4.0.orig/po-locations/LINGUAS libgweather-3.4.0/po-locat
 +zh_CN
 +zh_HK
 +zh_TW
-diff -Nur libgweather-3.4.0.orig/po-locations/Makefile.in.in libgweather-3.4.0/po-locations/Makefile.in.in
---- libgweather-3.4.0.orig/po-locations/Makefile.in.in	1970-01-01 00:00:00.000000000 +0000
-+++ libgweather-3.4.0/po-locations/Makefile.in.in	2012-03-08 21:00:28.359065326 +0000
+Index: libgweather-3.5.1/po-locations/Makefile.in.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ libgweather-3.5.1/po-locations/Makefile.in.in	2012-07-05 10:27:51.461384292 +1200
 @@ -0,0 +1,217 @@
 +# Makefile for program source directory in GNU NLS utilities package.
 +# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
@@ -522,9 +540,10 @@ diff -Nur libgweather-3.4.0.orig/po-locations/Makefile.in.in libgweather-3.4.0/p
 +# Tell versions [3.59,3.63) of GNU make not to export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -Nur libgweather-3.4.0.orig/po-locations/POTFILES.in libgweather-3.4.0/po-locations/POTFILES.in
---- libgweather-3.4.0.orig/po-locations/POTFILES.in	1970-01-01 00:00:00.000000000 +0000
-+++ libgweather-3.4.0/po-locations/POTFILES.in	2012-03-08 21:00:28.359065326 +0000
+Index: libgweather-3.5.1/po-locations/POTFILES.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ libgweather-3.5.1/po-locations/POTFILES.in	2012-07-05 10:27:51.461384292 +1200
 @@ -0,0 +1,4 @@
 +# This list should contain *only* data/Locations.xml.in.
 +# Everything else should be in POTFILES.skip.
diff --git a/extra/libgweather/libgweather.install b/extra/libgweather/libgweather.install
index 0d646b872..3ba0d0a48 100644
--- a/extra/libgweather/libgweather.install
+++ b/extra/libgweather/libgweather.install
@@ -1,22 +1,18 @@
-pkgname=libgweather
-
 post_install() {
-  gconfpkg --install $pkgname
   gtk-update-icon-cache -q -t -f /usr/share/icons/gnome
+  glib-compile-schemas /usr/share/glib-2.0/schemas
 }
 
 pre_upgrade() {
-  pre_remove $1
+  if [ -f /usr/share/gconf/schemas/libgweather.schemas ]; then
+    gconfpkg --uninstall libgweather
+  fi
 }
 
 post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gconfpkg --uninstall $pkgname
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/gnome
+  post_install
 }
diff --git a/extra/libgweather/no_external_gettext.patch b/extra/libgweather/no_external_gettext.patch
new file mode 100644
index 000000000..64b3c5ad5
--- /dev/null
+++ b/extra/libgweather/no_external_gettext.patch
@@ -0,0 +1,14 @@
+Index: libgweather-3.5.1/configure.ac
+===================================================================
+--- libgweather-3.5.1.orig/configure.ac	2012-07-05 10:33:10.277373254 +1200
++++ libgweather-3.5.1/configure.ac	2012-07-05 10:33:44.957372053 +1200
+@@ -97,9 +97,6 @@
+ dnl gettext
+ IT_PROG_INTLTOOL([0.50.0])
+ 
+-AM_GNU_GETTEXT_VERSION([0.18])
+-AM_GNU_GETTEXT([external])
+-
+ GETTEXT_PACKAGE=libgweather-3.0
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
diff --git a/extra/libimobiledevice/HOME-segfault.patch b/extra/libimobiledevice/HOME-segfault.patch
new file mode 100644
index 000000000..e48e6cb42
--- /dev/null
+++ b/extra/libimobiledevice/HOME-segfault.patch
@@ -0,0 +1,14 @@
+The patch fixes segfault when both $XDG_CONFIG_HOME and $HOME are unset
+Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com>
+--- src/userpref.c.orig	2012-06-04 17:04:57.387303630 +0300
++++ src/userpref.c	2012-06-04 17:06:05.741301627 +0300
+@@ -125,6 +125,9 @@
+ 	const char *cdir = getenv("XDG_CONFIG_HOME");
+ 	if (!cdir) {
+ 		cdir = getenv("HOME");
++		if (!cdir) {
++			cdir="/root";
++		}
+ 		strcpy(__config_dir, cdir);
+ 		strcat(__config_dir, DIR_SEP_S);
+ 		strcat(__config_dir, ".config");
diff --git a/extra/libimobiledevice/PKGBUILD b/extra/libimobiledevice/PKGBUILD
new file mode 100644
index 000000000..aefb7c445
--- /dev/null
+++ b/extra/libimobiledevice/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 164735 2012-08-04 10:06:26Z tomegun $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Gabriel Martinez < reitaka at gmail dot com >
+
+pkgname=libimobiledevice
+pkgver=1.1.4
+pkgrel=2
+pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
+url="http://libimobiledevice.org/"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL2' 'LGPL2.1')
+depends=('usbmuxd' 'gnutls' 'libgcrypt')
+options=('!libtool')
+source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2
+	HOME-segfault.patch)
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  patch -p0 < "$srcdir/HOME-segfault.patch"
+
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+md5sums=('3f28cbc6a2e30d34685049c0abde5183'
+         '0de709dbf8e79d0b00cca06f5e61d57c')
diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD
index aadd6e702..65e03b54d 100644
--- a/extra/libindi/PKGBUILD
+++ b/extra/libindi/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libindi
-pkgver=0.9.5
+pkgver=0.9.6
 pkgrel=1
 pkgdesc="A distributed control protocol designed to operate astronomical instrumentation"
 url="http://www.indilib.org/index.php?title=Main_Page"
@@ -13,7 +13,7 @@ depends=('libnova' 'cfitsio' 'boost-libs' 'libusb-compat')
 makedepends=('pkgconfig' 'cmake' 'boost')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/indi/${pkgname}_${pkgver}.tar.gz")
-md5sums=('357aed5dd2f2d713bb243120f022763a')
+md5sums=('c1456544a36f543e2884f88913cf3eb0')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libirman/PKGBUILD b/extra/libirman/PKGBUILD
index 7e9e0e1d5..f241a02cd 100644
--- a/extra/libirman/PKGBUILD
+++ b/extra/libirman/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libirman
 pkgver=0.4.5
 pkgrel=3
 pkgdesc="Irman driver lcd library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lirc.org"
 license=('LGPL')
 options=('!libtool')
diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD
index e18076a81..c2525208e 100644
--- a/extra/libkcddb/PKGBUILD
+++ b/extra/libkcddb/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167788 2012-10-03 14:41:14Z andrea $
+# $Id: PKGBUILD 170605 2012-11-09 08:26:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkcddb
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="KDE CDDB library"
 url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdemultimedia-kioslave')
 conflicts=('kdemultimedia-kioslave')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('11a83fcf8e699d787b0c037e50f2031874470d70')
+sha1sums=('6a9d99cea33143cfdd89766b9647aa463b3f560f')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD
index 1871717a2..681800eee 100644
--- a/extra/libkcompactdisc/PKGBUILD
+++ b/extra/libkcompactdisc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167789 2012-10-03 14:41:18Z andrea $
+# $Id: PKGBUILD 170606 2012-11-09 08:26:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkcompactdisc
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A library for interfacing with CDs"
 url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdemultimedia-kioslave')
 conflicts=('kdemultimedia-kioslave')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('daea966e1d6bc06b3dc7001455e31f5004a05423')
+sha1sums=('fc5ec113a34787ae36120581f8e9a1508fdee5a0')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD
index e1096405b..112aa21f0 100644
--- a/extra/libkdcraw/PKGBUILD
+++ b/extra/libkdcraw/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167782 2012-10-03 14:40:52Z andrea $
+# $Id: PKGBUILD 170600 2012-11-09 08:26:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdcraw
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A C++ interface used to decode RAW picture"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw"
@@ -14,7 +14,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('022e5e59fb4b0a9ac7942b967f488795a42786e0')
+sha1sums=('be92e3e5c6b9cde30ebed4ef328ed454ed968b55')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD
index de190698b..d534aed55 100644
--- a/extra/libkdeedu/PKGBUILD
+++ b/extra/libkdeedu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167780 2012-10-03 14:40:42Z andrea $
+# $Id: PKGBUILD 170598 2012-11-09 08:26:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdeedu
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Libraries used by KDE Education applications"
 url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 replaces=('kdeedu-libkdeedu' 'kdeedu-data')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('e03310dbb1bcc02095f238fbdd4684a59e98d710')
+sha1sums=('5469a7c5cea78b922ddfd3427a3f8cefdd04d383')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD
index 0fb6303dd..0358ede45 100644
--- a/extra/libkexiv2/PKGBUILD
+++ b/extra/libkexiv2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167783 2012-10-03 14:40:55Z andrea $
+# $Id: PKGBUILD 170601 2012-11-09 08:26:30Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkexiv2
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A library to manipulate pictures metadata"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('60956d88677346bdd4e343b1454a61a2210a39c6')
+sha1sums=('ea41341a49b524d946b844fc4146652011cdb980')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkgapi/PKGBUILD b/extra/libkgapi/PKGBUILD
index fd418a3c2..8c619411d 100644
--- a/extra/libkgapi/PKGBUILD
+++ b/extra/libkgapi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165471 2012-08-20 13:27:31Z andrea $
+# $Id: PKGBUILD 171965 2012-11-25 14:45:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkgapi
-pkgver=0.4.2
-pkgrel=1
+pkgver=0.4.3
+pkgrel=2
 pkgdesc="A KDE-based library for accessing various Google services via their public API"
 url='https://projects.kde.org/projects/extragear/libs/libkgapi'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,11 +12,10 @@ depends=('kdepimlibs' 'qjson')
 makedepends=('cmake' 'automoc4' 'boost')
 replaces=('akonadi-google' 'libkgoogle')
 conflicts=('akonadi-google' 'libkgoogle')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('7da940eb4ed9bdb909d29e93ef6bce67')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('99e61ad50edd51f679170db3b997736b')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -26,6 +25,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libkgoogle/PKGBUILD b/extra/libkgoogle/PKGBUILD
deleted file mode 100644
index a714dc1c7..000000000
--- a/extra/libkgoogle/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 159516 2012-05-25 18:26:22Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkgoogle
-pkgver=0.3.1
-pkgrel=1
-pkgdesc="A KDE-based library for accessing various Google services via their public API"
-url='https://projects.kde.org/projects/kdereview/libkgoogle'
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdepimlibs' 'qjson')
-makedepends=('cmake' 'automoc4' 'boost')
-replaces=('akonadi-google')
-conflicts=('akonadi-google')
-source=("http://www.progdan.cz/wp-content/uploads/akonadi-google-${pkgver}.tar.gz")
-md5sums=('fed8d9082547835ab916edd219831cf6')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../akonadi-google-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD
index 406d4c851..80b9c5185 100644
--- a/extra/libkipi/PKGBUILD
+++ b/extra/libkipi/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkipi
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="An interface to use kipi-plugins from a KDE application"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi"
@@ -14,7 +14,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('36d9bd240409e4ec3063fe02279671502fb65c26')
+sha1sums=('0752fadb0757abb6f1954bb0cda407c074628cd8')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD
index b361d834e..fad920edf 100644
--- a/extra/libksane/PKGBUILD
+++ b/extra/libksane/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167786 2012-10-03 14:41:06Z andrea $
+# $Id: PKGBUILD 170603 2012-11-09 08:26:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libksane
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="An image scanning library"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane"
@@ -14,7 +14,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('e8578ec3a65ba91a8772c88612f61116ee9f38a8')
+sha1sums=('2ca77dc024bf5254a7bd7ebd22c3b83bab4e07cc')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libmikmod/PKGBUILD b/extra/libmikmod/PKGBUILD
index 42223ebca..e9cd58290 100644
--- a/extra/libmikmod/PKGBUILD
+++ b/extra/libmikmod/PKGBUILD
@@ -1,43 +1,39 @@
-# $Id: PKGBUILD 149426 2012-02-07 16:55:08Z heftig $
+# $Id: PKGBUILD 170549 2012-11-08 15:28:36Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=libmikmod
-pkgver=3.1.12
-pkgrel=4.1
+pkgver=3.2.0
+pkgrel=1
 pkgdesc="A portable sound library"
 license=('GPL' 'LGPL')
-url="http://sourceforge.net/projects/mikmod/"
+url="http://mikmod.shlomifish.org/"
 arch=('i686' 'x86_64' 'mips64el')
-depends=('glibc')
+depends=('glibc' 'sh')
+makedepends=('alsa-lib')
 options=('!libtool')
 install=$pkgname.install
-source=(http://downloads.sourceforge.net/mikmod/${pkgname}-${pkgver}.tar.gz
-        libmikmod-3.1.12-64bit-fix.diff
-	libmikmod-3.1.12-exitcrash-fix.diff
-	libmikmod-3.1.12-loopingvolume-fix.diff
-	libmikmod-3.1.12-md_sngchn-fix.diff
-        libmikmod-CVE-2009-0179.patch)
-md5sums=('9f3c740298260d5f88981fc0d51f6f16'
-         'dc7ffd8d6d355e9d6ec671b7f2b2adc7'
-         '03a4f5bfcecddf5f515672d6d477b7f7'
-         'a837fd876cbd2ac27419b802504489db'
-         '076d39de19de36b880ed90297f1ee0d1'
-         'fa91f4bc17164be32bec0ea7a73f2aaa')
+source=($url/files/$pkgname-$pkgver.tar.gz
+        libmikmod-3.2.0-64bit-fix.diff
+        libmikmod-3.1.12-loopingvolume-fix.diff)
+md5sums=('96e9820d72a41fe27ff304071739696c'
+         '0bb09aac6e83e0a7fd6535961b3cff4c'
+         'a837fd876cbd2ac27419b802504489db')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   # patches from sdl_mixer-1.2.11 source
-  patch -Np1 -i $srcdir/libmikmod-3.1.12-64bit-fix.diff
-  patch -Np1 -i $srcdir/libmikmod-3.1.12-exitcrash-fix.diff
+  patch -Np1 -i $srcdir/libmikmod-3.2.0-64bit-fix.diff
   patch -Np1 -i $srcdir/libmikmod-3.1.12-loopingvolume-fix.diff
-  patch -Np1 -i $srcdir/libmikmod-3.1.12-md_sngchn-fix.diff
-  patch -Np1 -i $srcdir/libmikmod-CVE-2009-0179.patch
   
-  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
-  make || return 1
-  make DESTDIR=$pkgdir install
+  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --disable-static
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/libmikmod/libmikmod-3.2.0-64bit-fix.diff b/extra/libmikmod/libmikmod-3.2.0-64bit-fix.diff
new file mode 100644
index 000000000..c965f9ab7
--- /dev/null
+++ b/extra/libmikmod/libmikmod-3.2.0-64bit-fix.diff
@@ -0,0 +1,12 @@
+diff -u -r libmikmod-3.2.0-orig/include/mikmod.h libmikmod-3.2.0/include/mikmod.h
+--- libmikmod-3.2.0-orig/include/mikmod.h	2012-06-01 15:15:42.000000000 +0200
++++ libmikmod-3.2.0/include/mikmod.h	2012-10-03 20:03:48.173576199 +0200
+@@ -85,7 +85,7 @@
+ 
+ 
+ 
+-#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__)
++#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__) || defined(_LP64)
+ /* 64 bit architectures */
+ 
+ typedef signed char     SBYTE;      /* 1 byte, signed */
diff --git a/extra/libmng/PKGBUILD b/extra/libmng/PKGBUILD
index 8e022137d..51ca93ae3 100644
--- a/extra/libmng/PKGBUILD
+++ b/extra/libmng/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libmng
 pkgver=1.0.10
-pkgrel=4
+pkgrel=4.1
 pkgdesc="A collection of routines used to create and manipulate MNG format graphics files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libmng.com/"
@@ -17,6 +17,7 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ln -s makefiles/configure.in .
   ln -s makefiles/Makefile.am .
+  sed -i '/^AM_C_PROTOTYPES$/d' configure.in  # removed in recent automake
   autoreconf --force --install
   ./configure --prefix=/usr
   make
diff --git a/extra/libmygpo-qt/PKGBUILD b/extra/libmygpo-qt/PKGBUILD
index 9d284570d..74e1a1fb6 100644
--- a/extra/libmygpo-qt/PKGBUILD
+++ b/extra/libmygpo-qt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 168683 2012-10-14 02:17:22Z andrea $
+# $Id: PKGBUILD 171967 2012-11-25 14:53:14Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libmygpo-qt
 pkgver=1.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A C++/Qt client library for gpodder.net"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wiki.gpodder.org/wiki/Libmygpo-qt"
diff --git a/extra/libnet/PKGBUILD b/extra/libnet/PKGBUILD
new file mode 100644
index 000000000..629647397
--- /dev/null
+++ b/extra/libnet/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 170191 2012-11-04 17:11:22Z giovanni $
+# Maintainer:
+# Contributor: damir <damir@archlinux.org>
+
+pkgname=libnet
+pkgver=1.1.6
+pkgrel=1.1
+pkgdesc="A library which provides API for commonly used low-level net functions"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://sourceforge.net/projects/libnet-dev/"
+license=('BSD')
+depends=('glibc' 'sh')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/libnet-dev/${pkgname}-${pkgver}.tar.gz")
+md5sums=('710296fe424a49344e5fcc0d09e53317')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make CFLAGS="${CFLAGS} -fPIC"
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -Dm644 doc/COPYING \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/extra/libnice/PKGBUILD b/extra/libnice/PKGBUILD
index ee99d4c45..4412273b1 100644
--- a/extra/libnice/PKGBUILD
+++ b/extra/libnice/PKGBUILD
@@ -3,16 +3,17 @@
 # Contributor: William Díaz <wdiaz@archlinux.us>
 
 pkgname=libnice
-pkgver=0.1.2
+pkgver=0.1.3
 pkgrel=1
 pkgdesc="An implementation of the IETF's draft ICE (for p2p UDP data streams)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://nice.freedesktop.org"
 license=('LGPL')
-depends=('gstreamer0.10')
+depends=('glib2')
+makedepends=('gstreamer' 'gstreamer0.10')
+optdepends=('gstreamer' 'gstreamer0.10')
 options=('!libtool')
 source=(http://nice.freedesktop.org/releases/$pkgname-$pkgver.tar.gz)
-md5sums=('1914dd98380dd68632d3d448cc23f1e8')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -24,3 +25,4 @@ package() {
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
+md5sums=('1a0907605f852dcda32a3b3daf38d36c')
diff --git a/extra/libotf/PKGBUILD b/extra/libotf/PKGBUILD
index 44bbb862d..0003de2dd 100644
--- a/extra/libotf/PKGBUILD
+++ b/extra/libotf/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 149040 2012-02-05 15:14:11Z bisson $
+# $Id: PKGBUILD 172457 2012-12-03 05:46:28Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Ashish Shukla <wahjava.ml@gmail.com>
 
 pkgname=libotf
-pkgver=0.9.12
-pkgrel=2.1
+pkgver=0.9.13
+pkgrel=1
 pkgdesc='OpenType Font library'
-url='http://www.m17n.org/libotf/'
+url='http://www.nongnu.org/m17n/'
 license=('LGPL')
 options=('!libtool')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libxaw' 'freetype2')
-source=("http://www.m17n.org/libotf/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('47872f696a62e8f111960143f3f36b5366398e20')
+source=("http://download.savannah.gnu.org/releases/m17n//${pkgname}-${pkgver}.tar.gz")
+sha1sums=('66bb81958f5f07ee1f8917d3cb7e359ae559d873')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libotr/PKGBUILD b/extra/libotr/PKGBUILD
index 6bf521ec7..7ede4a447 100644
--- a/extra/libotr/PKGBUILD
+++ b/extra/libotr/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165291 2012-08-14 23:10:37Z bisson $
+# $Id: PKGBUILD 170571 2012-11-09 00:21:42Z eric $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Bug <Bug2000@gmail.com>
 
 pkgname=libotr
-pkgver=3.2.1
+pkgver=4.0.0
 pkgrel=1
 pkgdesc='Off-the-Record Messaging Library and Toolkit'
 url='http://www.cypherpunks.ca/otr/'
@@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('libgcrypt')
 options=('!libtool')
 source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('898bf00d019f49ca34cd0116dd2e22685c67c394')
+sha1sums=('8865e9011b8674290837afcf7caf90c492ae09cc')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libotr3/PKGBUILD b/extra/libotr3/PKGBUILD
new file mode 100644
index 000000000..69a69b597
--- /dev/null
+++ b/extra/libotr3/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 170574 2012-11-09 00:22:47Z eric $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+# Contributor: Bug <Bug2000@gmail.com>
+
+pkgname=libotr3
+pkgver=3.2.1
+pkgrel=1
+pkgdesc='Off-the-Record Messaging Library and Toolkit (version 3.X)'
+url='http://www.cypherpunks.ca/otr/'
+license=('GPL' 'LGPL')
+arch=('i686' 'x86_64' 'mips64el')
+depends=('libgcrypt')
+options=('!libtool')
+source=("http://www.cypherpunks.ca/otr/libotr-${pkgver}.tar.gz" "libotr3-soname.patch")
+sha1sums=('898bf00d019f49ca34cd0116dd2e22685c67c394'
+          '08c85f20fa1a0c5e8935d9a3f00b1d4e37f1b2d1')
+
+build() {
+	cd "${srcdir}/libotr-${pkgver}"
+	patch -p1 -i "${srcdir}/libotr3-soname.patch"
+ 	./configure --prefix=/usr --mandir=/usr/share/man --disable-static \
+	  --program-transform-name='s/otr/otr3/'
+	make 
+}
+
+package() {
+	cd "${srcdir}/libotr-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+
+	for i in parse sesskeys mackey readforge modify remac; do
+	  rm "${pkgdir}"/usr/share/man/man1/otr_$i.1
+	  ln -sf otr3_toolkit.1 "${pkgdir}"/usr/share/man/man1/otr3_$i.1
+	done
+}
diff --git a/extra/libotr3/libotr3-soname.patch b/extra/libotr3/libotr3-soname.patch
new file mode 100644
index 000000000..aa9b58318
--- /dev/null
+++ b/extra/libotr3/libotr3-soname.patch
@@ -0,0 +1,695 @@
+diff -Naur libotr-3.2.1.orig/configure libotr-3.2.1/configure
+--- libotr-3.2.1.orig/configure	2012-11-02 04:53:36.609896510 -0400
++++ libotr-3.2.1/configure	2012-11-02 04:53:47.533538908 -0400
+@@ -791,7 +791,7 @@
+ LDFLAGS
+ CFLAGS
+ CC
+-LIBOTR_LIBTOOL_VERSION
++LIBOTR3_LIBTOOL_VERSION
+ am__untar
+ am__tar
+ AMTAR
+@@ -2674,7 +2674,7 @@
+ 
+ 
+ # Define the identity of the package.
+- PACKAGE=libotr
++ PACKAGE=libotr3
+  VERSION=3.2.1
+ 
+ 
+@@ -2715,7 +2715,7 @@
+ 
+ 
+ 
+-LIBOTR_LIBTOOL_VERSION="4:1:2"
++LIBOTR3_LIBTOOL_VERSION="4:1:2"
+ 
+ 
+ 
+@@ -10461,7 +10461,7 @@
+ 
+ 
+ 
+-ac_config_files="$ac_config_files Makefile src/Makefile toolkit/Makefile libotr.pc"
++ac_config_files="$ac_config_files Makefile src/Makefile toolkit/Makefile libotr3.pc"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -11434,7 +11434,7 @@
+     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+     "toolkit/Makefile") CONFIG_FILES="$CONFIG_FILES toolkit/Makefile" ;;
+-    "libotr.pc") CONFIG_FILES="$CONFIG_FILES libotr.pc" ;;
++    "libotr3.pc") CONFIG_FILES="$CONFIG_FILES libotr3.pc" ;;
+ 
+   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+   esac
+diff -Naur libotr-3.2.1.orig/libotr3.m4 libotr-3.2.1/libotr3.m4
+--- libotr-3.2.1.orig/libotr3.m4	1969-12-31 19:00:00.000000000 -0500
++++ libotr-3.2.1/libotr3.m4	2012-11-02 04:53:59.983891029 -0400
+@@ -0,0 +1,134 @@
++dnl
++dnl  Off-the-Record Messaging library
++dnl  Copyright (C) 2004-2007  Ian Goldberg, Chris Alexander, Nikita Borisov
++dnl                           <otr@cypherpunks.ca>
++dnl
++dnl  This library is free software; you can redistribute it and/or
++dnl  modify it under the terms of version 2.1 of the GNU Lesser General
++dnl  Public License as published by the Free Software Foundation.
++dnl
++dnl  This library is distributed in the hope that it will be useful,
++dnl  but WITHOUT ANY WARRANTY; without even the implied warranty of
++dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++dnl  Lesser General Public License for more details.
++dnl
++dnl  You should have received a copy of the GNU Lesser General Public
++dnl  License along with this library; if not, write to the Free Software
++dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++dnl
++
++dnl AM_PATH_LIBOTR3([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++dnl Test for libotr3, and define LIBOTR3_CFLAGS and LIBOTR3_LIBS as appropriate.
++dnl enables arguments --with-libotr3-prefix=
++dnl                   --with-libotr3-inc-prefix=
++dnl
++dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT
++dnl
++dnl Adapted from alsa.m4, originally by
++dnl      Richard Boulton <richard-alsa@tartarus.org>
++dnl      Christopher Lansdown <lansdoct@cs.alfred.edu>
++dnl      Jaroslav Kysela <perex@suse.cz>
++
++AC_DEFUN([AM_PATH_LIBOTR3],
++[dnl Save the original CFLAGS, LDFLAGS, and LIBS
++libotr3_save_CFLAGS="$CFLAGS"
++libotr3_save_LDFLAGS="$LDFLAGS"
++libotr3_save_LIBS="$LIBS"
++libotr3_found=yes
++
++dnl
++dnl Get the cflags and libraries for libotr3
++dnl
++AC_ARG_WITH(libotr3-prefix,
++[  --with-libotr3-prefix=PFX  Prefix where libotr3 is installed(optional)],
++[libotr3_prefix="$withval"], [libotr3_prefix=""])
++
++AC_ARG_WITH(libotr3-inc-prefix,
++[  --with-libotr3-inc-prefix=PFX  Prefix where libotr3 includes are (optional)],
++[libotr3_inc_prefix="$withval"], [libotr3_inc_prefix=""])
++
++dnl Add any special include directories
++AC_MSG_CHECKING(for libotr3 CFLAGS)
++if test "$libotr3_inc_prefix" != "" ; then
++	LIBOTR3_CFLAGS="$LIBOTR3_CFLAGS -I$libotr3_inc_prefix"
++	CFLAGS="$CFLAGS $LIBOTR3_CFLAGS"
++fi
++AC_MSG_RESULT($LIBOTR3_CFLAGS)
++
++dnl add any special lib dirs
++AC_MSG_CHECKING(for libotr3 LIBS)
++if test "$libotr3_prefix" != "" ; then
++	LIBOTR3_LIBS="$LIBOTR3_LIBS -L$libotr3_prefix"
++	LDFLAGS="$LDFLAGS $LIBOTR3_LIBS"
++fi
++
++dnl add the libotr3 library
++LIBOTR3_LIBS="$LIBOTR3_LIBS -lotr3"
++LIBS="$LIBOTR3_LIBS $LIBS"
++AC_MSG_RESULT($LIBOTR3_LIBS)
++
++dnl Check for a working version of libotr3 that is of the right version.
++min_libotr3_version=ifelse([$1], ,3.0.0,$1)
++no_libotr3=""
++    libotr3_min_major_version=`echo $min_libotr3_version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++    libotr3_min_minor_version=`echo $min_libotr3_version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++    libotr3_min_sub_version=`echo $min_libotr3_version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++AC_MSG_CHECKING(for libotr3 headers version $libotr3_min_major_version.x >= $min_libotr3_version)
++
++AC_LANG_SAVE
++AC_LANG_C
++AC_TRY_COMPILE([
++#include <stdlib.h>
++#include <libotr3/version.h>
++], [
++#  if(OTRL_VERSION_MAJOR != $libotr3_min_major_version)
++#    error not present
++#  else
++
++#    if(OTRL_VERSION_MINOR > $libotr3_min_minor_version)
++       exit(0);
++#    else
++#      if(OTRL_VERSION_MINOR < $libotr3_min_minor_version)
++#        error not present
++#      endif
++
++#      if(OTRL_VERSION_SUB < $libotr3_min_sub_version)
++#        error not present
++#      endif
++#    endif
++#  endif
++exit(0);
++],
++  [AC_MSG_RESULT(found.)],
++  [AC_MSG_RESULT(not present.)
++   ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr3 not found.)])
++   libotr3_found=no]
++)
++AC_LANG_RESTORE
++
++dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
++AC_CHECK_LIB([otr], [otrl_message_receiving],,
++	[ifelse([$3], , [AC_MSG_ERROR(No linkable libotr3 was found.)])
++	 libotr3_found=no],
++	 $LIBGCRYPT_LIBS
++)
++
++LDFLAGS="$libotr3_save_LDFLAGS"
++LIBS="$libotr3_save_LIBS"
++
++if test "x$libotr3_found" = "xyes" ; then
++   ifelse([$2], , :, [$2])
++else
++   LIBOTR3_CFLAGS=""
++   LIBOTR3_LIBS=""
++   ifelse([$3], , :, [$3])
++fi
++
++dnl That should be it.  Now just export our symbols:
++AC_SUBST(LIBOTR3_CFLAGS)
++AC_SUBST(LIBOTR3_LIBS)
++])
++
+diff -Naur libotr-3.2.1.orig/libotr3.pc.in libotr-3.2.1/libotr3.pc.in
+--- libotr-3.2.1.orig/libotr3.pc.in	1969-12-31 19:00:00.000000000 -0500
++++ libotr-3.2.1/libotr3.pc.in	2012-11-02 04:53:59.983891029 -0400
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: libotr3
++Description: Off-the-Record Messaging Library
++Version: 3.1.0
++URL: http://otr.cypherpunks.ca/
++Libs: -L${libdir} -lotr3
++Cflags: -I${includedir}
+diff -Naur libotr-3.2.1.orig/libotr.m4 libotr-3.2.1/libotr.m4
+--- libotr-3.2.1.orig/libotr.m4	2012-11-02 04:53:36.606563083 -0400
++++ libotr-3.2.1/libotr.m4	1969-12-31 19:00:00.000000000 -0500
+@@ -1,134 +0,0 @@
+-dnl
+-dnl  Off-the-Record Messaging library
+-dnl  Copyright (C) 2004-2007  Ian Goldberg, Chris Alexander, Nikita Borisov
+-dnl                           <otr@cypherpunks.ca>
+-dnl
+-dnl  This library is free software; you can redistribute it and/or
+-dnl  modify it under the terms of version 2.1 of the GNU Lesser General
+-dnl  Public License as published by the Free Software Foundation.
+-dnl
+-dnl  This library is distributed in the hope that it will be useful,
+-dnl  but WITHOUT ANY WARRANTY; without even the implied warranty of
+-dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-dnl  Lesser General Public License for more details.
+-dnl
+-dnl  You should have received a copy of the GNU Lesser General Public
+-dnl  License along with this library; if not, write to the Free Software
+-dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+-dnl
+-
+-dnl AM_PATH_LIBOTR([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+-dnl Test for libotr, and define LIBOTR_CFLAGS and LIBOTR_LIBS as appropriate.
+-dnl enables arguments --with-libotr-prefix=
+-dnl                   --with-libotr-inc-prefix=
+-dnl
+-dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT
+-dnl
+-dnl Adapted from alsa.m4, originally by
+-dnl      Richard Boulton <richard-alsa@tartarus.org>
+-dnl      Christopher Lansdown <lansdoct@cs.alfred.edu>
+-dnl      Jaroslav Kysela <perex@suse.cz>
+-
+-AC_DEFUN([AM_PATH_LIBOTR],
+-[dnl Save the original CFLAGS, LDFLAGS, and LIBS
+-libotr_save_CFLAGS="$CFLAGS"
+-libotr_save_LDFLAGS="$LDFLAGS"
+-libotr_save_LIBS="$LIBS"
+-libotr_found=yes
+-
+-dnl
+-dnl Get the cflags and libraries for libotr
+-dnl
+-AC_ARG_WITH(libotr-prefix,
+-[  --with-libotr-prefix=PFX  Prefix where libotr is installed(optional)],
+-[libotr_prefix="$withval"], [libotr_prefix=""])
+-
+-AC_ARG_WITH(libotr-inc-prefix,
+-[  --with-libotr-inc-prefix=PFX  Prefix where libotr includes are (optional)],
+-[libotr_inc_prefix="$withval"], [libotr_inc_prefix=""])
+-
+-dnl Add any special include directories
+-AC_MSG_CHECKING(for libotr CFLAGS)
+-if test "$libotr_inc_prefix" != "" ; then
+-	LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix"
+-	CFLAGS="$CFLAGS $LIBOTR_CFLAGS"
+-fi
+-AC_MSG_RESULT($LIBOTR_CFLAGS)
+-
+-dnl add any special lib dirs
+-AC_MSG_CHECKING(for libotr LIBS)
+-if test "$libotr_prefix" != "" ; then
+-	LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix"
+-	LDFLAGS="$LDFLAGS $LIBOTR_LIBS"
+-fi
+-
+-dnl add the libotr library
+-LIBOTR_LIBS="$LIBOTR_LIBS -lotr"
+-LIBS="$LIBOTR_LIBS $LIBS"
+-AC_MSG_RESULT($LIBOTR_LIBS)
+-
+-dnl Check for a working version of libotr that is of the right version.
+-min_libotr_version=ifelse([$1], ,3.0.0,$1)
+-no_libotr=""
+-    libotr_min_major_version=`echo $min_libotr_version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+-    libotr_min_minor_version=`echo $min_libotr_version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+-    libotr_min_sub_version=`echo $min_libotr_version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-AC_MSG_CHECKING(for libotr headers version $libotr_min_major_version.x >= $min_libotr_version)
+-
+-AC_LANG_SAVE
+-AC_LANG_C
+-AC_TRY_COMPILE([
+-#include <stdlib.h>
+-#include <libotr/version.h>
+-], [
+-#  if(OTRL_VERSION_MAJOR != $libotr_min_major_version)
+-#    error not present
+-#  else
+-
+-#    if(OTRL_VERSION_MINOR > $libotr_min_minor_version)
+-       exit(0);
+-#    else
+-#      if(OTRL_VERSION_MINOR < $libotr_min_minor_version)
+-#        error not present
+-#      endif
+-
+-#      if(OTRL_VERSION_SUB < $libotr_min_sub_version)
+-#        error not present
+-#      endif
+-#    endif
+-#  endif
+-exit(0);
+-],
+-  [AC_MSG_RESULT(found.)],
+-  [AC_MSG_RESULT(not present.)
+-   ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr not found.)])
+-   libotr_found=no]
+-)
+-AC_LANG_RESTORE
+-
+-dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
+-AC_CHECK_LIB([otr], [otrl_message_receiving],,
+-	[ifelse([$3], , [AC_MSG_ERROR(No linkable libotr was found.)])
+-	 libotr_found=no],
+-	 $LIBGCRYPT_LIBS
+-)
+-
+-LDFLAGS="$libotr_save_LDFLAGS"
+-LIBS="$libotr_save_LIBS"
+-
+-if test "x$libotr_found" = "xyes" ; then
+-   ifelse([$2], , :, [$2])
+-else
+-   LIBOTR_CFLAGS=""
+-   LIBOTR_LIBS=""
+-   ifelse([$3], , :, [$3])
+-fi
+-
+-dnl That should be it.  Now just export our symbols:
+-AC_SUBST(LIBOTR_CFLAGS)
+-AC_SUBST(LIBOTR_LIBS)
+-])
+-
+diff -Naur libotr-3.2.1.orig/libotr.m4.orig libotr-3.2.1/libotr.m4.orig
+--- libotr-3.2.1.orig/libotr.m4.orig	1969-12-31 19:00:00.000000000 -0500
++++ libotr-3.2.1/libotr.m4.orig	2012-08-14 08:15:56.000000000 -0400
+@@ -0,0 +1,134 @@
++dnl
++dnl  Off-the-Record Messaging library
++dnl  Copyright (C) 2004-2007  Ian Goldberg, Chris Alexander, Nikita Borisov
++dnl                           <otr@cypherpunks.ca>
++dnl
++dnl  This library is free software; you can redistribute it and/or
++dnl  modify it under the terms of version 2.1 of the GNU Lesser General
++dnl  Public License as published by the Free Software Foundation.
++dnl
++dnl  This library is distributed in the hope that it will be useful,
++dnl  but WITHOUT ANY WARRANTY; without even the implied warranty of
++dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++dnl  Lesser General Public License for more details.
++dnl
++dnl  You should have received a copy of the GNU Lesser General Public
++dnl  License along with this library; if not, write to the Free Software
++dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++dnl
++
++dnl AM_PATH_LIBOTR([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++dnl Test for libotr, and define LIBOTR_CFLAGS and LIBOTR_LIBS as appropriate.
++dnl enables arguments --with-libotr-prefix=
++dnl                   --with-libotr-inc-prefix=
++dnl
++dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT
++dnl
++dnl Adapted from alsa.m4, originally by
++dnl      Richard Boulton <richard-alsa@tartarus.org>
++dnl      Christopher Lansdown <lansdoct@cs.alfred.edu>
++dnl      Jaroslav Kysela <perex@suse.cz>
++
++AC_DEFUN([AM_PATH_LIBOTR],
++[dnl Save the original CFLAGS, LDFLAGS, and LIBS
++libotr_save_CFLAGS="$CFLAGS"
++libotr_save_LDFLAGS="$LDFLAGS"
++libotr_save_LIBS="$LIBS"
++libotr_found=yes
++
++dnl
++dnl Get the cflags and libraries for libotr
++dnl
++AC_ARG_WITH(libotr-prefix,
++[  --with-libotr-prefix=PFX  Prefix where libotr is installed(optional)],
++[libotr_prefix="$withval"], [libotr_prefix=""])
++
++AC_ARG_WITH(libotr-inc-prefix,
++[  --with-libotr-inc-prefix=PFX  Prefix where libotr includes are (optional)],
++[libotr_inc_prefix="$withval"], [libotr_inc_prefix=""])
++
++dnl Add any special include directories
++AC_MSG_CHECKING(for libotr CFLAGS)
++if test "$libotr_inc_prefix" != "" ; then
++	LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix"
++	CFLAGS="$CFLAGS $LIBOTR_CFLAGS"
++fi
++AC_MSG_RESULT($LIBOTR_CFLAGS)
++
++dnl add any special lib dirs
++AC_MSG_CHECKING(for libotr LIBS)
++if test "$libotr_prefix" != "" ; then
++	LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix"
++	LDFLAGS="$LDFLAGS $LIBOTR_LIBS"
++fi
++
++dnl add the libotr library
++LIBOTR_LIBS="$LIBOTR_LIBS -lotr"
++LIBS="$LIBOTR_LIBS $LIBS"
++AC_MSG_RESULT($LIBOTR_LIBS)
++
++dnl Check for a working version of libotr that is of the right version.
++min_libotr_version=ifelse([$1], ,3.0.0,$1)
++no_libotr=""
++    libotr_min_major_version=`echo $min_libotr_version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++    libotr_min_minor_version=`echo $min_libotr_version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++    libotr_min_sub_version=`echo $min_libotr_version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++AC_MSG_CHECKING(for libotr headers version $libotr_min_major_version.x >= $min_libotr_version)
++
++AC_LANG_SAVE
++AC_LANG_C
++AC_TRY_COMPILE([
++#include <stdlib.h>
++#include <libotr/version.h>
++], [
++#  if(OTRL_VERSION_MAJOR != $libotr_min_major_version)
++#    error not present
++#  else
++
++#    if(OTRL_VERSION_MINOR > $libotr_min_minor_version)
++       exit(0);
++#    else
++#      if(OTRL_VERSION_MINOR < $libotr_min_minor_version)
++#        error not present
++#      endif
++
++#      if(OTRL_VERSION_SUB < $libotr_min_sub_version)
++#        error not present
++#      endif
++#    endif
++#  endif
++exit(0);
++],
++  [AC_MSG_RESULT(found.)],
++  [AC_MSG_RESULT(not present.)
++   ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr not found.)])
++   libotr_found=no]
++)
++AC_LANG_RESTORE
++
++dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
++AC_CHECK_LIB([otr], [otrl_message_receiving],,
++	[ifelse([$3], , [AC_MSG_ERROR(No linkable libotr was found.)])
++	 libotr_found=no],
++	 $LIBGCRYPT_LIBS
++)
++
++LDFLAGS="$libotr_save_LDFLAGS"
++LIBS="$libotr_save_LIBS"
++
++if test "x$libotr_found" = "xyes" ; then
++   ifelse([$2], , :, [$2])
++else
++   LIBOTR_CFLAGS=""
++   LIBOTR_LIBS=""
++   ifelse([$3], , :, [$3])
++fi
++
++dnl That should be it.  Now just export our symbols:
++AC_SUBST(LIBOTR_CFLAGS)
++AC_SUBST(LIBOTR_LIBS)
++])
++
+diff -Naur libotr-3.2.1.orig/libotr.pc.in libotr-3.2.1/libotr.pc.in
+--- libotr-3.2.1.orig/libotr.pc.in	2012-11-02 04:53:36.609896510 -0400
++++ libotr-3.2.1/libotr.pc.in	1969-12-31 19:00:00.000000000 -0500
+@@ -1,11 +0,0 @@
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
+-
+-Name: libotr
+-Description: Off-the-Record Messaging Library
+-Version: 3.1.0
+-URL: http://otr.cypherpunks.ca/
+-Libs: -L${libdir} -lotr
+-Cflags: -I${includedir}
+diff -Naur libotr-3.2.1.orig/Makefile.am libotr-3.2.1/Makefile.am
+--- libotr-3.2.1.orig/Makefile.am	2012-11-02 04:53:36.609896510 -0400
++++ libotr-3.2.1/Makefile.am	2012-11-02 04:53:47.536872337 -0400
+@@ -1,9 +1,9 @@
+ SUBDIRS = src toolkit
+ 
+-EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr.m4 libotr.pc.in
++EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr3.m4 libotr3.pc.in
+ 
+ aclocaldir = $(datadir)/aclocal
+-aclocal_DATA = libotr.m4
++aclocal_DATA = libotr3.m4
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+-pkgconfig_DATA = libotr.pc
++pkgconfig_DATA = libotr3.pc
+diff -Naur libotr-3.2.1.orig/Makefile.in libotr-3.2.1/Makefile.in
+--- libotr-3.2.1.orig/Makefile.in	2012-11-02 04:53:36.609896510 -0400
++++ libotr-3.2.1/Makefile.in	2012-11-02 04:53:47.536872337 -0400
+@@ -37,7 +37,7 @@
+ subdir = .
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+-	$(srcdir)/libotr.pc.in $(top_srcdir)/configure AUTHORS COPYING \
++	$(srcdir)/libotr3.pc.in $(top_srcdir)/configure AUTHORS COPYING \
+ 	COPYING.LIB ChangeLog INSTALL NEWS config.guess config.sub \
+ 	depcomp install-sh ltmain.sh missing
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -48,7 +48,7 @@
+  configure.lineno config.status.lineno
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = config.h
+-CONFIG_CLEAN_FILES = libotr.pc
++CONFIG_CLEAN_FILES = libotr3.pc
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
+@@ -162,7 +162,7 @@
+ LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBOBJS = @LIBOBJS@
+-LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@
++LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+@@ -243,11 +243,11 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = src toolkit
+-EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr.m4 libotr.pc.in
++EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr3.m4 libotr3.pc.in
+ aclocaldir = $(datadir)/aclocal
+-aclocal_DATA = libotr.m4
++aclocal_DATA = libotr3.m4
+ pkgconfigdir = $(libdir)/pkgconfig
+-pkgconfig_DATA = libotr.pc
++pkgconfig_DATA = libotr3.pc
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+@@ -303,7 +303,7 @@
+ 
+ distclean-hdr:
+ 	-rm -f config.h stamp-h1
+-libotr.pc: $(top_builddir)/config.status $(srcdir)/libotr.pc.in
++libotr3.pc: $(top_builddir)/config.status $(srcdir)/libotr3.pc.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
+ 
+ mostlyclean-libtool:
+diff -Naur libotr-3.2.1.orig/src/Makefile.am libotr-3.2.1/src/Makefile.am
+--- libotr-3.2.1.orig/src/Makefile.am	2012-11-02 04:53:36.609896510 -0400
++++ libotr-3.2.1/src/Makefile.am	2012-11-02 04:53:47.536872337 -0400
+@@ -1,13 +1,13 @@
+ INCLUDES = @LIBGCRYPT_CFLAGS@
+ 
+-lib_LTLIBRARIES = libotr.la
++lib_LTLIBRARIES = libotr3.la
+ 
+-libotr_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \
++libotr3_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \
+ 		    userstate.c tlv.c auth.c sm.c
+ 
+-libotr_la_LDFLAGS = -version-info @LIBOTR_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@
++libotr3_la_LDFLAGS = -version-info @LIBOTR3_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@
+ 
+-otrincdir = $(includedir)/libotr
++otrincdir = $(includedir)/libotr3
+ 
+ otrinc_HEADERS = b64.h context.h dh.h mem.h message.h privkey.h proto.h \
+ 		 version.h userstate.h tlv.h serial.h auth.h sm.h privkey-t.h
+diff -Naur libotr-3.2.1.orig/src/Makefile.in libotr-3.2.1/src/Makefile.in
+--- libotr-3.2.1.orig/src/Makefile.in	2012-11-02 04:53:36.609896510 -0400
++++ libotr-3.2.1/src/Makefile.in	2012-11-02 04:53:47.536872337 -0400
+@@ -69,13 +69,13 @@
+   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(otrincdir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+-libotr_la_LIBADD =
+-am_libotr_la_OBJECTS = privkey.lo context.lo proto.lo b64.lo dh.lo \
++libotr3_la_LIBADD =
++am_libotr3_la_OBJECTS = privkey.lo context.lo proto.lo b64.lo dh.lo \
+ 	mem.lo message.lo userstate.lo tlv.lo auth.lo sm.lo
+-libotr_la_OBJECTS = $(am_libotr_la_OBJECTS)
+-libotr_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++libotr3_la_OBJECTS = $(am_libotr3_la_OBJECTS)
++libotr3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(libotr_la_LDFLAGS) $(LDFLAGS) -o $@
++	$(libotr3_la_LDFLAGS) $(LDFLAGS) -o $@
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -89,8 +89,8 @@
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
+-SOURCES = $(libotr_la_SOURCES)
+-DIST_SOURCES = $(libotr_la_SOURCES)
++SOURCES = $(libotr3_la_SOURCES)
++DIST_SOURCES = $(libotr3_la_SOURCES)
+ HEADERS = $(otrinc_HEADERS)
+ ETAGS = etags
+ CTAGS = ctags
+@@ -130,7 +130,7 @@
+ LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBOBJS = @LIBOBJS@
+-LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@
++LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+@@ -211,12 +211,12 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ INCLUDES = @LIBGCRYPT_CFLAGS@
+-lib_LTLIBRARIES = libotr.la
+-libotr_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \
++lib_LTLIBRARIES = libotr3.la
++libotr3_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \
+ 		    userstate.c tlv.c auth.c sm.c
+ 
+-libotr_la_LDFLAGS = -version-info @LIBOTR_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@
+-otrincdir = $(includedir)/libotr
++libotr3_la_LDFLAGS = -version-info @LIBOTR3_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@
++otrincdir = $(includedir)/libotr3
+ otrinc_HEADERS = b64.h context.h dh.h mem.h message.h privkey.h proto.h \
+ 		 version.h userstate.h tlv.h serial.h auth.h sm.h privkey-t.h
+ 
+@@ -285,8 +285,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-libotr.la: $(libotr_la_OBJECTS) $(libotr_la_DEPENDENCIES) 
+-	$(libotr_la_LINK) -rpath $(libdir) $(libotr_la_OBJECTS) $(libotr_la_LIBADD) $(LIBS)
++libotr3.la: $(libotr3_la_OBJECTS) $(libotr3_la_DEPENDENCIES) 
++	$(libotr3_la_LINK) -rpath $(libdir) $(libotr3_la_OBJECTS) $(libotr3_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+diff -Naur libotr-3.2.1.orig/toolkit/Makefile.am libotr-3.2.1/toolkit/Makefile.am
+--- libotr-3.2.1.orig/toolkit/Makefile.am	2012-11-02 04:53:36.609896510 -0400
++++ libotr-3.2.1/toolkit/Makefile.am	2012-11-02 04:53:47.536872337 -0400
+@@ -6,7 +6,7 @@
+ 	otr_modify otr_remac
+ 
+ COMMON_S = parse.c sha1hmac.c
+-COMMON_LD = ../src/libotr.la @LIBS@ @LIBGCRYPT_LIBS@
++COMMON_LD = ../src/libotr3.la @LIBS@ @LIBGCRYPT_LIBS@
+ 
+ otr_parse_SOURCES = otr_parse.c readotr.c $(COMMON_S)
+ otr_parse_LDADD = $(COMMON_LD)
+diff -Naur libotr-3.2.1.orig/toolkit/Makefile.in libotr-3.2.1/toolkit/Makefile.in
+--- libotr-3.2.1.orig/toolkit/Makefile.in	2012-11-02 04:53:36.609896510 -0400
++++ libotr-3.2.1/toolkit/Makefile.in	2012-11-02 04:53:47.536872337 -0400
+@@ -55,7 +55,7 @@
+ am_otr_mackey_OBJECTS = otr_mackey.$(OBJEXT) sesskeys.$(OBJEXT) \
+ 	$(am__objects_1)
+ otr_mackey_OBJECTS = $(am_otr_mackey_OBJECTS)
+-am__DEPENDENCIES_1 = ../src/libotr.la
++am__DEPENDENCIES_1 = ../src/libotr3.la
+ otr_mackey_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_otr_modify_OBJECTS = otr_modify.$(OBJEXT) readotr.$(OBJEXT) \
+ 	$(am__objects_1)
+@@ -159,7 +159,7 @@
+ LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBOBJS = @LIBOBJS@
+-LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@
++LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+@@ -242,7 +242,7 @@
+ INCLUDES = -I$(includedir) -I../src @LIBGCRYPT_CFLAGS@
+ noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h
+ COMMON_S = parse.c sha1hmac.c
+-COMMON_LD = ../src/libotr.la @LIBS@ @LIBGCRYPT_LIBS@
++COMMON_LD = ../src/libotr3.la @LIBS@ @LIBGCRYPT_LIBS@
+ otr_parse_SOURCES = otr_parse.c readotr.c $(COMMON_S)
+ otr_parse_LDADD = $(COMMON_LD)
+ otr_sesskeys_SOURCES = otr_sesskeys.c sesskeys.c $(COMMON_S)
diff --git a/extra/libpeas/PKGBUILD b/extra/libpeas/PKGBUILD
index 5589cae0c..4fbc36af2 100644
--- a/extra/libpeas/PKGBUILD
+++ b/extra/libpeas/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 157401 2012-04-28 09:26:44Z allan $
+# $Id: PKGBUILD 169954 2012-10-30 22:46:53Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libpeas
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.6.1
+pkgrel=1
 pkgdesc="A GObject-based plugins engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 license=('GPL2')
 depends=('gtk3' 'hicolor-icon-theme' 'gobject-introspection')
-makedepends=('gtk-doc' 'intltool' 'vala' 'python2-gobject' 'gjs' 'seed' 'glade')
+makedepends=('gtk-doc' 'intltool' 'python2-gobject' 'gjs' 'seed' 'glade')
 optdepends=('gjs: gobject-based plugin engine - gjs runtime loader'
             'seed: gobject-based plugin engine - seed runtime loader')
 options=('!libtool')
 install=libpeas.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('d508df249d5aefad0e5a720095e0103355ab13856dae6a10e6e5b8235d5eecf6')
+sha256sums=('7f133f44101594e0f96a0e5fe69c5893cde500f3edf916f680467dfd74de5c39')
 
 build() {
   cd $pkgname-$pkgver
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var --enable-vala
+    --sysconfdir=/etc --localstatedir=/var
   make
 }
 
diff --git a/extra/libpwquality/PKGBUILD b/extra/libpwquality/PKGBUILD
new file mode 100644
index 000000000..4f479520e
--- /dev/null
+++ b/extra/libpwquality/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=libpwquality
+pkgver=1.2.0
+pkgrel=1
+pkgdesc="Library for password quality checking and generating random passwords"
+arch=('i686' 'x86_64' 'mips64el')
+url="https://fedorahosted.org/libpwquality/"
+license=('GPL')
+options=('!libtool')
+depends=('cracklib')
+optdepends=('python2: Python bindings')
+makedepends=('python2')
+source=(https://fedorahosted.org/releases/l/i/libpwquality/$pkgname-$pkgver.tar.bz2)
+md5sums=('8827419118064539db70090cbed5cb21')
+
+build() {
+    cd "$pkgname-$pkgver"
+    sed -i -e 's/python setup.py/python2 setup.py/' python/Makefile.in
+
+    PYTHON=python2 ./configure --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --disable-static
+    make
+}
+
+package() {
+    cd "$pkgname-$pkgver"
+    make DESTDIR="$pkgdir" install
+}
diff --git a/extra/libquvi/PKGBUILD b/extra/libquvi/PKGBUILD
index 3cac977bb..6acd76380 100644
--- a/extra/libquvi/PKGBUILD
+++ b/extra/libquvi/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libquvi
 pkgver=0.4.1
 pkgrel=1
 pkgdesc='Library for parsing video download links.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://quvi.sourceforge.net/'
 license=('LGPL')
 depends=('libquvi-scripts' 'curl' 'lua')
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 2bb3bf12e..b1c649979 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169387 2012-10-20 09:31:46Z andyrtr $
+# $Id: PKGBUILD 171517 2012-11-18 10:27:55Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -24,8 +24,8 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-scripting-python'
 	'libreoffice-extension-wiki-publisher'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=3.6.2.2
-pkgver=3.6.2
+_LOver=3.6.3.2
+pkgver=3.6.3
 pkgrel=3
 arch=('i686' 'x86_64')
 license=('LGPL3')
@@ -37,7 +37,7 @@ makedepends=( # makedepends
              'glu' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene'
              # the runtime dependencies
              "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
-             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" 
+             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=50.1-2" 
              'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2'
              'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
 	         'ttf-dejavu') # to satisfy regression tests
@@ -75,10 +75,10 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
 	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
 	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
+	${_additional_source_url}/9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2
 	${_additional_source_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
 	${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
-	${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
+	${_additional_source_url}/3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	make-pyuno-work-with-system-wide-module-install.diff
 	buildfix.diff
@@ -87,7 +87,7 @@ noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
 	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
 	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
+	9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2
 	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
@@ -111,11 +111,11 @@ noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
 	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
 	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
 	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
+	3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('ae171ba4633cc72dba4451b1bdd3385e'
-         'cdad0734d247d91a79cb282fd851d2a7'
-         'e9a7e3d35432b72a4603ce094deb6a67'
+md5sums=('17ccf623caa77dc135d5343a51fa1ddd'
+         '94a8d18009f8e0e4ae80dc34c43604d7'
+         'f76c4439c211f229d49e5fb10ca2ba73'
          '18f577b374d60b3c760a3a3350407632'
          'f02578f5218f217a9f20e9c30e119c6a'
          '94e7f271e38c976462558b4278590178'
@@ -141,10 +141,10 @@ md5sums=('ae171ba4633cc72dba4451b1bdd3385e'
          'ace6ab49184e329db254e454a010f56d'
          'db60e4fde8dd6d6807523deb71ee34dc'
          'ba2930200c9f019c2d93a8c88c651a0f'
-         '0ff7d225d087793c8c2c680d77aac3e7'
+         '9f9e15966b5624834157fe3d748312bc'
          '6097739c841f671cb21332b9cc593ae7'
          '0d2dcdfbf28d6208751b33057f5361f0'
-         'ce5a1def34578b75959ac31210f031f6'
+         '3c0037fb07dea2f0bbae8386fa7c6a9a'
          '185d60944ea767075d27247c3162b3bc'
          '97bf43dda273d79ff90c848ab53b0e3c'
          '234e91ac65945ce1ab1e3839780e90f7'
@@ -280,7 +280,7 @@ package_libreoffice-common() {
  pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
  install=libreoffice-common.install
  depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
-          'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 'clucene' 'lcms2'
+          'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1" 'clucene' 'lcms2'
           'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
  optdepends=('libreoffice-langpack: additional language support'
              'java-runtime:     adds java support'
diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD
index 206ac7fe2..d9e85ba3d 100644
--- a/extra/librsvg/PKGBUILD
+++ b/extra/librsvg/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166591 2012-09-12 17:51:07Z jgc $
+# $Id: PKGBUILD 169956 2012-10-30 22:47:03Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=librsvg
-pkgver=2.36.3
+pkgver=2.36.4
 pkgrel=1
 pkgdesc="A SVG viewing library"
 arch=(i686 x86_64 'mips64el')
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 url="http://librsvg.sourceforge.net/"
 install=librsvg.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3d7d583271030e21acacc60cb6b81ee305713c9da5e98429cbd609312aea3632')
+sha256sums=('1021935204798f4f0ad3004a09b583668ea94a48593461b147fdcff68a18e6c2')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libsecret/PKGBUILD b/extra/libsecret/PKGBUILD
new file mode 100644
index 000000000..dc71c6b8f
--- /dev/null
+++ b/extra/libsecret/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 166488 2012-09-08 10:31:44Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=libsecret
+pkgver=0.12
+pkgrel=2
+pkgdesc='library for storing and retrieving passwords and other secrets.'
+arch=('i686' 'x86_64' 'mips64el')
+license=('LGPL')
+url="https://live.gnome.org/Libsecret"
+depends=('glib2' 'libgcrypt')
+makedepends=('intltool' 'docbook-xsl' 'gobject-introspection')
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
+sha256sums=('323db75a5e73058d3eb95597d9f798fd715ec7d58f500be84628b8f9a0617c01')
+
+build() {
+  cd "$pkgname-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/libsocialweb/PKGBUILD b/extra/libsocialweb/PKGBUILD
index 07c96ab9a..d0bc80db8 100644
--- a/extra/libsocialweb/PKGBUILD
+++ b/extra/libsocialweb/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156918 2012-04-23 09:09:02Z ibiru $
+# $Id: PKGBUILD 172299 2012-12-02 08:28:48Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libsocialweb
-pkgver=0.25.20
+pkgver=0.25.21
 pkgrel=1
 pkgdesc="A personal social data server"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,11 +12,14 @@ depends=('glib2' 'gconf' 'libsoup-gnome' 'rest' 'dbus-glib' 'libgnome-keyring'
          'json-glib' 'networkmanager')
 makedepends=('intltool' 'gtk-doc' 'vala' 'gobject-introspection')
 options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('eb0078f44eb5fc4570fcee26c5670a433ca1bb83be0cead421a4a03e7d838ff5')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+       libsocialweb-gir-fix.patch)
+sha256sums=('f676567640cede66b6ff62f440c968943c2f3a164dd5f26155b6154ab93bf687'
+            'fec8d2c67c62618b89dca238ebe502c6525d42987625b6d87dd704f88219a46a')
 
 build() {
   cd $pkgname-$pkgver
+  patch -Np1 -i ../libsocialweb-gir-fix.patch
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -29,7 +32,7 @@ build() {
 
 package() {
   cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/libsocialweb/libsocialweb-gir-fix.patch b/extra/libsocialweb/libsocialweb-gir-fix.patch
new file mode 100644
index 000000000..23fc0f535
--- /dev/null
+++ b/extra/libsocialweb/libsocialweb-gir-fix.patch
@@ -0,0 +1,82 @@
+From c1791e96182815449781fcda6007b69cd88cf7bf Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Mon, 04 Jun 2012 17:54:12 +0000
+Subject: client: Fix namespacing of introspection annotations
+
+---
+diff --git a/libsocialweb-client/sw-client-contact-view.c b/libsocialweb-client/sw-client-contact-view.c
+index bb2679f..6eaee0e 100644
+--- a/libsocialweb-client/sw-client-contact-view.c
++++ b/libsocialweb-client/sw-client-contact-view.c
+@@ -384,7 +384,7 @@ sw_client_contact_view_class_init (SwClientContactViewClass *klass)
+   /**
+    * SwClientContactView::contacts-added:
+    * @self:
+-   * @contacts: (type GLib.List) (element-type Sw.Contact):
++   * @contacts: (type GLib.List) (element-type SocialWebClient.Contact):
+    */
+   signals[CONTACTS_ADDED_SIGNAL] =
+     g_signal_new ("contacts-added",
+@@ -401,7 +401,7 @@ sw_client_contact_view_class_init (SwClientContactViewClass *klass)
+   /**
+    * SwClientContactView::contacts-removed:
+    * @self:
+-   * @contacts: (type GLib.List) (element-type Sw.Contact):
++   * @contacts: (type GLib.List) (element-type SocialWebClient.Contact):
+    */
+   signals[CONTACTS_REMOVED_SIGNAL] =
+     g_signal_new ("contacts-removed",
+@@ -418,7 +418,7 @@ sw_client_contact_view_class_init (SwClientContactViewClass *klass)
+   /**
+    * SwClientContactView::contacts-changed:
+    * @self:
+-   * @contacts: (type GLib.List) (element-type Sw.Contact):
++   * @contacts: (type GLib.List) (element-type SocialWebClient.Contact):
+    */
+   signals[CONTACTS_CHANGED_SIGNAL] =
+     g_signal_new ("contacts-changed",
+diff --git a/libsocialweb-client/sw-client-item-view.c b/libsocialweb-client/sw-client-item-view.c
+index 6bfdb76..ab98fdd 100644
+--- a/libsocialweb-client/sw-client-item-view.c
++++ b/libsocialweb-client/sw-client-item-view.c
+@@ -389,7 +389,7 @@ sw_client_item_view_class_init (SwClientItemViewClass *klass)
+   /**
+    * SwClientItemView::items-added:
+    * @self:
+-   * @items: (type GLib.List) (element-type Sw.Item):
++   * @items: (type GLib.List) (element-type SocialWebClient.Item):
+    */
+   signals[ITEMS_ADDED_SIGNAL] =
+     g_signal_new ("items-added",
+@@ -406,7 +406,7 @@ sw_client_item_view_class_init (SwClientItemViewClass *klass)
+   /**
+    * SwClientItemView::items-removed:
+    * @self:
+-   * @items: (type GLib.List) (element-type Sw.Item):
++   * @items: (type GLib.List) (element-type SocialWebClient.Item):
+    */
+   signals[ITEMS_REMOVED_SIGNAL] =
+     g_signal_new ("items-removed",
+@@ -423,7 +423,7 @@ sw_client_item_view_class_init (SwClientItemViewClass *klass)
+   /**
+    * SwClientItemView::items-changed:
+    * @self:
+-   * @items: (type GLib.List) (element-type Sw.Item):
++   * @items: (type GLib.List) (element-type SocialWebClient.Item):
+    */
+   signals[ITEMS_CHANGED_SIGNAL] =
+     g_signal_new ("items-changed",
+diff --git a/libsocialweb-client/sw-contact.c b/libsocialweb-client/sw-contact.c
+index efefb37..b56ab39 100644
+--- a/libsocialweb-client/sw-contact.c
++++ b/libsocialweb-client/sw-contact.c
+@@ -104,7 +104,6 @@ sw_contact_get_value (SwContact  *contact,
+ 
+ /**
+  * sw_contact_get_value_all: 
+- *
+  * @contact: :
+  * @key: :
+  *
+--
+cgit v0.9.0.2
diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD
index f5d92b33b..2b81a94d4 100644
--- a/extra/libsoup/PKGBUILD
+++ b/extra/libsoup/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 156920 2012-04-23 09:09:05Z ibiru $
+# $Id: PKGBUILD 170892 2012-11-12 22:13:35Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libsoup
 pkgname=('libsoup' 'libsoup-gnome')
-pkgver=2.38.1
+pkgver=2.40.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-makedepends=('glib2' 'libxml2' 'sqlite' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking')
+makedepends=('glib2' 'libxml2' 'sqlite' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking' 'python2')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
 options=('!libtool' '!emptydirs')
-sha256sums=('71b8923fc7a5fef9abc5420f7f3d666fdb589f43a8c50892d584d58b3c513f9a')
+sha256sums=('32e81220f53abb1f5bbe7d8b0717119df70667fc48e2342d82209ed1593e71dc')
 
 build() {
   cd "$pkgbase-$pkgver"
+  sed -i -e 's/env python/python2/' libsoup/tld-parser.py
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static
   make
diff --git a/extra/libssh/PKGBUILD b/extra/libssh/PKGBUILD
index 3a5d57db1..ed8bb0695 100644
--- a/extra/libssh/PKGBUILD
+++ b/extra/libssh/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 138141 2011-09-17 12:41:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 172472 2012-12-03 12:34:31Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: ice-man <icemanf@gmail.com>
 # Contributor: sergeantspoon <sergeantspoon@archlinux.us>
 
 pkgname=libssh
-pkgver=0.5.2
-pkgrel=1.1
+pkgver=0.5.3
+pkgrel=1
 pkgdesc="Library for accessing ssh client services through C libraries"
 url="http://www.libssh.org/"
 license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('openssl')
 makedepends=('cmake' 'doxygen')
-source=("https://red.libssh.org/attachments/download/27/${pkgname}-${pkgver}.tar.gz")
-md5sums=('38b67c48af7a9204660a3e08f97ceba6')
+source=("https://red.libssh.org/attachments/download/38/${pkgname}-${pkgver}.tar.gz")
 
 build() {
   cd "${srcdir}"
@@ -29,3 +29,4 @@ package(){
   cd "${srcdir}"/build
   make DESTDIR="${pkgdir}" install
 }
+md5sums=('9ad01838d3b89d98e900e0f6260a88cc')
diff --git a/extra/libtasn1/PKGBUILD b/extra/libtasn1/PKGBUILD
index be088182b..32d7f9062 100644
--- a/extra/libtasn1/PKGBUILD
+++ b/extra/libtasn1/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 167197 2012-09-27 15:53:17Z andyrtr $
+# $Id: PKGBUILD 172017 2012-11-26 14:46:50Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=libtasn1
-pkgver=2.14
+pkgver=3.1
 pkgrel=1
 pkgdesc="The ASN.1 library used in GNUTLS"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,12 +12,19 @@ url="http://www.gnu.org/software/libtasn1/"
 depends=('glibc' 'texinfo')
 options=('!libtool')
 install=libtasn1.install
-source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig})
-sha1sums=('22f9e0b15f870c8e03ac9cc1ead969d4d84eb931'
-          'cd6fdde4f59f7c24eb738896904034f17ab490f2')
+source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig}
+        buffer_overflow_fix.diff)
+md5sums=('a3c713c41a9a73851235dc37051be46f'
+         '43500f54858ffe021e5fd20896b165ad'
+         '4c9e248a4198d9710bf2f822a7c447a5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # corrected possible buffer overflow in parser errors. 
+  # http://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=commit;h=aa6e97f68d6c8d06f531d9b6bb462dc1c0720f77
+  patch -Np1 -i ${srcdir}/buffer_overflow_fix.diff
+  
   ./configure --prefix=/usr \
       --with-packager=Archlinux \
       --with-packager-bug-reports="http://bugs.archlinux.org/" \
diff --git a/extra/libtasn1/buffer_overflow_fix.diff b/extra/libtasn1/buffer_overflow_fix.diff
new file mode 100644
index 000000000..c1e71015c
--- /dev/null
+++ b/extra/libtasn1/buffer_overflow_fix.diff
@@ -0,0 +1,75 @@
+From aa6e97f68d6c8d06f531d9b6bb462dc1c0720f77 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Sun, 25 Nov 2012 14:16:24 +0100
+Subject: [PATCH] corrected possible buffer overflow in parser errors.
+
+---
+ lib/ASN1.c |    6 +++---
+ lib/ASN1.y |    6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/lib/ASN1.c b/lib/ASN1.c
+index 2a60527..df6fb64 100644
+--- a/lib/ASN1.c
++++ b/lib/ASN1.c
+@@ -119,7 +119,7 @@ static unsigned int line_number;	/* line number describing the
+ 					   parser position inside the
+ 					   file */
+ static char last_error[ASN1_MAX_ERROR_DESCRIPTION_SIZE] = "";
+-static char last_error_token[ASN1_MAX_NAME_SIZE+1] = ""; /* used when expected errors occur */
++static char last_error_token[ASN1_MAX_ERROR_DESCRIPTION_SIZE+1] = ""; /* used when expected errors occur */
+ static char last_token[ASN1_MAX_NAME_SIZE+1] = ""; /* last token find in the file
+ 					   to parse before the 'parse
+ 					   error' */
+@@ -3283,7 +3283,7 @@ _asn1_yyerror (const char *s)
+       strcmp (last_token, "TeletexString") == 0 ||
+       strcmp (last_token, "BMPString") == 0)
+     {
+-      snprintf (last_error_token, ASN1_MAX_ERROR_DESCRIPTION_SIZE,
++      snprintf (last_error_token, sizeof(last_error_token),
+                 "%s", last_token);
+       fprintf(stderr, 
+                "%s:%u: Warning: %s is a built-in ASN.1 type.\n",
+@@ -3294,7 +3294,7 @@ _asn1_yyerror (const char *s)
+ 
+   if (result_parse != ASN1_NAME_TOO_LONG)
+     {
+-      snprintf (last_error, ASN1_MAX_ERROR_DESCRIPTION_SIZE,
++      snprintf (last_error, sizeof(last_error),
+                 "%s:%u: Error: %s near '%s'", file_name,
+                 line_number, s, last_token);
+       result_parse = ASN1_SYNTAX_ERROR;
+diff --git a/lib/ASN1.y b/lib/ASN1.y
+index 874eb13..e0add54 100644
+--- a/lib/ASN1.y
++++ b/lib/ASN1.y
+@@ -42,7 +42,7 @@ static unsigned int line_number;	/* line number describing the
+ 					   parser position inside the
+ 					   file */
+ static char last_error[ASN1_MAX_ERROR_DESCRIPTION_SIZE] = "";
+-static char last_error_token[ASN1_MAX_NAME_SIZE+1] = ""; /* used when expected errors occur */
++static char last_error_token[ASN1_MAX_ERROR_DESCRIPTION_SIZE+1] = ""; /* used when expected errors occur */
+ static char last_token[ASN1_MAX_NAME_SIZE+1] = ""; /* last token find in the file
+ 					   to parse before the 'parse
+ 					   error' */
+@@ -869,7 +869,7 @@ _asn1_yyerror (const char *s)
+       strcmp (last_token, "TeletexString") == 0 ||
+       strcmp (last_token, "BMPString") == 0)
+     {
+-      snprintf (last_error_token, ASN1_MAX_ERROR_DESCRIPTION_SIZE,
++      snprintf (last_error_token, sizeof(last_error_token),
+                 "%s", last_token);
+       fprintf(stderr, 
+                "%s:%u: Warning: %s is a built-in ASN.1 type.\n",
+@@ -880,7 +880,7 @@ _asn1_yyerror (const char *s)
+ 
+   if (result_parse != ASN1_NAME_TOO_LONG)
+     {
+-      snprintf (last_error, ASN1_MAX_ERROR_DESCRIPTION_SIZE,
++      snprintf (last_error, sizeof(last_error),
+                 "%s:%u: Error: %s near '%s'", file_name,
+                 line_number, s, last_token);
+       result_parse = ASN1_SYNTAX_ERROR;
+-- 
+1.7.2.5
+
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index a22fdf1ac..6b4e246a8 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169448 2012-10-21 11:01:54Z ibiru $
+# $Id: PKGBUILD 170197 2012-11-04 18:02:05Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libtorrent-rasterbar
-pkgver=0.16.4
+pkgver=0.16.5
 pkgrel=1
 epoch=1
 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
@@ -14,11 +14,11 @@ depends=('boost-libs' 'geoip' 'python2')
 makedepends=('boost')
 options=('!libtool' '!emptydirs')
 source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('f8695373c574a6801b4dfe7030e0a0c4bb610abd')
+sha1sums=('dde29c7a51392d9098de23e2e69a993a5c380016')
 
 build() {
   cd $pkgname-$pkgver
-  PYTHON2=/usr/bin/python2 ./configure --prefix=/usr \
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
       --enable-python-binding \
       --with-libgeoip=system
   make
diff --git a/extra/libva-driver-intel/PKGBUILD b/extra/libva-driver-intel/PKGBUILD
deleted file mode 100644
index 81f20b214..000000000
--- a/extra/libva-driver-intel/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 161867 2012-06-16 00:18:43Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-
-pkgname=libva-driver-intel
-pkgver=1.0.18
-pkgrel=1
-pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family."
-arch=('i686' 'x86_64')
-url="http://freedesktop.org/wiki/Software/vaapi"
-license=('MIT')
-depends=('libva')
-options=('!libtool')
-source=(http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-${pkgver}.tar.bz2)
-md5sums=('d8c52f07148dfb2e0407549b90300bc1')
-
-build() {
-  cd intel-driver-$pkgver
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd intel-driver-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/libva-intel-driver/PKGBUILD b/extra/libva-intel-driver/PKGBUILD
index b11c9a7de..daebd5ba6 100644
--- a/extra/libva-intel-driver/PKGBUILD
+++ b/extra/libva-intel-driver/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 168383 2012-10-09 16:37:25Z ibiru $
+# $Id: PKGBUILD 170694 2012-11-09 19:58:58Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libva-intel-driver
-pkgver=1.0.18
+pkgver=1.0.19
 pkgrel=1
 pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family."
 arch=('i686' 'x86_64')
@@ -11,15 +11,12 @@ license=('MIT')
 depends=('libva')
 options=('!libtool')
 replaces=('libva-driver-intel')
-source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2
-        build-fix.patch)
-sha1sums=('2cbf6f8c9f59516cceb5c4245576d53d26612256'
-          '447987d81800b2a5c434e6b6b19b6f8ec9c675d1')
+source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha1sums=('9b1c92ca2b59b3b150fd45cb01775e0c114a41a7')
 
 build() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../build-fix.patch
-  ./configure --prefix=/usr
+  ./autogen.sh --prefix=/usr
   make
 }
 
diff --git a/extra/libvorbis/PKGBUILD b/extra/libvorbis/PKGBUILD
index 31d5b1978..69857d8da 100644
--- a/extra/libvorbis/PKGBUILD
+++ b/extra/libvorbis/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=libvorbis
 pkgver=1.3.3
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Vorbis codec library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xiph.org/vorbis/"
diff --git a/extra/libwebkit/PKGBUILD b/extra/libwebkit/PKGBUILD
deleted file mode 100644
index 924d155e6..000000000
--- a/extra/libwebkit/PKGBUILD
+++ /dev/null
@@ -1,91 +0,0 @@
-# $Id: PKGBUILD 165830 2012-08-31 06:45:09Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=libwebkit
-pkgname=(libwebkit) # libwebkit3)
-pkgver=1.8.3
-pkgrel=1.2
-pkgdesc="An opensource web content engine"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://webkitgtk.org/"
-license=('custom')
-depends=('libxt' 'libxslt' 'sqlite' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant' 'libgl'
-         'geoclue')
-makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'mesa') # 'gtk3' 'mesa')
-options=('!libtool' '!emptydirs')
-source=(http://webkitgtk.org/releases/webkit-$pkgver.tar.xz
-        bison26.diff)
-sha256sums=('ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7'
-            '2a9c0c1b9d5259fd1254ebea228fc83313267fbe8cfec1bb43356de1f355b93e')
-
-build() {
-  cd "$srcdir/webkit-$pkgver"
-  # https://bugs.webkit.org/show_bug.cgi?id=92264 / http://trac.webkit.org/changeset/124099
-  patch -Np1 -i ${srcdir}/bison26.diff
-
-  mkdir build-gtk{2,3}
-
-  if [ "$CARCH" = "mips64el" ]; then
-      # Fix MIPS N32 support.
-      sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
-          Source/JavaScriptCore/wtf/Platform.h
-      # Don't enable JIT even if configure finds that it's not supported.
-      sed -i 's/#define ENABLE_JIT 1/#define ENABLE_JIT 0/' \
-          Source/JavaScriptCore/wtf/Platform.h
-
-# --disable-optimizations will add -O0
-      export CFLAGS="${CFLAGS/-O[0-9]}"
-
-      extra="--disable-fast-malloc --disable-optimizations"
-  fi
-
-  # clear makeflags: race during introspection.
-  # WebKit*.gir should be created before WebKit*.typelib, but isn't
-  #MAKEFLAGS=
-
-  ( cd build-gtk2 && _build --with-gtk=2.0 $extra )
- # ( cd build-gtk3 && _build --with-gtk=3.0 $extra )
-}
-
-_build() {
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
-    --enable-introspection \
-    --with-font-backend=freetype \
-    --with-unicode-backend=icu \
-    --enable-spellcheck "$@"
-  #make all stamp-po
-  
-  # crazy smp build fix by LFS - http://www.linuxfromscratch.org/blfs/view/svn/x/webkitgtk.html
-  # !!! safes a lot of time but may cover other bugs you won't notice anymore !!!
-  error_count=0
-  until make all stamp-po #-j$(getconf _NPROCESSORS_ONLN)
-  do
-    if (( $((error_count++)) > 4 ))
-    then
-      echo Too Many Errors
-      break
-    fi
-  done
-  unset error_count
-}
-
-package_libwebkit() {
-  pkgdesc+=" (for GTK2)"
-  depends+=(gtk2)
-
-  cd "$srcdir/webkit-$pkgver/build-gtk2"
-  make DESTDIR="$pkgdir" install
-  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit/LICENSE"
-}
-
-package_libwebkit3() {
-  pkgdesc+=" (for GTK3)"
-  depends+=(gtk3)
-
-  cd "$srcdir/webkit-$pkgver/build-gtk3"
-  make DESTDIR="$pkgdir" install
-  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit3/LICENSE"
-}
-
-
-
diff --git a/extra/libwebkit/bison26.diff b/extra/libwebkit/bison26.diff
deleted file mode 100644
index 682ae7127..000000000
--- a/extra/libwebkit/bison26.diff
+++ /dev/null
@@ -1,556 +0,0 @@
-Subversion Revision: 123651
-diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y
-index c7c10b541cd46ad4febc6efe289e81b2cfb0861e..1c604e76b4da4cc65f395bc4a73b112561bd5c84 100644
---- a/Source/WebCore/css/CSSGrammar.y
-+++ b/Source/WebCore/css/CSSGrammar.y
-@@ -53,14 +53,13 @@ using namespace HTMLNames;
- #define YYMAXDEPTH 10000
- #define YYDEBUG 0
- 
--// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x
--#define YYPARSE_PARAM parser
--#define YYLEX_PARAM parser
--
- %}
- 
- %pure_parser
- 
-+%parse-param { CSSParser* parser }
-+%lex-param { CSSParser* parser }
-+
- %union {
-     bool boolean;
-     char character;
-@@ -89,7 +88,7 @@ using namespace HTMLNames;
- 
- %{
- 
--static inline int cssyyerror(const char*)
-+static inline int cssyyerror(void*, const char*)
- {
-     return 1;
- }
-diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp
-index 650844060477cfc6ea6fdeaf11ec63b34ac646e7..8369549dbff25537cf93a11237a9bbbac4fe50f2 100644
---- a/Source/WebCore/css/CSSParser.cpp
-+++ b/Source/WebCore/css/CSSParser.cpp
-@@ -114,7 +114,7 @@
- extern int cssyydebug;
- #endif
- 
--extern int cssyyparse(void* parser);
-+extern int cssyyparse(WebCore::CSSParser*);
- 
- using namespace std;
- using namespace WTF;
-diff --git a/Source/WebCore/xml/XPathGrammar.y b/Source/WebCore/xml/XPathGrammar.y
-index 2eba5b35bd2338272a0f4ec756d137e47d2d59c8..d558211db2d89ea13716762a51397755560f66f3 100644
---- a/Source/WebCore/xml/XPathGrammar.y
-+++ b/Source/WebCore/xml/XPathGrammar.y
-@@ -34,6 +34,7 @@
- #include "XPathParser.h"
- #include "XPathPath.h"
- #include "XPathPredicate.h"
-+#include "XPathStep.h"
- #include "XPathVariableReference.h"
- #include <wtf/FastMalloc.h>
- 
-@@ -44,8 +45,6 @@
- #define YYLTYPE_IS_TRIVIAL 1
- #define YYDEBUG 0
- #define YYMAXDEPTH 10000
--#define YYPARSE_PARAM parserParameter
--#define PARSER static_cast<Parser*>(parserParameter)
- 
- using namespace WebCore;
- using namespace XPath;
-@@ -53,6 +52,7 @@ using namespace XPath;
- %}
- 
- %pure_parser
-+%parse-param { WebCore::XPath::Parser* parser }
- 
- %union
- {
-@@ -71,7 +71,7 @@ using namespace XPath;
- %{
- 
- static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
--static void xpathyyerror(const char*) { }
-+static void xpathyyerror(void*, const char*) { }
-     
- %}
- 
-@@ -118,7 +118,7 @@ static void xpathyyerror(const char*) { }
- Expr:
-     OrExpr
-     {
--        PARSER->m_topExpr = $1;
-+        parser->m_topExpr = $1;
-     }
-     ;
- 
-@@ -138,7 +138,7 @@ AbsoluteLocationPath:
-     '/'
-     {
-         $$ = new LocationPath;
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     |
-     '/' RelativeLocationPath
-@@ -150,7 +150,7 @@ AbsoluteLocationPath:
-     {
-         $$ = $2;
-         $$->insertFirstStep($1);
--        PARSER->unregisterParseNode($1);
-+        parser->unregisterParseNode($1);
-     }
-     ;
- 
-@@ -159,22 +159,22 @@ RelativeLocationPath:
-     {
-         $$ = new LocationPath;
-         $$->appendStep($1);
--        PARSER->unregisterParseNode($1);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     RelativeLocationPath '/' Step
-     {
-         $$->appendStep($3);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($3);
-     }
-     |
-     RelativeLocationPath DescendantOrSelf Step
-     {
-         $$->appendStep($2);
-         $$->appendStep($3);
--        PARSER->unregisterParseNode($2);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($2);
-+        parser->unregisterParseNode($3);
-     }
-     ;
- 
-@@ -183,58 +183,58 @@ Step:
-     {
-         if ($2) {
-             $$ = new Step(Step::ChildAxis, *$1, *$2);
--            PARSER->deletePredicateVector($2);
-+            parser->deletePredicateVector($2);
-         } else
-             $$ = new Step(Step::ChildAxis, *$1);
--        PARSER->deleteNodeTest($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteNodeTest($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     NAMETEST OptionalPredicateList
-     {
-         String localName;
-         String namespaceURI;
--        if (!PARSER->expandQName(*$1, localName, namespaceURI)) {
--            PARSER->m_gotNamespaceError = true;
-+        if (!parser->expandQName(*$1, localName, namespaceURI)) {
-+            parser->m_gotNamespaceError = true;
-             YYABORT;
-         }
-         
-         if ($2) {
-             $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2);
--            PARSER->deletePredicateVector($2);
-+            parser->deletePredicateVector($2);
-         } else
-             $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     AxisSpecifier NodeTest OptionalPredicateList
-     {
-         if ($3) {
-             $$ = new Step($1, *$2, *$3);
--            PARSER->deletePredicateVector($3);
-+            parser->deletePredicateVector($3);
-         } else
-             $$ = new Step($1, *$2);
--        PARSER->deleteNodeTest($2);
--        PARSER->registerParseNode($$);
-+        parser->deleteNodeTest($2);
-+        parser->registerParseNode($$);
-     }
-     |
-     AxisSpecifier NAMETEST OptionalPredicateList
-     {
-         String localName;
-         String namespaceURI;
--        if (!PARSER->expandQName(*$2, localName, namespaceURI)) {
--            PARSER->m_gotNamespaceError = true;
-+        if (!parser->expandQName(*$2, localName, namespaceURI)) {
-+            parser->m_gotNamespaceError = true;
-             YYABORT;
-         }
- 
-         if ($3) {
-             $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3);
--            PARSER->deletePredicateVector($3);
-+            parser->deletePredicateVector($3);
-         } else
-             $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
--        PARSER->deleteString($2);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($2);
-+        parser->registerParseNode($$);
-     }
-     |
-     AbbreviatedStep
-@@ -259,23 +259,23 @@ NodeTest:
-         else if (*$1 == "comment")
-             $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
- 
--        PARSER->deleteString($1);
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);
-+        parser->registerNodeTest($$);
-     }
-     |
-     PI '(' ')'
-     {
-         $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
--        PARSER->deleteString($1);        
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);
-+        parser->registerNodeTest($$);
-     }
-     |
-     PI '(' LITERAL ')'
-     {
-         $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
--        PARSER->deleteString($1);        
--        PARSER->deleteString($3);
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);
-+        parser->deleteString($3);
-+        parser->registerNodeTest($$);
-     }
-     ;
- 
-@@ -293,14 +293,14 @@ PredicateList:
-     {
-         $$ = new Vector<Predicate*>;
-         $$->append(new Predicate($1));
--        PARSER->unregisterParseNode($1);
--        PARSER->registerPredicateVector($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerPredicateVector($$);
-     }
-     |
-     PredicateList Predicate
-     {
-         $$->append(new Predicate($2));
--        PARSER->unregisterParseNode($2);
-+        parser->unregisterParseNode($2);
-     }
-     ;
- 
-@@ -315,7 +315,7 @@ DescendantOrSelf:
-     SLASHSLASH
-     {
-         $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -323,13 +323,13 @@ AbbreviatedStep:
-     '.'
-     {
-         $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     |
-     DOTDOT
-     {
-         $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -337,8 +337,8 @@ PrimaryExpr:
-     VARIABLEREFERENCE
-     {
-         $$ = new VariableReference(*$1);
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     '(' Expr ')'
-@@ -349,15 +349,15 @@ PrimaryExpr:
-     LITERAL
-     {
-         $$ = new StringExpression(*$1);
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     NUMBER
-     {
-         $$ = new Number($1->toDouble());
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     FunctionCall
-@@ -369,8 +369,8 @@ FunctionCall:
-         $$ = createFunction(*$1);
-         if (!$$)
-             YYABORT;
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     FUNCTIONNAME '(' ArgumentList ')'
-@@ -378,9 +378,9 @@ FunctionCall:
-         $$ = createFunction(*$1, *$3);
-         if (!$$)
-             YYABORT;
--        PARSER->deleteString($1);
--        PARSER->deleteExpressionVector($3);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->deleteExpressionVector($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -389,14 +389,14 @@ ArgumentList:
-     {
-         $$ = new Vector<Expression*>;
-         $$->append($1);
--        PARSER->unregisterParseNode($1);
--        PARSER->registerExpressionVector($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerExpressionVector($$);
-     }
-     |
-     ArgumentList ',' Argument
-     {
-         $$->append($3);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($3);
-     }
-     ;
- 
-@@ -412,9 +412,9 @@ UnionExpr:
-         $$ = new Union;
-         $$->addSubExpression($1);
-         $$->addSubExpression($3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -430,9 +430,9 @@ PathExpr:
-     {
-         $3->setAbsolute(true);
-         $$ = new Path(static_cast<Filter*>($1), $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     |
-     FilterExpr DescendantOrSelf RelativeLocationPath
-@@ -440,10 +440,10 @@ PathExpr:
-         $3->insertFirstStep($2);
-         $3->setAbsolute(true);
-         $$ = new Path(static_cast<Filter*>($1), $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($2);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($2);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -453,9 +453,9 @@ FilterExpr:
-     PrimaryExpr PredicateList
-     {
-         $$ = new Filter($1, *$2);
--        PARSER->unregisterParseNode($1);
--        PARSER->deletePredicateVector($2);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->deletePredicateVector($2);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -465,9 +465,9 @@ OrExpr:
-     OrExpr OR AndExpr
-     {
-         $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -477,9 +477,9 @@ AndExpr:
-     AndExpr AND EqualityExpr
-     {
-         $$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -489,9 +489,9 @@ EqualityExpr:
-     EqualityExpr EQOP RelationalExpr
-     {
-         $$ = new EqTestOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -501,9 +501,9 @@ RelationalExpr:
-     RelationalExpr RELOP AdditiveExpr
-     {
-         $$ = new EqTestOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -513,17 +513,17 @@ AdditiveExpr:
-     AdditiveExpr PLUS MultiplicativeExpr
-     {
-         $$ = new NumericOp(NumericOp::OP_Add, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     |
-     AdditiveExpr MINUS MultiplicativeExpr
-     {
-         $$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -533,9 +533,9 @@ MultiplicativeExpr:
-     MultiplicativeExpr MULOP UnaryExpr
-     {
-         $$ = new NumericOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -546,8 +546,8 @@ UnaryExpr:
-     {
-         $$ = new Negative;
-         $$->addSubExpression($2);
--        PARSER->unregisterParseNode($2);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($2);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-diff --git a/Source/WebCore/xml/XPathParser.cpp b/Source/WebCore/xml/XPathParser.cpp
-index 62d8ee37fd6ebb74a580a00c59beb6cd40c5a8b7..b5e6a9237593b4aaa2a243f2ff9d86e57f930a97 100644
---- a/Source/WebCore/xml/XPathParser.cpp
-+++ b/Source/WebCore/xml/XPathParser.cpp
-@@ -32,24 +32,21 @@
- #include "XPathEvaluator.h"
- #include "XPathException.h"
- #include "XPathNSResolver.h"
-+#include "XPathPath.h"
- #include "XPathStep.h"
- #include <wtf/StdLibExtras.h>
- #include <wtf/text/StringHash.h>
- 
--int xpathyyparse(void*);
--
-+using namespace WebCore;
- using namespace WTF;
- using namespace Unicode;
-+using namespace XPath;
- 
--namespace WebCore {
--namespace XPath {
--
--class LocationPath;
--
--#include "XPathGrammar.h"    
-+extern int xpathyyparse(WebCore::XPath::Parser*);
-+#include "XPathGrammar.h"
- 
- Parser* Parser::currentParser = 0;
--    
-+
- enum XMLCat { NameStart, NameCont, NotPartOfName };
- 
- typedef HashMap<String, Step::Axis> AxisNamesMap;
-@@ -630,5 +627,3 @@ void Parser::deleteNodeTest(Step::NodeTest* t)
-     delete t;
- }
- 
--}
--}
-
diff --git a/extra/libwebp/PKGBUILD b/extra/libwebp/PKGBUILD
index 8028b0de5..c9b839c91 100644
--- a/extra/libwebp/PKGBUILD
+++ b/extra/libwebp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libwebp
 pkgver=0.2.0
 pkgrel=1
 pkgdesc="WebP library and conversion tools"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://code.google.com/intl/en/speed/webp/"
 license=('BSD')
 depends=('libpng' 'libjpeg')
diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD
index d78fe2241..7b3688e6d 100644
--- a/extra/libwnck3/PKGBUILD
+++ b/extra/libwnck3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 166583 2012-09-12 17:32:14Z jgc $
+# $Id: PKGBUILD 170860 2012-11-12 20:09:16Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libwnck3
 _pkgbasename=libwnck
-pkgver=3.4.3
+pkgver=3.4.4
 pkgrel=1
 pkgdesc="Window Navigator Construction Kit (GTK+3)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 url="http://www.gnome.org/"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('e468118927d50231df250d1f00106b32139aaad1ee9249a4ef316e5526d17d1d')
+sha256sums=('a545a23ea7681fafae033b4f68b69ef022d446a9325286291bb8882b9016a130')
 
 build() {
     cd "$_pkgbasename-$pkgver"
diff --git a/extra/libxklavier/PKGBUILD b/extra/libxklavier/PKGBUILD
index eb2631f30..cf4d30146 100644
--- a/extra/libxklavier/PKGBUILD
+++ b/extra/libxklavier/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156928 2012-04-23 09:09:15Z ibiru $
+# $Id: PKGBUILD 169960 2012-10-30 22:47:14Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@archlinux.org>
 
 pkgname=libxklavier
-pkgver=5.2.1
-pkgrel=2
+pkgver=5.3
+pkgrel=1
 pkgdesc="High-level API for X Keyboard Extension"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
@@ -12,8 +12,8 @@ depends=('glib2' 'libxkbfile' 'libxml2' 'xkeyboard-config' 'libxi' 'iso-codes')
 makedepends=('gobject-introspection')
 options=('!libtool' '!emptydirs')
 url="http://gswitchit.sourceforge.net"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a7a1ca8ae493fb652e3456a6b3a0b07514447161aab41feed96b968f2d338b5e')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libxml++/PKGBUILD b/extra/libxml++/PKGBUILD
index e3fc6ae42..8193c66b9 100644
--- a/extra/libxml++/PKGBUILD
+++ b/extra/libxml++/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 137178 2011-09-06 09:14:31Z ibiru $
+# $Id: PKGBUILD 170207 2012-11-05 11:38:10Z jgc $
 # Maintainer: damir <damir@archlinux.org>
 
 pkgbase=libxml++
-pkgname=('libxmlplusplus' 'libxmlplusplus-docs')
-pkgver=2.34.2
-pkgrel=1.1
+pkgname=('libxml++' 'libxml++-docs')
+pkgver=2.36.0
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://libxmlplusplus.sourceforge.net/"
 makedepends=('pkgconfig' 'glibmm-docs' 'libxml2' 'glibmm')
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.34/${pkgbase}-${pkgver}.tar.xz)
-sha256sums=('77daba20ab76631071d4ed4cc18fa2e981160ca05ae661e8d146f2b0728f9baa')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.36/${pkgbase}-${pkgver}.tar.xz)
+sha256sums=('bfdf327bf9ebd12946b7aa6a152045f209d5c9fecd06ebfcdf9b3e7c1af6e2e1')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/libzapojit/PKGBUILD b/extra/libzapojit/PKGBUILD
new file mode 100644
index 000000000..2846994c5
--- /dev/null
+++ b/extra/libzapojit/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 169961 2012-10-30 22:47:17Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=libzapojit
+pkgver=0.0.2
+pkgrel=1
+pkgdesc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('libsoup' 'gnome-online-accounts')
+makedepends=('intltool' 'gobject-introspection')
+url="http://www.gnome.org"
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('7b5a2fcf8e94fa8c869098b8461104633f4b046c471a03e3fea2b1a358574b24')
+
+build() {
+  cd "$pkgname-$pkgver"
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/libzeitgeist/PKGBUILD b/extra/libzeitgeist/PKGBUILD
new file mode 100644
index 000000000..46ce01264
--- /dev/null
+++ b/extra/libzeitgeist/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: kiefer <jorgelmadrid@gmail.com>
+# Contributor: Alessio Sergi <asergi at archlinux dot us>
+
+pkgname=libzeitgeist
+pkgver=0.3.18
+_pkgmainver=0.3
+pkgrel=3
+pkgdesc="Zeitgeist client library"
+arch=('i686' 'x86_64' 'mips64el')
+url="https://launchpad.net/libzeitgeist"
+license=('LGPL2.1')
+depends=('glib2')
+optdepends=("zeitgeist: zeitgeist framework")
+options=('!libtool')
+source=(http://launchpad.net/${pkgname}/${_pkgmainver}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz)
+md5sums=('d63a37295d01a58086d0d4ae26e604c2')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libzrtpcpp/PKGBUILD b/extra/libzrtpcpp/PKGBUILD
index e004e6e6f..1a5aacc34 100644
--- a/extra/libzrtpcpp/PKGBUILD
+++ b/extra/libzrtpcpp/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libzrtpcpp
 pkgver=2.1.2
 pkgrel=1
 pkgdesc="A C++ implementation of Phil Zimmermann's ZRTP specification"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.gnutelephony.org/index.php/GNU_ZRTP'
 license=('GPL3')
 depends=('ccrtp')
diff --git a/extra/libzvt/PKGBUILD b/extra/libzvt/PKGBUILD
index 157164ec6..2cd466883 100644
--- a/extra/libzvt/PKGBUILD
+++ b/extra/libzvt/PKGBUILD
@@ -12,15 +12,18 @@ url="http://ftp.gnome.org/pub/GNOME/sources/libzvt"
 depends=('gtk2' 'libart-lgpl')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(ftp://ftp.gnome.org/pub/GNOME/sources/libzvt/2.0/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('4bbea49495a341650fa1f89908e6554e')
+source=(ftp://ftp.gnome.org/pub/GNOME/sources/libzvt/2.0/${pkgname}-${pkgver}.tar.bz2
+	libzvt-2.0.1-correct_glib_include.patch)
+md5sums=('4bbea49495a341650fa1f89908e6554e'
+	 '2e30c7aafd5fc8dc1de0971ca562fee0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/libzvt-2.0.1-correct_glib_include.patch
   sed -i -e 's/-DGTK_DISABLE_DEPRECATED//g' libzvt/Makefile.*
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib
+      --libexecdir=/usr/lib --build=$CHOST
   make
 }
 
diff --git a/extra/libzvt/libzvt-2.0.1-correct_glib_include.patch b/extra/libzvt/libzvt-2.0.1-correct_glib_include.patch
new file mode 100644
index 000000000..e94c49135
--- /dev/null
+++ b/extra/libzvt/libzvt-2.0.1-correct_glib_include.patch
@@ -0,0 +1,11 @@
+--- libzvt-2.0.1.orig/libzvt/gnome-pty-helper.c	2002-06-05 01:07:33.000000000 -0500
++++ libzvt-2.0.1/libzvt/gnome-pty-helper.c	2012-11-29 20:07:50.505466139 -0500
+@@ -52,7 +52,7 @@
+ #include <stdio.h>
+ #include <utmp.h>
+ #include <grp.h>
+-#include <glib/galloca.h>
++#include <glib.h>
+ #include "gnome-pty.h"
+ #include "gnome-login-support.h"
+ 
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index 580e9ba9c..ff6772900 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 160457 2012-06-02 08:38:52Z pierre $
+# $Id: PKGBUILD 171703 2012-11-21 16:00:29Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
-pkgver=1.4.31
+pkgver=1.4.32
 pkgrel=1
 pkgdesc='A secure, fast, compliant and very flexible web-server'
 license=('custom')
@@ -20,8 +20,8 @@ install='lighttpd.install'
 source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"
         "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc"
         'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service')
-sha256sums=('8a0a4f1ab782c2a3554e031c7d8ad600aac9b4c0466710a6cc9aab10659fe3f2'
-            '0ba44866f6ebdf6fefc8efba89240eacff075b5d1b80e0d7a9e0479491ff01a7'
+sha256sums=('1368f80069ce71f5928cad59c8e60c0b95876942ca9e02c53853e54ae24aedc1'
+            '5456a90967df6774386010baa3fa67dba1c80c3b7058c70c80931d8dea5093e7'
             '186f4bb2364f82d4076a2ba7d3e088ffb356550493d92dd9d5eb57cac2839c17'
             '6df18675691384c48b9137c8f18ca238055001f1077baf05cb8322247b475a77'
             'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa'
diff --git a/extra/lilv/PKGBUILD b/extra/lilv/PKGBUILD
index bcc97d988..6036ddd5a 100644
--- a/extra/lilv/PKGBUILD
+++ b/extra/lilv/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lilv
 pkgver=0.14.4
 pkgrel=1
 pkgdesc="A library to make the use of LV2 plugins as simple as possible for applications."
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://drobilla.net/software/$pkgname/"
 license=('custom:ISC')
 depends=('python2' 'sratom' 'jack')
diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD
index beb0da687..f349b5b02 100644
--- a/extra/link-grammar/PKGBUILD
+++ b/extra/link-grammar/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 169082 2012-10-17 18:53:40Z giovanni $
+# $Id: PKGBUILD 170367 2012-11-06 17:34:52Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=link-grammar
-pkgver=4.7.8
+pkgver=4.7.9
 pkgrel=1
 pkgdesc="A Grammar Checking library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.abisource.com/downloads/link-grammar/"
 license=('BSD')
-depends=('glibc')
+depends=('aspell')
 options=('!libtool' '!makeflags')
 source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('27de0300841a6e8cbd607d5cb43d4eda')
+md5sums=('c115f2b46d577e038e52128ece034144')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD
deleted file mode 100644
index d27cd5ed8..000000000
--- a/extra/lirc/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# $Id: PKGBUILD 161828 2012-06-15 08:18:10Z tpowa $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgbase=lirc
-pkgname=('lirc' 'lirc-utils')
-pkgver=0.9.0
-pkgrel=18
-epoch=1
-_extramodules=extramodules-3.4-ARCH
-arch=('i686' 'x86_64')
-url="http://www.lirc.org/"
-license=('GPL')
-### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-headers>=3.4' 'linux-headers<3.5' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
-options=('!makeflags' '!strip')
-source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
-        lirc_wpc8769l.patch
-        lircd-handle-large-config.patch
-        lirc_atiusb-kfifo.patch
-        kernel-2.6.39.patch
-	lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd)
-md5sums=('b232aef26f23fe33ea8305d276637086'
-         '1cce37e18e3f6f46044abab29016d18f'
-         'b70cc9640505205446ec47b7d4779f38'
-         '1f8b104a2365d9f93404b143f499059b'
-         '087a7d102e1c96bf1179f38db2b0b237'
-         '8d0e238dc0eda95e340fe570605da492'
-         '85f7fdac55e5256967241864049bf5e9'
-         '3deb02604b37811d41816e9b4385fcc3'
-         '5b1f8c9cd788a39a6283f93302ce5c6e'
-         'f0c0ac930326168035f0c8e24357ae55'
-         '69d099e6deedfa3c1ee2b6e82d9b8bfb')
-
-build() {
-  _kernver="$(cat /lib/modules/${_extramodules}/version)"
-  cd "${srcdir}/lirc-${pkgver}"
-  patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
-  patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
-  patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch"
-  patch -Np1 -i "${srcdir}/kernel-2.6.39.patch"
-
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  sed -e 's/@X_CFLAGS@//g' \
-      -e 's/@X_LIBS@//g' \
-      -e 's/@X_PRE_LIBS@//g' \
-      -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
-  libtoolize
-  autoreconf
-
-  PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
-      --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
-      --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \
-      --with-transmitter
-
-  # Remove drivers already in kernel
-  sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \
-      -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \
-      -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \
-      -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile 
-  make
-}
-
-package_lirc() {
-  pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
-  depends=('lirc-utils' 'linux>=3.4' 'linux<3.5')
-  replaces=('lirc+pctv')
-  install=lirc.install
-
-  cd "${srcdir}/lirc-${pkgver}/drivers"
-  make DESTDIR="${pkgdir}" moduledir="/lib/modules/${_extramodules}" install
-
-  # set the kernel we've built for inside the install script
-  sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install"
-  # gzip -9 modules
-  find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-}
-
-package_lirc-utils() {
-  pkgdesc="Linux Infrared Remote Control utils"
-  depends=('alsa-lib' 'libx11' 'libftdi' 'libirman')
-  optdepends=('python2: pronto2lirc utility')
-  options=('strip' '!libtool')
-  backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf')
-
-  cd "${srcdir}/lirc-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d"
-  cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d"
-  cp -rp remotes "${pkgdir}/usr/share/lirc"
-  chmod -R go-w "${pkgdir}/usr/share/lirc/"
-
-  # install the logrotate config
-  install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc"
-    
-  # install conf.d file
-  install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf"
-
-  # install conf.d file
-  install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf"
-
-  install -d "${pkgdir}/etc/lirc"
-  
-  # remove built modules
-  rm -r "${pkgdir}/lib/"
-}
diff --git a/extra/lirc/irexec.conf b/extra/lirc/irexec.conf
deleted file mode 100644
index f911c7515..000000000
--- a/extra/lirc/irexec.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Parameters for irexec daemon (path to lircrc)
-#
-
-IREXEC_OPTS=""
\ No newline at end of file
diff --git a/extra/lirc/irexecd b/extra/lirc/irexecd
deleted file mode 100755
index a64b033a5..000000000
--- a/extra/lirc/irexecd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/irexec.conf
-
-PID=`pidof -o %PPID /usr/bin/irexec`
-case "$1" in
-  start)
-    stat_busy "Starting IREXEC Daemon"
-    [ -z "$PID" ] && /usr/bin/irexec --daemon $IREXEC_OPTS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon irexecd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping IREXEC Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon irexecd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
diff --git a/extra/lirc/kernel-2.6.39.patch b/extra/lirc/kernel-2.6.39.patch
deleted file mode 100644
index 7353d61ca..000000000
--- a/extra/lirc/kernel-2.6.39.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -ru lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c
---- lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c	2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c	2011-06-07 17:02:20.356580306 +0200
-@@ -48,7 +48,6 @@
- #include <linux/slab.h>
- #include <linux/module.h>
- #include <linux/kmod.h>
--#include <linux/smp_lock.h>
- #include <linux/completion.h>
- #include <linux/uaccess.h>
- #include <linux/usb.h>
-diff -ru lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c
---- lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c	2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c	2011-06-07 17:04:19.725933627 +0200
-@@ -555,8 +555,8 @@
- 		kfree(ir);
- 		return -EINVAL;
- 	}
--	printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n",
--	       adap->id, addr, ir->c.name);
-+	printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n",
-+	       addr, ir->c.name);
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
- 	/* register device */
-diff -ru lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c
---- lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c	2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c	2011-06-07 17:07:23.984935411 +0200
-@@ -361,14 +361,14 @@
- 		size = count << 3;
- 
- 		ldata = (unsigned long *) data_buf;
--		next_one = generic_find_next_le_bit(ldata, size, 0);
-+		next_one = find_next_zero_bit_le(ldata, size, 0);
- 
- 		if (next_one > 0)
- 			put_pulse_bit(next_one
- 				* WPC8769L_USECS_PER_BIT);
- 
- 		while (next_one < size) {
--			next_zero = generic_find_next_zero_le_bit(ldata,
-+			next_zero = find_next_zero_bit_le(ldata,
- 				size, next_one + 1);
- 
- 			put_space_bit(
-@@ -376,7 +376,7 @@
- 				* WPC8769L_USECS_PER_BIT);
- 
- 			if (next_zero < size) {
--				next_one = generic_find_next_le_bit(ldata,
-+				next_one = find_next_bit_le(ldata,
- 					size, next_zero + 1);
- 
- 				put_pulse_bit(
diff --git a/extra/lirc/lirc.install b/extra/lirc/lirc.install
deleted file mode 100644
index 4551e88dc..000000000
--- a/extra/lirc/lirc.install
+++ /dev/null
@@ -1,16 +0,0 @@
-EXTRAMODULES=extramodules-3.4-ARCH
-
-post_install() {
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod $(cat /lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
-}
-
-post_upgrade() {
-  post_install
-}
-
-# arg 1:  the old package version
-post_remove() {
-  post_install
-}
diff --git a/extra/lirc/lirc.logrotate b/extra/lirc/lirc.logrotate
deleted file mode 100644
index 623c4f328..000000000
--- a/extra/lirc/lirc.logrotate
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/lircd {
-   missingok
-   notifempty
-   delaycompress
-}
diff --git a/extra/lirc/lirc_atiusb-kfifo.patch b/extra/lirc/lirc_atiusb-kfifo.patch
deleted file mode 100644
index a64984dce..000000000
--- a/extra/lirc/lirc_atiusb-kfifo.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ec3c5660e67c122e2d5eb9cfa838c9709fccf8e0 Mon Sep 17 00:00:00 2001
-From: Jason Martin <publicmsu@gmail.com>
-Date: Fri, 3 Jun 2011 00:12:51 -0400
-Subject: [PATCH] lirc_atiusb: fix buffer alloc to work with new kfifo
-
-I came across posts with regards to lirc_atiusb and its compatibility
-with newer kernels, and their use of kfifo.I spent a little bit of time
-this evening, and was able to correct the issues with the driver, and
-now have a functioning lirc_atiusb device under the 2.6.38 kernel.
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- drivers/lirc_atiusb/lirc_atiusb.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c
-index 52080de..bf2b631 100644
---- a/drivers/lirc_atiusb/lirc_atiusb.c
-+++ b/drivers/lirc_atiusb/lirc_atiusb.c
-@@ -1048,7 +1048,7 @@ static struct atirf_dev *new_irctl(struct usb_interface *intf)
- 		goto new_irctl_failure_check;
- 	}
- 
--	if (lirc_buffer_init(driver->rbuf, dclen, 1)) {
-+	if (lirc_buffer_init(driver->rbuf, dclen, 2)) {
- 		mem_failure = 4;
- 		goto new_irctl_failure_check;
- 	}
--- 
-1.7.0.1
-
diff --git a/extra/lirc/lirc_wpc8769l.patch b/extra/lirc/lirc_wpc8769l.patch
deleted file mode 100644
index e4e2a049b..000000000
--- a/extra/lirc/lirc_wpc8769l.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 413e83bf504fe9a9a177f27742220cfcb184b034 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Juan=20Jes=C3=BAs=20Garc=C3=ADa=20de=20Soria=20Lucena?= <skandalfo@gmail.com>
-Date: Wed, 30 Mar 2011 16:46:35 -0400
-Subject: [PATCH] Make lirc_wpc8769l functional again
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- drivers/lirc_wpc8769l/lirc_wpc8769l.c |   28 +++++++++++++++++-----------
- 1 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-index f820d11..4d04063 100644
---- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-+++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-@@ -816,10 +816,6 @@ static int set_use_inc(void *data)
- 	/* Reset last timeout value. */
- 	lastus = 0;
- 
--	/* Init the read buffer. */
--	if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0)
--		return -ENOMEM;
--
- 	/* Acquire the IRQ. */
- 	result = request_irq(irq, irq_handler,
- 			   IRQF_DISABLED | IRQF_SHARED,
-@@ -863,9 +859,6 @@ static void set_use_dec(void *data)
- 	/* Free the IRQ. */
- 	free_irq(irq, THIS_MODULE);
- 	dprintk("Freed IRQ %d\n", irq);
--
--	/* Free the RX buffer. */
--	lirc_buffer_free(&rbuf);
- }
- 
- static struct lirc_driver driver = {
-@@ -1065,19 +1058,29 @@ static int __init lirc_wpc8769l_module_init(void)
- 	/* Do load-time checks. */
- 	wpc8769l_power_up_and_check_if_we_woke_us_up();
- 
-+	/* Init the read buffer. */
-+	if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) {
-+		rc = -ENOMEM;
-+		goto exit_platform_exit;
-+	}
-+
- 	/* Configure the driver hooks. */
- 	driver.features = LIRC_CAN_REC_MODE2;
-+	driver.dev = &lirc_wpc8769l_platform_dev->dev;
- 	driver.minor = lirc_register_driver(&driver);
- 	if (driver.minor < 0) {
- 		eprintk("lirc_register_driver failed!\n");
- 		rc = -EIO;
--		goto exit_platform_exit;
-+		goto exit_release_buffer;
- 	}
- 
- 	iprintk("Driver loaded.\n");
- 
- 	return 0; /* Everything OK. */
- 
-+exit_release_buffer:
-+	lirc_buffer_free(&rbuf);
-+
- exit_platform_exit:
- 	lirc_wpc8769l_platform_exit();
- 
-@@ -1095,12 +1098,15 @@ module_init(lirc_wpc8769l_module_init);
- 
- static void __exit lirc_wpc8769l_module_exit(void)
- {
--	/* Unregister the platform driver and device. */
--	lirc_wpc8769l_platform_exit();
--
- 	/* Unregister the LIRC driver. */
- 	lirc_unregister_driver(driver.minor);
- 
-+	/* Free the buffer. */
-+	lirc_buffer_free(&rbuf);
-+
-+	/* Unregister the platform driver and device. */
-+	lirc_wpc8769l_platform_exit();
-+
- 	/* Release the second range. */
- 	if (baseport2)
- 		release_region(baseport2, WPC8769L_IO_REGION_2_SIZE);
--- 
-1.7.0.1
-
diff --git a/extra/lirc/lircd b/extra/lirc/lircd
deleted file mode 100755
index e9739b36e..000000000
--- a/extra/lirc/lircd
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/lircd.conf
-
-PID=$(pidof -o %PPID /usr/sbin/lircd)
-LIRCD_SYMLINKFILE=/dev/lircd
-LIRCD_SOCKET=/var/run/lirc/lircd
-case "$1" in
-  start)
-    stat_busy "Starting LIRC Daemon"
-   [ ! -d /var/run/lirc ] && install -d /var/run/lirc &>/dev/null
-    rm -f $LIRCD_SOCKET && ln -s $LIRCD_SOCKET $LIRCD_SYMLINKFILE
-    if [ $? -ne 0 ]; then
-      stat_fail
-      exit 0
-    fi
-    [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS"
-    [ -z "$PID" ] && 
-      if [ -n "$LIRC_DEVICE" ] ; then
-        eval /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
-      else
-        /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
-      fi
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon lircd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping LIRC Daemon"
-    rm -f $LIRCD_SYMLINKFILE
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon lircd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 start|stop|restart"
-esac
-exit 0
diff --git a/extra/lirc/lircd-handle-large-config.patch b/extra/lirc/lircd-handle-large-config.patch
deleted file mode 100644
index 85bc20518..000000000
--- a/extra/lirc/lircd-handle-large-config.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 5efb56bf22a5077db564c766ba7cc37bc269231d Mon Sep 17 00:00:00 2001
-From: Jarod Wilson <jarod@redhat.com>
-Date: Wed, 6 Apr 2011 11:04:12 -0400
-Subject: [PATCH] lircd: handle larger config files in write_socket better
-
-Pointed out by Michael Zanetti on list, irsend LIST has issues with long
-config files, which didn't exist in maintainer mode, as we were using a
-do while loop to make sure we spit out everything. Just use that loop
-all the time.
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- daemons/lircd.c |    8 ++------
- 1 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/daemons/lircd.c b/daemons/lircd.c
-index 6c21a3a..ddcca05 100644
---- a/daemons/lircd.c
-+++ b/daemons/lircd.c
-@@ -231,14 +231,10 @@ inline int write_socket(int fd, const char *buf, int len)
- 	int done, todo = len;
- 
- 	while (todo) {
--#ifdef SIM_REC
- 		do {
- 			done = write(fd, buf, todo);
--		}
--		while (done < 0 && errno == EAGAIN);
--#else
--		done = write(fd, buf, todo);
--#endif
-+		} while (done < 0 && errno == EAGAIN);
-+
- 		if (done <= 0)
- 			return (done);
- 		buf += done;
--- 
-1.7.0.1
-
diff --git a/extra/lirc/lircd.conf b/extra/lirc/lircd.conf
deleted file mode 100644
index 760dab065..000000000
--- a/extra/lirc/lircd.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Parameters for lirc daemon
-#
-
-LIRC_DEVICE="/dev/lirc0"
-LIRC_DRIVER=""
-LIRC_EXTRAOPTS=""
-LIRC_CONFIGFILE=""
diff --git a/extra/lirc/lircmd b/extra/lirc/lircmd
deleted file mode 100755
index 220c47c9c..000000000
--- a/extra/lirc/lircmd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/lircmd`
-case "$1" in
-  start)
-    stat_busy "Starting lircmd Daemon"
-    [ -z "$PID" ] && /usr/sbin/lircmd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon lircmd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping lircmd Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon lircmd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 86d18e87e..688602bb2 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169079 2012-10-17 18:31:25Z giovanni $
+# $Id: PKGBUILD 172224 2012-12-02 07:43:42Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.10.17
+pkgver=2012.11.30
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('c9319c87a768c01f8007965db5453ca1')
+md5sums=('959941def0dfb7bc795fddcc5175ed9a')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index f3576a1bc..2deb594a2 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169336 2012-10-19 21:28:16Z foutrelis $
+# $Id: PKGBUILD 171485 2012-11-18 02:09:02Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -11,7 +11,7 @@
 
 pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
 pkgver=3.1
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64' 'mips64el')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
@@ -25,7 +25,8 @@ source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz
         clang-pure64.patch
         enable-lto.patch
         llvm-3.1-fix-debug-line-info.patch
-        clang-3.1-fix-libprofile_rt.a-location.patch)
+        clang-3.1-fix-libprofile_rt.a-location.patch
+        clang-3.1-fix-lwg-2141.patch)
 sha256sums=('1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab'
             'ff63e215dcd3e2838ffdea38502f8d35bab17e487f3c3799579961e452d5a786'
             '563d8a5ef86123ed8775e115ad7f90c1aa3e80f70b4e587f1bccab2c10753558'
@@ -35,7 +36,8 @@ sha256sums=('1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab'
             '288a82fbff17bc554f5863734246500e637882af33ee8511019d5e0d6cd20524'
             'f7145e203ffb4ce2c01976027f7840a9520e5341a9945f2459b6b11e5422d5b7'
             'db1f1aadebbc4c4232bdad49fb9b7dc61eac727085c63154b870fa9ce64fd18d'
-            '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137')
+            '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137'
+            'a3ac405a983643c9cb9081692a3f4d28e5d19571fa12b0517fb2b1f2acab0ad0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver.src"
@@ -81,6 +83,9 @@ build() {
   patch -d tools/clang -Np1 -i \
     "$srcdir/clang-3.1-fix-libprofile_rt.a-location.patch"
 
+  # Fix FS#32731: [clang] 3.1 fails to compile libstdc++ <chrono> 4.7.2
+  patch -d tools/clang -Np0 -i "$srcdir/clang-3.1-fix-lwg-2141.patch"
+
   # Fix FS#31098: LLVM 3.1 produces invalid debug information
   # http://llvm.org/bugs/show_bug.cgi?id=13211
   patch -Np1 -i "$srcdir/llvm-3.1-fix-debug-line-info.patch"
diff --git a/extra/llvm/clang-3.1-fix-lwg-2141.patch b/extra/llvm/clang-3.1-fix-lwg-2141.patch
new file mode 100644
index 000000000..af10a5c33
--- /dev/null
+++ b/extra/llvm/clang-3.1-fix-lwg-2141.patch
@@ -0,0 +1,65 @@
+Index: test/SemaCXX/libstdcxx_common_type_hack.cpp
+===================================================================
+--- test/SemaCXX/libstdcxx_common_type_hack.cpp	(revision 0)
++++ test/SemaCXX/libstdcxx_common_type_hack.cpp	(revision 166455)
+@@ -0,0 +1,33 @@
++// RUN: %clang_cc1 -fsyntax-only %s -std=c++11 -verify
++
++// This is a test for an egregious hack in Clang that works around
++// an issue with GCC's <type_traits> implementation. std::common_type
++// relies on pre-standard rules for decltype(), in which it doesn't
++// produce reference types so frequently.
++
++#ifdef BE_THE_HEADER
++
++#pragma GCC system_header
++namespace std {
++  template<typename T> T &&declval();
++
++  template<typename...Ts> struct common_type {};
++  template<typename A, typename B> struct common_type<A, B> {
++    // Under the rules in the standard, this always produces a
++    // reference type.
++    typedef decltype(true ? declval<A>() : declval<B>()) type;
++  };
++}
++
++#else
++
++#define BE_THE_HEADER
++#include "libstdcxx_common_type_hack.cpp"
++
++using T = int;
++using T = std::common_type<int, int>::type;
++
++using U = int; // expected-note {{here}}
++using U = decltype(true ? std::declval<int>() : std::declval<int>()); // expected-error {{different types}}
++
++#endif
+Index: lib/Sema/SemaTemplateInstantiateDecl.cpp
+===================================================================
+--- lib/Sema/SemaTemplateInstantiateDecl.cpp	(revision 166454)
++++ lib/Sema/SemaTemplateInstantiateDecl.cpp	(revision 166455)
+@@ -158,6 +158,22 @@
+     SemaRef.MarkDeclarationsReferencedInType(D->getLocation(), DI->getType());
+   }
+ 
++  // HACK: g++ has a bug where it gets the value kind of ?: wrong.
++  // libstdc++ relies upon this bug in its implementation of common_type.
++  // If we happen to be processing that implementation, fake up the g++ ?:
++  // semantics. See LWG issue 2141 for more information on the bug.
++  const DecltypeType *DT = DI->getType()->getAs<DecltypeType>();
++  CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(D->getDeclContext());
++  if (DT && RD && isa<ConditionalOperator>(DT->getUnderlyingExpr()) &&
++      DT->isReferenceType() &&
++      RD->getEnclosingNamespaceContext() == SemaRef.getStdNamespace() &&
++      RD->getIdentifier() && RD->getIdentifier()->isStr("common_type") &&
++      D->getIdentifier() && D->getIdentifier()->isStr("type") &&
++      SemaRef.getSourceManager().isInSystemHeader(D->getLocStart()))
++    // Fold it to the (non-reference) type which g++ would have produced.
++    DI = SemaRef.Context.getTrivialTypeSourceInfo(
++      DI->getType().getNonReferenceType());
++
+   // Create the new typedef
+   TypedefNameDecl *Typedef;
+   if (IsTypeAlias)
diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD
index 0a7e4f4a4..40dd3065d 100644
--- a/extra/lm_sensors/PKGBUILD
+++ b/extra/lm_sensors/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168402 2012-10-10 23:19:44Z eric $
+# $Id: PKGBUILD 170399 2012-11-07 01:42:13Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=lm_sensors
-pkgver=3.3.2
-pkgrel=5
+pkgver=3.3.3
+pkgrel=1
 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lm-sensors.org/"
@@ -17,8 +17,8 @@ source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz
 	sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \
         sensord.rc fancontrol.service sensord.service healthd.service \
         daemonarg.patch linux_3.0.patch)
-sha1sums=('5d0f026ad763124e8c2ad733b6e1ad5e6473993d'
-          'a486d9fb6c5b0aff4520f6312106c67f5163f1cf'
+sha1sums=('b55c06f425993e42f13553f204066c446da36fd3'
+          '035a721f20e4ad568f4fdde2d7c25d906c192458'
           'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'
           'a068ac0a3115a6191a487e11422506baa922b40a'
           'afaad558d2ad4732aa53b69afa23ccf37bc67ab1'
diff --git a/extra/lsdvd/PKGBUILD b/extra/lsdvd/PKGBUILD
deleted file mode 100644
index 6f57870ad..000000000
--- a/extra/lsdvd/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 150946 2012-02-24 09:46:48Z pierre $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=lsdvd
-pkgver=0.16
-pkgrel=6
-pkgdesc="A C application for reading the contents of a DVD and printing the contents to your terminal"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://sourceforge.net/projects/lsdvd/"
-depends=('libdvdread')
-license=('GPL2')
-#Special thanks to Mathieu Clabaut <mathieu.clabaut@gmail.com> for patches
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'stdint_usage.patch')
-md5sums=('340e1abe5c5e5abf7ff8031e78f49ee7'
-         '6cbcbfde873f894bd3c784f65141b2fc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/stdint_usage.patch"
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/lsdvd/stdint_usage.patch b/extra/lsdvd/stdint_usage.patch
deleted file mode 100644
index 67b9ee82d..000000000
--- a/extra/lsdvd/stdint_usage.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/lsdvd.c	2006-03-02 07:48:11.000000000 -0600
-+++ b/lsdvd.c	2007-09-27 19:15:28.000000000 -0500
-@@ -13,6 +13,7 @@
-  *  2003-04-19  Cleanups get_title_name, added dvdtime2msec, added helper macros,
-  *			  output info structures in form of a Perl module, by Henk Vergonet.
-  */
-+#include <stdint.h>
- #include <dvdread/ifo_read.h>
- #include <string.h>
- #include <sys/stat.h>
---- a/configure	2005-12-12 14:22:45.000000000 -0600
-+++ b/configure	2007-09-27 19:15:13.000000000 -0500
-@@ -2887,8 +2887,8 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <dvdread/ifo_read.h>
- 		#include <stdint.h>
-+#include <dvdread/ifo_read.h>
- int
- main ()
- {
diff --git a/extra/ltrace/PKGBUILD b/extra/ltrace/PKGBUILD
index 27d3518ac..a4ed472f2 100644
--- a/extra/ltrace/PKGBUILD
+++ b/extra/ltrace/PKGBUILD
@@ -1,35 +1,36 @@
-# $Id: PKGBUILD 146208 2012-01-06 03:36:04Z foutrelis $
+# $Id: PKGBUILD 172160 2012-11-30 11:07:55Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ltrace
-pkgver=0.6.0
+pkgver=0.7.1
 pkgrel=1
 pkgdesc="Tracks runtime library calls in dynamically linked programs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ltrace.alioth.debian.org/"
 license=('GPL')
 depends=('elfutils')
+makedepends=('dejagnu')
 backup=('etc/ltrace.conf')
-source=(http://dev.archlinux.org/~foutrelis/sources/ltrace/$pkgname-$pkgver.tar.xz
-        fix-crash-on-int3-after-symcall.patch)
-sha256sums=('13e4a66aa1f2ad23fd4ddd7faa79c52a68f210155eeb6490ce421f2a07fa0706'
-            'ef2c33c94b5cbfc552e5e734ac5627918ace918f48db5d3f29f1c0dcb1732d04')
+source=(https://alioth.debian.org/frs/download.php/3844/$pkgname-$pkgver.tar.bz2)
+sha256sums=('9010ab85444c44e2f1b340049b6ce877e41566996f0045af9519ad056ae9b83d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Fix FS#27250: SIGSEGV due to int3 right after a call instruction
-  patch -Np1 -i "$srcdir/fix-crash-on-int3-after-symcall.patch"
-
-  ./autogen.sh
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc
   make
 }
 
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make -k check
+}
+
 package(){
   cd "$srcdir/$pkgname-$pkgver"
 
diff --git a/extra/lv2/PKGBUILD b/extra/lv2/PKGBUILD
index 7b32d4c3a..82ca0cb21 100644
--- a/extra/lv2/PKGBUILD
+++ b/extra/lv2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157185 2012-04-25 12:13:02Z schiv $
+# $Id: PKGBUILD 171678 2012-11-21 07:36:28Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 
 pkgname=lv2
-pkgver=1.0.0
-pkgrel=2
+pkgver=1.2.0
+pkgrel=1
 pkgdesc="Successor to the LADSPA audio plug-in standard"
 url="http://lv2plug.in/"
 license=('LGPL' 'custom')
@@ -15,7 +15,7 @@ provides=('lv2core')
 conflicts=('lv2core')
 replaces=('lv2core')
 source=("http://lv2plug.in/spec/$pkgname-$pkgver.tar.bz2")
-md5sums=('af98a50d8dfa8318a69800ea48b421f6')
+md5sums=('323b851563b4da1ad2c0faf5c76f0e3a')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index 862de73d7..c8456704c 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164769 2012-08-04 19:30:05Z ronald $
+# $Id: PKGBUILD 171457 2012-11-17 16:07:22Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=lyx
-pkgver=2.0.4
+pkgver=2.0.5
 pkgrel=1
 pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz
 backup=('etc/lyx/lyxrc.dist')
 install=lyx.install
 options=('emptydirs')
-sha1sums=('4d384060553c74912e13f98e1788a6f978c58c2e'
+sha1sums=('afffd3fd2f2429c93402a4923d7a2838e0758d28'
           'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad'
           '56416642cc3da2a13b87b84e6b87c1a239f3d09a')
 
diff --git a/extra/m17n-lib/PKGBUILD b/extra/m17n-lib/PKGBUILD
index 1d5e716ab..afa11f8f3 100644
--- a/extra/m17n-lib/PKGBUILD
+++ b/extra/m17n-lib/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 140555 2011-10-17 07:25:46Z bisson $
+# $Id: PKGBUILD 172459 2012-12-03 05:46:31Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Camille Moncelier <pix@devlife.org>
 
 pkgname=m17n-lib
-pkgver=1.6.3
-pkgrel=1.2
+pkgver=1.6.4
+pkgrel=1
 pkgdesc='Multilingual text processing library (runtimes)'
+url='http://www.nongnu.org/m17n/'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://www.m17n.org/m17n-lib/'
 license=('GPL')
 depends=('libxft' 'm17n-db' 'fribidi' 'libxml2' 'gd' 'libotf')
 optdepends=('anthy: to use the anthy input method')
-options=('!libtool' '!emptydirs')
-source=("http://www.m17n.org/m17n-lib-download/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('b3a725b1c417f167f6b2c6b7889b7d728a1e6b8f')
+options=('!makeflags' '!libtool' '!emptydirs')
+source=("http://download.savannah.gnu.org/releases/m17n/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('83f2fc4facfd70a580bb95d9381eac7472d85171')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index a034591fe..7699ac4b9 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 168309 2012-10-08 09:18:38Z juergen $
+# $Id: PKGBUILD 171297 2012-11-17 02:13:54Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=maxima
 pkgver=5.28.0
-pkgrel=2
+pkgrel=4
 pkgdesc="Maxima - a sophisticated computer algebra system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net"
 if [ "${CARCH}" == "mips64el" ] ; then
     depends=('clisp' 'texinfo' 'sh')
 else
-    depends=('sbcl=1.1.0' 'texinfo' 'sh')
+    depends=('sbcl=1.1.1-2' 'texinfo' 'sh')
 fi
 makedepends=('python2')
 optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index df2564d61..a9940fb9c 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 167548 2012-10-02 17:15:26Z giovanni $
+# $Id: PKGBUILD 170371 2012-11-06 17:48:48Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=2.3.2
+pkgver=2.4
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
         'mercurial.profile')
-md5sums=('6e90450ab3886bc650031e0d9aef367a'
+md5sums=('c1fc9bec6951dd3c913092c3c72da014'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 366f626c4..20eb465f3 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 168551 2012-10-13 11:42:56Z andyrtr $
+# $Id: PKGBUILD 171458 2012-11-17 21:07:48Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
@@ -13,7 +13,7 @@ _git=false
 if [ "${_git}" = "true" ]; then
     pkgver=8.99.git_$_gitdate
   else
-    pkgver=9.0
+    pkgver=9.0.1
 fi
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
@@ -23,8 +23,7 @@ makedepends=('glproto>=1.4.16' 'libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 options=('!libtool')
-source=(LICENSE
-        git_fixes.diff)
+source=(LICENSE)
 if [ "${_git}" = "true" ]; then
 	# mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0
 	#source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz')
@@ -36,8 +35,8 @@ if [ "${_git}" = "true" ]; then
 fi
 source+=(mesa-loongson.patch)
 md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         '2ebce12196dbb7b69bdf7ef53b8afdee'
-         '60e557ce407be3732711da484ab3db6c')
+         '97d6554c05ea7449398afe3a0ede7018'
+         '598c24dccfcdcc99c07d883f7c09f36a')
 
 build() {
     cd ${srcdir}/?esa-*
@@ -49,7 +48,7 @@ build() {
    fi
 
     patch -Np1 -i $srcdir/mesa-loongson.patch
-    patch -Np1 -i ${srcdir}/git_fixes.diff
+#    patch -Np1 -i ${srcdir}/git_fixes.diff
 
     COMMONOPTS="--prefix=/usr \
     --sysconfdir=/etc \
@@ -139,7 +138,7 @@ package_mesa() {
   make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-pkgconfigDATA  
   make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/common DESTDIR="${pkgdir}" install-sysconfDATA
 
-  make -C ${srcdir}/?esa-*/src/gallium/targets/xa-vmwgfx DESTDIR="${pkgdir}" install
+  [ "$CARCH" != "mips64el" ] && make -C ${srcdir}/?esa-*/src/gallium/targets/xa-vmwgfx DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
diff --git a/extra/metacity/PKGBUILD b/extra/metacity/PKGBUILD
index 3bf16c859..0e96942c6 100644
--- a/extra/metacity/PKGBUILD
+++ b/extra/metacity/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166589 2012-09-12 17:45:09Z jgc $
+# $Id: PKGBUILD 170056 2012-10-31 10:19:33Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=metacity
-pkgver=2.34.8
+pkgver=2.34.13
 pkgrel=1
 pkgdesc="A window manager for GNOME"
 arch=(i686 x86_64 'mips64el')
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 install=metacity.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         fix_compositing_startup.patch)
-sha256sums=('ab83038a9dc0b53a63b66c3f9323a10abb0b9a9ae2b5c5d3cc6bbabe2b607806'
+sha256sums=('8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075'
             '5094a0ffe3eb8289ed752829877c2e1b743eddf938ad3fc92fb4574b42765ae2')
 
 build() {
diff --git a/extra/mjpegtools/PKGBUILD b/extra/mjpegtools/PKGBUILD
index 0c8d79522..ef16d63ac 100644
--- a/extra/mjpegtools/PKGBUILD
+++ b/extra/mjpegtools/PKGBUILD
@@ -23,7 +23,7 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np0 -i "${srcdir}/mjpegtools-v4l-2.6.38.patch"
   sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-  ./configure --prefix=/usr --enable-largefile
+  ./configure --prefix=/usr --enable-largefile CXXFLAGS="$CXXFLAGS -fpermissive"
   make
 }
 
diff --git a/extra/mod_fcgid/PKGBUILD b/extra/mod_fcgid/PKGBUILD
index 919122a44..8775b91c6 100644
--- a/extra/mod_fcgid/PKGBUILD
+++ b/extra/mod_fcgid/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 151282 2012-02-25 12:36:27Z pierre $
+# $Id: PKGBUILD 171689 2012-11-21 14:00:30Z dan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=mod_fcgid
-pkgver=2.3.6
-pkgrel=2
+pkgver=2.3.7
+pkgrel=1
 pkgdesc="A FastCGI module for Apache HTTP Server."
 license=('APACHE')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://httpd.apache.org/mod_fcgid/"
 depends=('apache')
 source=("http://apache.cs.utah.edu/httpd/mod_fcgid/mod_fcgid-$pkgver.tar.gz")
-sha256sums=('e831795498d91cf27a519ea1332c2a92a2a9920b0844d817b2ea7f079056d12b')
+sha256sums=('b72810cb34942945156f29ce60946da7dc941bb4cfca8b9d224573535bd8ef6d')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD
index e25cc2ffc..9907fead6 100644
--- a/extra/mousetweaks/PKGBUILD
+++ b/extra/mousetweaks/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=mousetweaks
-pkgver=3.4.2
+pkgver=3.6.0
 pkgrel=1
 pkgdesc="Mouse accessibility enhancements for the GNOME desktop"
 arch=(i686 x86_64 'mips64el')
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=mousetweaks.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('7f8a6ae627edae12e0d5b92926c33191bfa504c1ccaf51195051681aedfa700c')
+sha256sums=('2c48f655c5b53615270503fd1631e0cf7baa5872b20f75af8608983f039c5cfc')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/mt-st/PKGBUILD b/extra/mt-st/PKGBUILD
deleted file mode 100644
index 9d13fc784..000000000
--- a/extra/mt-st/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 137900 2011-09-12 10:12:39Z allan $
-# Maintainer:
-# Contributer: dorphell <dorphell@archlinux.org>
-
-pkgname=mt-st
-pkgver=1.1
-pkgrel=3.1
-pkgdesc="Linux SCSI tape driver aware magnetic tape control"
-arch=('i686' 'x86_64' 'mips64el')
-url="ftp://ftp.ibiblio.org/pub/linux/system/backup/"
-license=('GPL2')
-depends=('glibc')
-source=(ftp://ftp.ibiblio.org/pub/linux/system/backup/$pkgname-$pkgver.tar.gz)
-md5sums=('fdd5f5ec673c9f630a102ceff7612774')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -dm755 $pkgdir/{sbin,bin,usr/share/man/man1,usr/share/man/man8}
-  make SBINDIR=$pkgdir/sbin BINDIR=$pkgdir/bin \
-    MANDIR=$pkgdir/usr/share/man install
-}
diff --git a/extra/mtx/PKGBUILD b/extra/mtx/PKGBUILD
deleted file mode 100644
index 7c85007e5..000000000
--- a/extra/mtx/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 137902 2011-09-12 10:18:06Z allan $
-# Maintainer:
-# Contributer: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=mtx
-pkgver=1.3.12
-pkgrel=2.1
-pkgdesc="Send robot commands to tape changer"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://mtx.opensource-sw.net/"
-license=('GPL2')
-depends=('glibc')
-source=(http://downloads.sourceforge.net/mtx/${pkgname}-${pkgver}.tar.gz)
-md5sums=('ce8f0e44671fb0c7d9ec30bb0bfa8b5c')
-
-build() {
-  cd $srcdir/${pkgname}-${pkgver}
-  sed -i 's/static const unsigned char scsi_command_size/const unsigned char scsi_command_size/' \
-    sg_err.c
-  ./configure --prefix='/usr' --datadir='/usr/share'
-  make
-}
-
-package() {
-  cd $srcdir/${pkgname}-${pkgver}
-  make prefix=$pkgdir/usr install
-}
diff --git a/extra/multitail/PKGBUILD b/extra/multitail/PKGBUILD
deleted file mode 100644
index 1e455e8d3..000000000
--- a/extra/multitail/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 151290 2012-02-25 13:01:05Z pierre $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Roberto Carvajal <roberto@archlinux.org>
-
-pkgname=multitail
-pkgver=5.2.9
-pkgrel=1
-pkgdesc="Lets you view one or multiple files like the original tail program"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.vanheusden.com/multitail"
-depends=('ncurses')
-backup=('etc/multitail.conf')
-source=("${url}/${pkgname}-${pkgver}.tgz")
-md5sums=('871cb6a9a0d4f599b9cbd9f603da4c51')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  install -D -m 755 multitail ${pkgdir}/usr/bin/multitail
-  install -D -m 644 multitail.1 ${pkgdir}/usr/share/man/man1/multitail.1
-  install -D -m 644 multitail.conf ${pkgdir}/etc/multitail.conf
-}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD
index 69971cca1..651604424 100644
--- a/extra/mutter/PKGBUILD
+++ b/extra/mutter/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 157405 2012-04-28 09:26:53Z allan $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 170875 2012-11-12 21:30:35Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter
-pkgver=3.4.1
-pkgrel=2
+pkgver=3.6.2
+pkgrel=1
 pkgdesc="A window manager for GNOME"
 arch=(i686 x86_64 mips64el)
 license=('GPL')
-depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity')
+depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity' 'libsm')
 makedepends=('intltool' 'gnome-doc-utils')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=mutter.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('dbf08b014179980ab3d0cce645c5391c83b0ce070c73504feea8eec0ad000449')
+sha256sums=('924f47681c972c3e8da610608c6aef35e61f52b338b5690e5721ed7ef8c2befc')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/nautilus-open-terminal/PKGBUILD b/extra/nautilus-open-terminal/PKGBUILD
index 8d4b65143..f596fdfc8 100644
--- a/extra/nautilus-open-terminal/PKGBUILD
+++ b/extra/nautilus-open-terminal/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139464 2011-10-01 19:31:44Z ibiru $
+# $Id: PKGBUILD 169998 2012-10-30 23:01:23Z heftig $
 # Maintainer : Biru Ionut <ionut@archlinux.ro>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 pkgname=nautilus-open-terminal
 pkgver=0.19
-pkgrel=2.1
+pkgrel=3
 pkgdesc="A nautilus plugin for opening terminals in arbitrary local paths"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ftp.gnome.org/pub/GNOME/sources/nautilus-open-terminal"
@@ -13,7 +13,7 @@ depends=('nautilus' 'gconf')
 makedepends=('pkgconfig' 'gettext' 'intltool')
 install=nautilus-open-terminal.install
 source=(ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool')
+options=('!libtool' '!emptydirs')
 sha256sums=('4760f3a5a862ba9239ea92690a42ecee2c68fad413b023dd06505bdb3ee1f6af')
 
 build() {
diff --git a/extra/nautilus-sendto/PKGBUILD b/extra/nautilus-sendto/PKGBUILD
index e5320d666..9d3e586e5 100644
--- a/extra/nautilus-sendto/PKGBUILD
+++ b/extra/nautilus-sendto/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 159024 2012-05-15 10:28:10Z heftig $
+# $Id: PKGBUILD 169999 2012-10-30 23:01:26Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Tor Krill <tor@krill.nu>
 
 pkgname=nautilus-sendto
-pkgver=3.0.3
+pkgver=3.6.0
 pkgrel=1
 pkgdesc="Nautilus context menu for sending files."
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ makedepends=('pidgin' 'gajim' 'gettext' 'intltool' 'gupnp')
 options=('!libtool' '!emptydirs')
 install=nautilus-sendto.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bafbfbfe66c9817b099c8b57f41341e0be4e94ae846a9a1ae84d7bcbc339c2cf')
+sha256sums=('5f90a1a7b054257545dc72fa3a63de8f5564815576f90a21c320ebb177b9268e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD
index 331f57b04..77b88ec12 100644
--- a/extra/nautilus/PKGBUILD
+++ b/extra/nautilus/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 159065 2012-05-15 11:33:48Z heftig $
+# $Id: PKGBUILD 170899 2012-11-12 22:34:25Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nautilus
-pkgver=3.4.2
+pkgver=3.6.3
 pkgrel=1
 pkgdesc="GNOME file manager"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('752afa41189b0b6c73dc3769cd885e184c29d6d394345ec05cd48b0004e0f452')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('d272027754ce8591959ae854fc6b5f43eee4af31e4eecf06de727acebe0ee46c')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD
index dbdfe3e1b..5ccc17fb1 100644
--- a/extra/nepomuk-core/PKGBUILD
+++ b/extra/nepomuk-core/PKGBUILD
@@ -1,26 +1,19 @@
-# $Id: PKGBUILD 167761 2012-10-03 14:39:00Z andrea $
+# $Id: PKGBUILD 170582 2012-11-09 08:25:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=nepomuk-core
-pkgver=4.9.2
-pkgrel=2
+pkgver=4.9.3
+pkgrel=1
 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries"
 url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4' 'doxygen')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
-        'regression-crash.patch')
-sha1sums=('a04e632bfa39ac5158c2addf7278bfb27d29cb5b'
-          'f49436046cfd98b172a53eeaffb0d5df6bf5e1ee')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('d235f033206fdd6d0dbad63143bfa89dde99b19d')
 
 build() {
-  # KDEBUG 307388
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/regression-crash.patch
-  cd ../
-
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
diff --git a/extra/netcdf-cxx/PKGBUILD b/extra/netcdf-cxx/PKGBUILD
index 600e095a3..c6b1c090e 100644
--- a/extra/netcdf-cxx/PKGBUILD
+++ b/extra/netcdf-cxx/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=netcdf-cxx
 pkgver=4.2
 pkgrel=1
 pkgdesc="NetCDF c++ bindings"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" "mips64el")
 url="http://www.unidata.ucar.edu/downloads/netcdf/netcdf-cxx/index.jsp"
 depends=('gcc-libs' 'netcdf' 'curl')
 options=('!libtool' '!makeflags')
diff --git a/extra/netcdf-fortran/PKGBUILD b/extra/netcdf-fortran/PKGBUILD
index 415844e0a..c0a437a73 100644
--- a/extra/netcdf-fortran/PKGBUILD
+++ b/extra/netcdf-fortran/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=netcdf-fortran
 pkgver=4.2
 pkgrel=1
 pkgdesc="NetCDF fortran bindings"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" "mips64el")
 url="http://www.unidata.ucar.edu/downloads/netcdf/netcdf-fortran/index.jsp"
 depends=('gcc-libs' 'netcdf' 'curl' 'gcc-fortran')
 options=('!libtool' '!makeflags')
diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD
index a45f68168..f9560b02c 100644
--- a/extra/network-manager-applet/PKGBUILD
+++ b/extra/network-manager-applet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 166523 2012-09-09 15:41:15Z heftig $
+# $Id: PKGBUILD 169995 2012-10-30 23:01:10Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@archlinux.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -6,7 +6,7 @@
 # Contributor: Will Rea <sillywilly@gmail.com>
 
 pkgname=network-manager-applet
-pkgver=0.9.6.2
+pkgver=0.9.6.4
 pkgrel=1
 pkgdesc="GNOME frontends to NetWorkmanager"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ optdepends=('gnome-bluetooth: for PAN/DUN support')
 options=('!libtool' '!emptydirs')
 install=network-manager-applet.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz)
-sha256sums=('96c79ce199fe7770b66f2ddc5ee0a4b07a0ea1eaf5e2186b78d8dd69e38a3069')
+sha256sums=('ae5667b165f0f83244ec76c42f17553ec2169f5250e144904994497137374141')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD
index 61ac1f7f2..475d9920a 100644
--- a/extra/networkmanager-pptp/PKGBUILD
+++ b/extra/networkmanager-pptp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 166521 2012-09-09 15:41:05Z heftig $
+# $Id: PKGBUILD 171364 2012-11-17 11:09:07Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-pptp
 pkgver=0.9.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="NetworkManager VPN plugin for pptp "
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -13,11 +13,17 @@ makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=networkmanager-pptp.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz)
-sha256sums=('a84cbbf24827229e3dd3611bbde191398275c3b7ecd03913047197644f27a2b4')
+source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz
+        fix-path-to-auth-dialog.patch
+        gtk_table_to_gtk_grid.patch)
+sha256sums=('a84cbbf24827229e3dd3611bbde191398275c3b7ecd03913047197644f27a2b4'
+            '35f9c2cb4d046c8f215617e1a0bfd8551965bd0655af0cd25f89c17ea5e9081a'
+            '17c194c605bca780bf657711e9cff910c63ab27eae70c11cb6c53e9c75ad3215')
 
 build() {
   cd NetworkManager-pptp-${pkgver}
+  patch -Np1 -i ../fix-path-to-auth-dialog.patch
+  patch -Np1 -i ../gtk_table_to_gtk_grid.patch
   ./configure --prefix=/usr \
   	--sysconfdir=/etc \
 	--libexecdir=/usr/lib/networkmanager \
diff --git a/extra/networkmanager-pptp/fix-path-to-auth-dialog.patch b/extra/networkmanager-pptp/fix-path-to-auth-dialog.patch
new file mode 100644
index 000000000..28a4a5a44
--- /dev/null
+++ b/extra/networkmanager-pptp/fix-path-to-auth-dialog.patch
@@ -0,0 +1,26 @@
+From a2f52d4455bd81732b6b3c16bdab206c56818c07 Mon Sep 17 00:00:00 2001
+From: Clemens Buchacher <drizzd@aon.at>
+Date: Sun, 1 Jul 2012 18:35:50 +0200
+Subject: [PATCH] fix path to auth-dialog
+
+
+Signed-off-by: Clemens Buchacher <drizzd@aon.at>
+---
+ nm-pptp-service.name.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nm-pptp-service.name.in b/nm-pptp-service.name.in
+index 9ee79b8..ea5f0e5 100644
+--- a/nm-pptp-service.name.in
++++ b/nm-pptp-service.name.in
+@@ -4,6 +4,6 @@ service=org.freedesktop.NetworkManager.pptp
+ program=@LIBEXECDIR@/nm-pptp-service
+ 
+ [GNOME]
+-auth-dialog=nm-pptp-auth-dialog
++auth-dialog=@LIBEXECDIR@/nm-pptp-auth-dialog
+ properties=libnm-pptp-properties
+ supports-external-ui-mode=true
+-- 
+1.7.11.1
+
diff --git a/extra/networkmanager-pptp/gtk_table_to_gtk_grid.patch b/extra/networkmanager-pptp/gtk_table_to_gtk_grid.patch
new file mode 100644
index 000000000..3483b57cc
--- /dev/null
+++ b/extra/networkmanager-pptp/gtk_table_to_gtk_grid.patch
@@ -0,0 +1,40 @@
+From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
+Subject: Port GtkTable uses to GtkGrid.
+
+Index: network-manager-pptp/auth-dialog/vpn-password-dialog.c
+===================================================================
+--- network-manager-pptp.orig/auth-dialog/vpn-password-dialog.c	2012-02-15 11:24:03.803503000 -0500
++++ network-manager-pptp/auth-dialog/vpn-password-dialog.c	2012-02-15 11:30:20.344710680 -0500
+@@ -124,8 +124,8 @@
+ 	label = gtk_label_new_with_mnemonic (label_text);
+ 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ 
+-	gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, row, row + 1);
+-	gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, row, row + 1);
++	gtk_grid_attach (GTK_GRID (table), label, 0, row, 1, 1);
++	gtk_grid_attach (GTK_GRID (table), entry, 1, row, 1, 1);
+ 
+ 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
+ }
+@@ -154,7 +154,7 @@
+ 	if (priv->show_password_secondary)
+ 		add_row (priv->table, row++, priv->secondary_password_label,  priv->password_entry_secondary);
+ 
+-	gtk_table_attach_defaults (GTK_TABLE (priv->table), priv->show_passwords_checkbox, 1, 2, row, row + 1);
++	gtk_grid_attach (GTK_GRID (priv->table), priv->show_passwords_checkbox, 1, row, 1, 1);
+ 
+ 	gtk_widget_show_all (priv->table);
+ }
+@@ -228,9 +228,9 @@
+ 
+ 	priv->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+ 
+-	priv->table = gtk_table_new (4, 2, FALSE);
+-	gtk_table_set_col_spacings (GTK_TABLE (priv->table), 12);
+-	gtk_table_set_row_spacings (GTK_TABLE (priv->table), 6);
++	priv->table = gtk_grid_new ();
++	gtk_grid_set_column_spacing (GTK_GRID (priv->table), 12);
++	gtk_grid_set_row_spacing (GTK_GRID (priv->table), 6);
+ 	gtk_container_add (GTK_CONTAINER (priv->table_alignment), priv->table);
+ 
+ 	priv->password_entry = gtk_entry_new ();
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index 3fea039bb..570f544c0 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,5 @@
-# $Id: PKGBUILD 166778 2012-09-19 08:12:49Z heftig $
+# $Id: PKGBUILD 169996 2012-10-30 23:01:16Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
 # Contributor: Tor Krill <tor@krill.nu>
@@ -7,33 +8,34 @@
 
 pkgname=networkmanager
 _pkgname=NetworkManager
-pkgver=0.9.6.0
-pkgrel=2
+pkgver=0.9.6.4
+pkgrel=1
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/$_pkgname/"
-depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wpa_supplicant' 'ppp' 'dhcpcd'
-         'libsoup')
-makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection')
+depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant ppp dhclient
+         libsoup systemd)
+makedepends=(intltool dhcpcd iptables gobject-introspection)
 optdepends=('modemmanager: for modem management service'
-            'dhclient: alternative DHCP/DHCPv6 client'
+            'dhcpcd: alternative DHCP client; does not support DHCPv6'
             'iptables: Connection sharing'
             'dnsmasq: Connection sharing'
             'bluez: Bluetooth support'
-            'openresolv: openresolv support')
+            'openresolv: resolvconf support')
 options=('!libtool')
 backup=('etc/NetworkManager/NetworkManager.conf')
 install=networkmanager.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
         NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch
-        nm-polkit-permissive.patch repair-signals.patch)
-sha256sums=('3982b623b7b199ac99e2ddd0840fe7d088245a49e3f680237e8baebf0cf86d07'
+        nm-polkit-permissive.patch repair-signals.patch systemd-sleep.patch)
+sha256sums=('511b411e055d187bc8f26c519fdb3e55e07fc40d4adecbbec623c0249380a7eb'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
             '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
             '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb'
             'e23b651a90ef62d515921953b4c6779538d35a737fb74c266b7fce94d62fdb06'
-            'a1c65a09e5e8ecb1004ab7922517aa7fbc9700dc61e3b2fd348d3d7c23808ce6')
+            'a1c65a09e5e8ecb1004ab7922517aa7fbc9700dc61e3b2fd348d3d7c23808ce6'
+            '24c181ab69e769e703e45f64a552add5df5de22fbcd8899d588add053674420a')
 
 build() {
   cd $_pkgname-$pkgver
@@ -42,6 +44,8 @@ build() {
   patch -Np1 -i ../dnsmasq-path.patch
   patch -Np1 -i ../nm-polkit-permissive.patch
   patch -Np1 -i ../repair-signals.patch # FS#31115
+  patch -Np1 -i ../systemd-sleep.patch
+  AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi
 
   ./configure \
     --prefix=/usr \
@@ -56,7 +60,7 @@ build() {
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
     --with-udev-dir=/usr/lib/udev \
     --with-resolvconf=/usr/sbin/resolvconf \
-    --with-session-tracking=ck \
+    --with-session-tracking=systemd \
     --disable-static \
     --enable-more-warnings=no \
     --disable-wimax
@@ -71,7 +75,4 @@ package() {
   install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
 
   rm -r "$pkgdir/var/run"
-
-  # Provide native service for arch-daemons generator
-  ln -s NetworkManager.service "$pkgdir/usr/lib/systemd/system/networkmanager.service"
 }
diff --git a/extra/networkmanager/systemd-sleep.patch b/extra/networkmanager/systemd-sleep.patch
new file mode 100644
index 000000000..3470d4654
--- /dev/null
+++ b/extra/networkmanager/systemd-sleep.patch
@@ -0,0 +1,616 @@
+From b444d31cba5b8ac0c9771cc5a246dfd3af9dfd00 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Tue, 9 Oct 2012 00:36:35 -0400
+Subject: [PATCH] core: factor out the upower suspend/resume code (bgo
+ #677694)
+
+Factor the code that listens for upower sleeping and resuming
+signals out into a class code NMSleepMonitor.
+
+core: add a systemd suspend/resume monitor (bgo #677694)
+
+This implementation uses a delay inhibitor to get systemd to
+emit PrepareForSleep, and then emits ::Sleeping and ::Resuming
+when receiving the before/after PrepareForSleep emissions.
+
+core: DBusGConnections are not GObjects
+
+Introduced in 64fd8eea7706038e5d38c8463a1c765ed9331db2.
+
+core: fix suspend/resume signal names which the manager listens for
+
+Introduced in 64fd8eea7706038e5d38c8463a1c765ed9331db2; but honestly
+I also thought GObject lower-cased signal names since it munges them
+for - and _ too.  Apparently not.
+---
+ configure.ac                   |   2 +-
+ src/Makefile.am                |   9 +-
+ src/nm-manager.c               |  40 +++-----
+ src/nm-sleep-monitor-systemd.c | 217 +++++++++++++++++++++++++++++++++++++++++
+ src/nm-sleep-monitor-upower.c  | 151 ++++++++++++++++++++++++++++
+ src/nm-sleep-monitor.h         |  46 +++++++++
+ 6 files changed, 437 insertions(+), 28 deletions(-)
+ create mode 100644 src/nm-sleep-monitor-systemd.c
+ create mode 100644 src/nm-sleep-monitor-upower.c
+ create mode 100644 src/nm-sleep-monitor.h
+
+diff --git a/configure.ac b/configure.ac
+index e76e193..9152c23 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -327,7 +327,7 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147)
+ AC_SUBST(GUDEV_CFLAGS)
+ AC_SUBST(GUDEV_LIBS)
+ 
+-PKG_CHECK_MODULES(GIO, gio-2.0)
++PKG_CHECK_MODULES(GIO, gio-unix-2.0)
+ AC_SUBST(GIO_CFLAGS)
+ AC_SUBST(GIO_LIBS)
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b155209..ba7d2d6 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -191,6 +191,7 @@ NetworkManager_SOURCES = \
+ 		nm-session-monitor.h \
+ 		nm-session-utils.c \
+ 		nm-session-utils.h \
++		nm-sleep-monitor.h \
+ 		nm-connection-provider.h \
+ 		nm-connection-provider.c \
+ 		nm-dispatcher.c \
+@@ -201,13 +202,18 @@ NetworkManager_SOURCES += nm-connectivity.c nm-connectivity.h
+ endif
+ 
+ if SESSION_TRACKING_SYSTEMD
+-NetworkManager_SOURCES += nm-session-monitor-systemd.c
++NetworkManager_SOURCES += \
++		nm-session-monitor-systemd.c \
++		nm-sleep-monitor-systemd.c
+ else
+ if SESSION_TRACKING_CK
+ NetworkManager_SOURCES += nm-session-monitor-ck.c
+ else
+ NetworkManager_SOURCES += nm-session-monitor-null.c
+ endif
++
++# UPower suspend/resume used whenever systemd is not enabled
++NetworkManager_SOURCES += nm-sleep-monitor-upower.c
+ endif
+ 
+ nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml
+@@ -283,6 +289,7 @@ BUILT_SOURCES = \
+ NetworkManager_CPPFLAGS = \
+ 	$(DBUS_CFLAGS) \
+ 	$(GLIB_CFLAGS) \
++	$(GIO_CFLAGS) \
+ 	$(GUDEV_CFLAGS) \
+ 	$(LIBNL_CFLAGS) \
+ 	$(GMODULE_CFLAGS) \
+diff --git a/src/nm-manager.c b/src/nm-manager.c
+index 618c4ed..c8ce115 100644
+--- a/src/nm-manager.c
++++ b/src/nm-manager.c
+@@ -69,6 +69,7 @@
+ #include "nm-device-factory.h"
+ #include "wifi-utils.h"
+ #include "nm-enum-types.h"
++#include "nm-sleep-monitor.h"
+ 
+ #if WITH_CONCHECK
+ #include "nm-connectivity.h"
+@@ -78,8 +79,6 @@
+ #define NM_AUTOIP_DBUS_SERVICE "org.freedesktop.nm_avahi_autoipd"
+ #define NM_AUTOIP_DBUS_IFACE   "org.freedesktop.nm_avahi_autoipd"
+ 
+-#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower"
+-
+ static gboolean impl_manager_get_devices (NMManager *manager,
+                                           GPtrArray **devices,
+                                           GError **err);
+@@ -228,7 +227,7 @@ typedef struct {
+ 	guint modem_removed_id;
+ 
+ 	DBusGProxy *aipd_proxy;
+-	DBusGProxy *upower_proxy;
++	NMSleepMonitor *sleep_monitor;
+ 
+ 	GSList *auth_chains;
+ 
+@@ -3288,16 +3287,16 @@ impl_manager_sleep (NMManager *self,
+ }
+ 
+ static void
+-upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data)
++sleeping_cb (DBusGProxy *proxy, gpointer user_data)
+ {
+-	nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal");
++	nm_log_dbg (LOGD_SUSPEND, "Received sleeping signal");
+ 	_internal_sleep (NM_MANAGER (user_data), TRUE);
+ }
+ 
+ static void
+-upower_resuming_cb (DBusGProxy *proxy, gpointer user_data)
++resuming_cb (DBusGProxy *proxy, gpointer user_data)
+ {
+-	nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal");
++	nm_log_dbg (LOGD_SUSPEND, "Received resuming signal");
+ 	_internal_sleep (NM_MANAGER (user_data), FALSE);
+ }
+ 
+@@ -4049,8 +4048,8 @@ dispose (GObject *object)
+ 	if (priv->aipd_proxy)
+ 		g_object_unref (priv->aipd_proxy);
+ 
+-	if (priv->upower_proxy)
+-		g_object_unref (priv->upower_proxy);
++	if (priv->sleep_monitor)
++		g_object_unref (priv->sleep_monitor);
+ 
+ 	if (priv->fw_monitor) {
+ 		if (priv->fw_monitor_id)
+@@ -4372,23 +4371,12 @@ nm_manager_init (NMManager *manager)
+ 	} else
+ 		nm_log_warn (LOGD_AUTOIP4, "could not initialize avahi-autoipd D-Bus proxy");
+ 
+-	/* upower sleep/wake handling */
+-	priv->upower_proxy = dbus_g_proxy_new_for_name (g_connection,
+-	                                                UPOWER_DBUS_SERVICE,
+-	                                                "/org/freedesktop/UPower",
+-	                                                "org.freedesktop.UPower");
+-	if (priv->upower_proxy) {
+-		dbus_g_proxy_add_signal (priv->upower_proxy, "Sleeping", G_TYPE_INVALID);
+-		dbus_g_proxy_connect_signal (priv->upower_proxy, "Sleeping",
+-		                             G_CALLBACK (upower_sleeping_cb),
+-		                             manager, NULL);
+-
+-		dbus_g_proxy_add_signal (priv->upower_proxy, "Resuming", G_TYPE_INVALID);
+-		dbus_g_proxy_connect_signal (priv->upower_proxy, "Resuming",
+-		                             G_CALLBACK (upower_resuming_cb),
+-		                             manager, NULL);
+-	} else
+-		nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy");
++	/* sleep/wake handling */
++	priv->sleep_monitor = nm_sleep_monitor_get ();
++	g_signal_connect (priv->sleep_monitor, "sleeping",
++	                  G_CALLBACK (sleeping_cb), manager);
++	g_signal_connect (priv->sleep_monitor, "resuming",
++	                  G_CALLBACK (resuming_cb), manager);
+ 
+ 	/* Listen for authorization changes */
+ 	nm_auth_changed_func_register (authority_changed_cb, manager);
+diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c
+new file mode 100644
+index 0000000..70adc89
+--- /dev/null
++++ b/src/nm-sleep-monitor-systemd.c
+@@ -0,0 +1,217 @@
++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
++/* This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program; if not, write to the Free Software Foundation, Inc.,
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * (C) Copyright 2012 Red Hat, Inc.
++ * Author: Matthias Clasen <mclasen@redhat.com>
++ */
++
++#include "config.h"
++#include <errno.h>
++#include <string.h>
++#include <sys/stat.h>
++#include <dbus/dbus-glib-lowlevel.h>
++#include <dbus/dbus-glib.h>
++#include <gio/gio.h>
++#include <gio/gunixfdlist.h>
++
++#include "nm-logging.h"
++#include "nm-dbus-manager.h"
++
++#include "nm-sleep-monitor.h"
++
++#define SD_NAME              "org.freedesktop.login1"
++#define SD_PATH              "/org/freedesktop/login1"
++#define SD_INTERFACE         "org.freedesktop.login1.Manager"
++
++
++struct _NMSleepMonitor {
++	GObject parent_instance;
++
++	GDBusProxy *sd_proxy;
++	gint inhibit_fd;
++};
++
++struct _NMSleepMonitorClass {
++	GObjectClass parent_class;
++
++	void (*sleeping) (NMSleepMonitor *monitor);
++	void (*resuming) (NMSleepMonitor *monitor);
++};
++
++
++enum {
++	SLEEPING,
++	RESUMING,
++	LAST_SIGNAL,
++};
++static guint signals[LAST_SIGNAL] = {0};
++
++G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT);
++
++/********************************************************************/
++
++static void
++inhibit_done (GObject      *source,
++              GAsyncResult *result,
++              gpointer      user_data)
++{
++	GDBusProxy *sd_proxy = G_DBUS_PROXY (source);
++	NMSleepMonitor *self = user_data;
++	GError *error = NULL;
++	GVariant *res;
++	GUnixFDList *fd_list;
++
++	res = g_dbus_proxy_call_with_unix_fd_list_finish (sd_proxy, &fd_list, result, &error);
++	if (!res) {
++		nm_log_warn (LOGD_SUSPEND, "Inhibit failed: %s", error->message);
++		g_error_free (error);
++	} else {
++		if (!fd_list || g_unix_fd_list_get_length (fd_list) != 1)
++			nm_log_warn (LOGD_SUSPEND, "Didn't get a single fd back");
++
++		self->inhibit_fd = g_unix_fd_list_get (fd_list, 0, NULL);
++
++		nm_log_dbg (LOGD_SUSPEND, "Inhibitor fd is %d", self->inhibit_fd);
++		g_object_unref (fd_list);
++		g_variant_unref (res);
++	}
++}
++
++static void
++take_inhibitor (NMSleepMonitor *self)
++{
++	g_assert (self->inhibit_fd == -1);
++
++	nm_log_dbg (LOGD_SUSPEND, "Taking systemd sleep inhibitor");
++	g_dbus_proxy_call_with_unix_fd_list (self->sd_proxy,
++	                                     "Inhibit",
++	                                     g_variant_new ("(ssss)",
++	                                                    "sleep",
++	                                                    g_get_user_name (),
++	                                                    "inhibited",
++	                                                    "delay"),
++	                                     0,
++	                                     G_MAXINT,
++	                                     NULL,
++	                                     NULL,
++	                                     inhibit_done,
++	                                     self);
++}
++
++static gboolean
++drop_inhibitor (NMSleepMonitor *self)
++{
++	if (self->inhibit_fd >= 0) {
++		nm_log_dbg (LOGD_SUSPEND, "Dropping systemd sleep inhibitor");
++		close (self->inhibit_fd);
++		self->inhibit_fd = -1;
++		return TRUE;
++	}
++	return FALSE;
++}
++
++static void
++signal_cb (GDBusProxy  *proxy,
++           const gchar *sendername,
++           const gchar *signalname,
++           GVariant    *args,
++           gpointer     data)
++{
++	NMSleepMonitor *self = data;
++	gboolean is_about_to_suspend;
++
++	if (strcmp (signalname, "PrepareForSleep") != 0)
++		return;
++
++	g_variant_get (args, "(b)", &is_about_to_suspend);
++	nm_log_dbg (LOGD_SUSPEND, "Received PrepareForSleep signal: %d", is_about_to_suspend);
++
++	if (is_about_to_suspend) {
++		g_signal_emit (self, signals[SLEEPING], 0);
++		drop_inhibitor (self);
++	} else {
++		take_inhibitor (self);
++		g_signal_emit (self, signals[RESUMING], 0);
++	}
++}
++
++static void
++nm_sleep_monitor_init (NMSleepMonitor *self)
++{
++	GDBusConnection *bus;
++
++	self->inhibit_fd = -1;
++	bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
++	self->sd_proxy = g_dbus_proxy_new_sync (bus, 0, NULL,
++	                                        SD_NAME, SD_PATH, SD_INTERFACE,
++	                                        NULL, NULL);
++	g_object_unref (bus);
++	g_signal_connect (self->sd_proxy, "g-signal", G_CALLBACK (signal_cb), self);
++	take_inhibitor (self);
++}
++
++static void
++finalize (GObject *object)
++{
++	NMSleepMonitor *self = NM_SLEEP_MONITOR (object);
++
++	drop_inhibitor (self);
++	if (self->sd_proxy)
++		g_object_unref (self->sd_proxy);
++
++	if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL)
++		G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object);
++}
++
++static void
++nm_sleep_monitor_class_init (NMSleepMonitorClass *klass)
++{
++	GObjectClass *gobject_class;
++
++	gobject_class = G_OBJECT_CLASS (klass);
++
++	gobject_class->finalize = finalize;
++
++	signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING,
++	                                  NM_TYPE_SLEEP_MONITOR,
++	                                  G_SIGNAL_RUN_LAST,
++	                                  G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping),
++	                                  NULL,                   /* accumulator      */
++	                                  NULL,                   /* accumulator data */
++	                                  g_cclosure_marshal_VOID__VOID,
++	                                  G_TYPE_NONE, 0);
++	signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING,
++	                                  NM_TYPE_SLEEP_MONITOR,
++	                                  G_SIGNAL_RUN_LAST,
++	                                  G_STRUCT_OFFSET (NMSleepMonitorClass, resuming),
++	                                  NULL,                   /* accumulator      */
++	                                  NULL,                   /* accumulator data */
++	                                  g_cclosure_marshal_VOID__VOID,
++	                                  G_TYPE_NONE, 0);
++}
++
++NMSleepMonitor *
++nm_sleep_monitor_get (void)
++{
++	static NMSleepMonitor *singleton = NULL;
++
++	if (singleton)
++		return g_object_ref (singleton);
++
++	singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL));
++	return singleton;
++}
++
++/* ---------------------------------------------------------------------------------------------------- */
+diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c
+new file mode 100644
+index 0000000..3c93f66
+--- /dev/null
++++ b/src/nm-sleep-monitor-upower.c
+@@ -0,0 +1,151 @@
++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
++/* This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program; if not, write to the Free Software Foundation, Inc.,
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * (C) Copyright 2012 Red Hat, Inc.
++ * Author: Matthias Clasen <mclasen@redhat.com>
++ */
++
++#include "config.h"
++#include <errno.h>
++#include <string.h>
++#include <sys/stat.h>
++#include <dbus/dbus-glib-lowlevel.h>
++#include <dbus/dbus-glib.h>
++#include <gio/gio.h>
++#include "nm-logging.h"
++#include "nm-dbus-manager.h"
++
++#include "nm-sleep-monitor.h"
++
++#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower"
++
++struct _NMSleepMonitor {
++        GObject parent_instance;
++
++        DBusGProxy *upower_proxy;
++};
++
++struct _NMSleepMonitorClass {
++        GObjectClass parent_class;
++
++        void (*sleeping) (NMSleepMonitor *monitor);
++        void (*resuming) (NMSleepMonitor *monitor);
++};
++
++
++enum {
++        SLEEPING,
++        RESUMING,
++        LAST_SIGNAL,
++};
++static guint signals[LAST_SIGNAL] = {0};
++
++G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT);
++
++/********************************************************************/
++
++static void
++upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data)
++{
++        nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal");
++        g_signal_emit (user_data, signals[SLEEPING], 0);
++}
++
++static void
++upower_resuming_cb (DBusGProxy *proxy, gpointer user_data)
++{
++        nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal");
++        g_signal_emit (user_data, signals[RESUMING], 0);
++}
++
++static void
++nm_sleep_monitor_init (NMSleepMonitor *self)
++{
++        NMDBusManager *dbus_mgr;
++        DBusGConnection *bus;
++
++        dbus_mgr = nm_dbus_manager_get ();
++        bus = nm_dbus_manager_get_connection (dbus_mgr);
++        self->upower_proxy = dbus_g_proxy_new_for_name (bus,
++                                                        UPOWER_DBUS_SERVICE,
++                                                        "/org/freedesktop/UPower",
++                                                        "org.freedesktop.UPower");
++        if (self->upower_proxy) {
++                dbus_g_proxy_add_signal (self->upower_proxy, "Sleeping", G_TYPE_INVALID);
++                dbus_g_proxy_connect_signal (self->upower_proxy, "Sleeping",
++                                             G_CALLBACK (upower_sleeping_cb),
++                                             self, NULL);
++
++                dbus_g_proxy_add_signal (self->upower_proxy, "Resuming", G_TYPE_INVALID);
++                dbus_g_proxy_connect_signal (self->upower_proxy, "Resuming",
++                                             G_CALLBACK (upower_resuming_cb),
++                                             self, NULL);
++        } else
++                nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy");
++        g_object_unref (dbus_mgr);
++}
++
++static void
++finalize (GObject *object)
++{
++        NMSleepMonitor *self = NM_SLEEP_MONITOR (object);
++
++        if (self->upower_proxy)
++                g_object_unref (self->upower_proxy);
++
++        if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL)
++                G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object);
++}
++
++static void
++nm_sleep_monitor_class_init (NMSleepMonitorClass *klass)
++{
++        GObjectClass *gobject_class;
++
++        gobject_class = G_OBJECT_CLASS (klass);
++
++        gobject_class->finalize = finalize;
++
++        signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING,
++                                          NM_TYPE_SLEEP_MONITOR,
++                                          G_SIGNAL_RUN_LAST,
++                                          G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping),
++                                          NULL,                   /* accumulator      */
++                                          NULL,                   /* accumulator data */
++                                          g_cclosure_marshal_VOID__VOID,
++                                          G_TYPE_NONE, 0);
++        signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING,
++                                          NM_TYPE_SLEEP_MONITOR,
++                                          G_SIGNAL_RUN_LAST,
++                                          G_STRUCT_OFFSET (NMSleepMonitorClass, resuming),
++                                          NULL,                   /* accumulator      */
++                                          NULL,                   /* accumulator data */
++                                          g_cclosure_marshal_VOID__VOID,
++                                          G_TYPE_NONE, 0);
++}
++
++NMSleepMonitor *
++nm_sleep_monitor_get (void)
++{
++        static NMSleepMonitor *singleton = NULL;
++
++        if (singleton)
++                return g_object_ref (singleton);
++
++        singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL));
++        return singleton;
++}
++
++/* ---------------------------------------------------------------------------------------------------- */
+diff --git a/src/nm-sleep-monitor.h b/src/nm-sleep-monitor.h
+new file mode 100644
+index 0000000..173e6a1
+--- /dev/null
++++ b/src/nm-sleep-monitor.h
+@@ -0,0 +1,46 @@
++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
++/* This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program; if not, write to the Free Software Foundation, Inc.,
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * (C) Copyright 2012 Red Hat, Inc.
++ * Author: Matthias Clasen <mclasen@redhat.com>
++ */
++
++#ifndef NM_SLEEP_MONITOR_H
++#define NM_SLEEP_MONITOR_H
++
++#include <glib-object.h>
++
++G_BEGIN_DECLS
++
++#define NM_TYPE_SLEEP_MONITOR         (nm_sleep_monitor_get_type ())
++#define NM_SLEEP_MONITOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitor))
++#define NM_SLEEP_MONITOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass))
++#define NM_SLEEP_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass))
++#define NM_IS_SLEEP_MONITOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), NM_TYPE_SLEEP_MONITOR))
++#define NM_IS_SLEEP_MONITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_SLEEP_MONITOR))
++
++#define NM_SLEEP_MONITOR_SLEEPING "sleeping"
++#define NM_SLEEP_MONITOR_RESUMING "resuming"
++
++typedef struct _NMSleepMonitor         NMSleepMonitor;
++typedef struct _NMSleepMonitorClass    NMSleepMonitorClass;
++
++GType           nm_sleep_monitor_get_type     (void) G_GNUC_CONST;
++NMSleepMonitor *nm_sleep_monitor_get          (void);
++
++G_END_DECLS
++
++#endif /* NM_SLEEP_MONITOR_H */
++
+-- 
+1.7.12.2
+
diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD
index 24f0a2900..5f6f3fbc2 100644
--- a/extra/nmap/PKGBUILD
+++ b/extra/nmap/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 165381 2012-08-17 08:46:12Z bisson $
+# $Id: PKGBUILD 172141 2012-11-30 02:54:16Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=nmap
-pkgver=6.01
-pkgrel=2
+pkgver=6.25
+pkgrel=1
 pkgdesc='Utility for network discovery and security auditing'
 url='http://nmap.org/'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,20 +13,12 @@ license=('GPL')
 makedepends=('pygtk')
 optdepends=('pygtk: zenmap')
 depends=('pcre' 'openssl' 'libpcap' 'lua')
-source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2"
-        'kdesu.patch')
-sha1sums=('e397e453893930d14e9bb33a847d15b94b7ee83a'
-          '159bc1243564d3a9dee820291bf07168870cbaf6')
+source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('769943a1a5c10f67bf9738e26da42b3312db752f')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	# Show icon only if runnable; see FS#12045
-	echo 'TryExec=/usr/bin/pygtk-demo' >> zenmap/install_scripts/unix/zenmap.desktop 
-	echo 'TryExec=/usr/bin/pygtk-demo' >> zenmap/install_scripts/unix/zenmap-root.desktop 
-
-	patch -p1 -i ../kdesu.patch # FS#31158
-
 	./configure \
 		--prefix=/usr \
 		--libexecdir=/usr/lib \
@@ -37,6 +29,7 @@ build() {
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+
 	make DESTDIR="${pkgdir}" install
 
 	rm "${pkgdir}"/usr/bin/uninstall_zenmap
diff --git a/extra/nouveau-dri/LICENSE b/extra/nouveau-dri/LICENSE
deleted file mode 100644
index ae33d2709..000000000
--- a/extra/nouveau-dri/LICENSE
+++ /dev/null
@@ -1,82 +0,0 @@
-Disclaimer
-
-Mesa is a 3-D graphics library with an API which is very similar to
-that of OpenGL*
-To the extent that Mesa utilizes the OpenGL command syntax or state
-machine, it is being used with authorization from Silicon Graphics,
-Inc.(SGI). However, the author does not possess an OpenGL license
-from SGI, and makes no claim that Mesa is in any way a compatible
-replacement for OpenGL or associated with SGI. Those who want a
-licensed implementation of OpenGL should contact a licensed
-vendor.
-
-Please do not refer to the library as MesaGL (for legal
-reasons). It's just Mesa or The Mesa 3-D graphics
-library
-
-* OpenGL is a trademark of Silicon Graphics Incorporated.
-
-License / Copyright Information
-
-The Mesa distribution consists of several components.  Different copyrights
-and licenses apply to different components.  For example, GLUT is copyrighted
-by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
-device drivers are copyrighted by their authors.  See below for a list of
-Mesa's main components and the license for each.
-
-The core Mesa library is licensed according to the terms of the MIT license.
-This allows integration with the XFree86, Xorg and DRI projects.
-
-The default Mesa license is as follows:
-
-Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Attention, Contributors
-
-When contributing to the Mesa project you must agree to the licensing terms
-of the component to which you're contributing.
-The following section lists the primary components of the Mesa distribution
-and their respective licenses.
-
-
-Mesa Component Licenses
-
-Component         Location               Primary Author      License
-----------------------------------------------------------------------------
-Main Mesa code    src/mesa/              Brian Paul          Mesa (MIT)
-
-Device drivers    src/mesa/drivers/*     See drivers         See drivers
-
-Ext headers       include/GL/glext.h     SGI                 SGI Free B
-                  include/GL/glxext.h
-
-GLUT              src/glut/              Mark Kilgard        Mark's copyright
-
-Mesa GLU library  src/glu/mesa/          Brian Paul          GNU-LGPL
-
-SGI GLU library   src/glu/sgi/           SGI                 SGI Free B
-
-demo programs     progs/demos/           various             see source files
-
-X demos           progs/xdemos/          Brian Paul          see source files
-
-SGI demos         progs/samples/         SGI                 SGI copyright
-
-RedBook demos     progs/redbook/         SGI                 SGI copyright
diff --git a/extra/nouveau-dri/PKGBUILD b/extra/nouveau-dri/PKGBUILD
deleted file mode 100644
index 2848f0bff..000000000
--- a/extra/nouveau-dri/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 163980 2012-07-23 08:35:29Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=nouveau-dri
-pkgver=8.0.4
-pkgrel=2
-arch=('i686' 'x86_64')
-makedepends=('glproto>=1.4.15' 'libdrm-old' 'libdrm-nouveau1' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' 
-             'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-source=(LICENSE
-        mesa-8.0.3-llvm-3.1-fixes.patch
-        ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-)
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         'c452ed3392468170726c004c2f4e02ca'
-         'd546f988adfdf986cff45b1efa2d8a46')
-
-build() {
-    cd ${srcdir}/?esa-*
-
-    patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch"
-
-     autoreconf -vfi
-    ./configure --prefix=/usr \
-    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=nouveau \
-    --with-dri-drivers=nouveau \
-    --enable-gallium-llvm \
-    --enable-gallium-egl \
-    --enable-shared-glapi \
-    --enable-gbm \
-    --enable-glx-tls \
-    --enable-dri \
-    --enable-glx \
-    --enable-osmesa \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-egl \
-    --enable-texture-float \
-    --enable-xa \
-    --enable-shared-dricore
-  make
-}
-
-package() {
-  depends=("libgl=${pkgver}" 'libdrm-nouveau1')
-  pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
-
-  # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
-  # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-}
diff --git a/extra/nouveau-dri/mesa-8.0.3-llvm-3.1-fixes.patch b/extra/nouveau-dri/mesa-8.0.3-llvm-3.1-fixes.patch
deleted file mode 100644
index a567b5926..000000000
--- a/extra/nouveau-dri/mesa-8.0.3-llvm-3.1-fixes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index a50a51d..f1bb4d9 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
-    int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
- 
--#if HAVE_LLVM >= 0x0300
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
-+   if (!MRI) {
-+      debug_printf("error: no register info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+
-+   OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
-+   if (!MII) {
-+      debug_printf("error: no instruction info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+#endif
-+
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<MCInstPrinter> Printer(
-+         T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
-+#elif HAVE_LLVM == 0x0300
-    OwningPtr<MCInstPrinter> Printer(
-          T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
- #elif HAVE_LLVM >= 0x0208
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index fe7616b..68f8808 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -62,7 +62,11 @@
- extern "C" void
- lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
- {
-+#if HAVE_LLVM >= 0x0301
-+   llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
-+#else
-    llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
-+#endif
- }
- 
- 
diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD
index ef53e42c1..a08886104 100644
--- a/extra/nspr/PKGBUILD
+++ b/extra/nspr/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 164506 2012-08-01 10:09:37Z jgc $
+# $Id: PKGBUILD 169787 2012-10-29 10:29:15Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=nspr
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Netscape Portable Runtime"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('zip')
 options=(!emptydirs)
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz
         nspr.pc.in)
-md5sums=('1a8cad110e0ae94f538610a00f595b33'
+md5sums=('8a21b3b6766bde3b5ed2a6a7b725e4aa'
          'bce1611f3117b53fc904cab549c09967')
 
 build() {
diff --git a/extra/nss-myhostname/PKGBUILD b/extra/nss-myhostname/PKGBUILD
deleted file mode 100644
index 54fef6d97..000000000
--- a/extra/nss-myhostname/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 150778 2012-02-21 23:58:05Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Mantas M. <grawity@gmail.com>
-pkgname="nss-myhostname"
-pkgver=0.3
-pkgrel=2.1
-pkgdesc="NSS plugin providing host name resolution for the locally configured system hostname"
-arch=(i686 x86_64 mips64el)
-url="http://0pointer.de/lennart/projects/nss-myhostname/"
-license=('LGPL2.1')
-depends=('glibc')
-source=("http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-install=nss-myhostname.install
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-lynx
-  make
-}
-
-package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-md5sums=('d4ab9ac36c053ab8fb836db1cbd4a48f')
diff --git a/extra/nss-myhostname/nss-myhostname.install b/extra/nss-myhostname/nss-myhostname.install
deleted file mode 100644
index 30ae6844f..000000000
--- a/extra/nss-myhostname/nss-myhostname.install
+++ /dev/null
@@ -1,6 +0,0 @@
-post_install() {
-  cat << 'EOM'
-==> To enable resolution of the local hostname, append 'myhostname' to the hosts
-    line in /etc/nsswitch.conf.
-EOM
-}
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index a0e17721b..36e2cd9de 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,25 +1,23 @@
-# $Id: PKGBUILD 165445 2012-08-19 16:04:33Z jgc $
+# $Id: PKGBUILD 169789 2012-10-29 10:49:49Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nss
-pkgver=3.13.6
+pkgver=3.14
 pkgrel=1
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64 'mips64el')
 url="http://www.mozilla.org/projects/security/pki/nss/"
 license=('MPL' 'GPL')
-_nsprver=4.9.2
+_nsprver=4.9.3
 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
 makedepends=('perl')
 options=('!strip')
 source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
-        nss-no-rpath.patch
         nss.pc.in
         nss-config.in
         ssl-renegotiate-transitional.patch
         add_spi+cacert_ca_certs.patch)
-sha1sums=('1f86a7c787e8fe3ebd1dd1cce127e57fb347dac3'
-          'c8fcdb153af9d39689243119adb475905a657284'
+sha1sums=('ace3642fb2ca67854ea7075d053ca01a6d81e616'
           'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
           'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
           '8a964a744ba098711b80c0d279a2993524e8eb92'
@@ -33,8 +31,6 @@ build() {
 
   # Adds transitional SSL renegotiate support - patch from Debian
   patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch"
-  # Removes rpath
-  patch -Np2 -i "${srcdir}/nss-no-rpath.patch"
 
   # Respect LDFLAGS
   sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD
index bacb9b298..1dc642329 100644
--- a/extra/ntfs-3g_ntfsprogs/PKGBUILD
+++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158725 2012-05-08 12:53:46Z tomegun $
+# $Id: PKGBUILD 172190 2012-12-01 14:32:58Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Thomas B�chler <thomas.archlinux.org>
@@ -6,7 +6,7 @@
 pkgbase=ntfs-3g_ntfsprogs
 pkgname=('ntfs-3g' 'ntfsprogs')
 pkgver=2012.1.15
-pkgrel=3
+pkgrel=4
 url="http://www.tuxera.com"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -18,9 +18,10 @@ sha1sums=('8d55cf49afde172fefa369a0a85289e09c4d7bbb')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
-  ac_cv_path_LDCONFIG=/bin/true ./configure --prefix=/usr \
+  ./configure --prefix=/usr \
     --with-fuse=external --disable-static \
-    --enable-posix-acls --mandir=/usr/share/man
+    --enable-posix-acls --disable-ldconfig \
+    --mandir=/usr/share/man
   make
 }
 
@@ -32,9 +33,9 @@ package_ntfs-3g() {
     make DESTDIR="$pkgdir" install
   done
 
-  mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/
   mv "$pkgdir"/bin/* "$pkgdir"/usr/bin/
-  rm -rf "$pkgdir"/{lib,{s,}bin}
+  rm -rf "$pkgdir"/{s,}bin
+  rmdir "$pkgdir/lib"
 
   cd "$pkgdir"/usr/bin
   ln -s ntfs-3g mount.ntfs
diff --git a/extra/numactl/PKGBUILD b/extra/numactl/PKGBUILD
index f2fd9311c..62ec53dbe 100644
--- a/extra/numactl/PKGBUILD
+++ b/extra/numactl/PKGBUILD
@@ -2,15 +2,15 @@
 # Contributor: Florian Zeitz <florob at babelmonkeys dot de>
 
 pkgname=numactl
-pkgver=2.0.7
-pkgrel=2.1
+pkgver=2.0.8
+pkgrel=1
 pkgdesc="Simple NUMA policy support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://oss.sgi.com/projects/libnuma/"
 license=('LGPL2.1' 'GPL2')
 depends=('perl')
 source=(ftp://oss.sgi.com/www/projects/libnuma/download/$pkgname-${pkgver/_/-}.tar.gz)
-sha1sums=('dfdf539da65d1e880f04202071c139c4d2ba2da9')
+sha1sums=('f7bf06caea29669992fd3540a4c864a32615b5a1')
 
 build() {
   cd "$srcdir/$pkgname-${pkgver/_/-}"
diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD
index b60fd3279..1d60dca1b 100644
--- a/extra/obex-data-server/PKGBUILD
+++ b/extra/obex-data-server/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137991 2011-09-13 21:30:11Z eric $
+# $Id: PKGBUILD 169754 2012-10-27 23:42:12Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=obex-data-server
 pkgver=0.4.6
-pkgrel=2.1
+pkgrel=3
 pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wiki.muiline.com/obex-data-server"
@@ -16,13 +16,13 @@ source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz")
 md5sums=('961ca5db6fe9c97024e133cc6203cc4d')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
     --sysconfdir=/etc
   make
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/obexd/PKGBUILD b/extra/obexd/PKGBUILD
index d5d87e527..2f851ddfb 100644
--- a/extra/obexd/PKGBUILD
+++ b/extra/obexd/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 164647 2012-08-01 18:37:45Z andrea $
+# $Id: PKGBUILD 170095 2012-11-01 11:22:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgbase=obexd
 pkgname=('obexd-client' 'obexd-server')
-pkgver=0.47
+epoch=1
+pkgver=0.46
 pkgrel=1
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 makedepends=('bluez' 'libical')
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('af721152055c40a226e374c2dd989901')
+md5sums=('625f0417d119437429c9cce29479cfa4')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd ${pkgbase}-${pkgver}
   ./configure --prefix=/usr \
     --libexecdir=/usr/lib/obexd
   make
@@ -27,7 +28,7 @@ package_obexd-client() {
   replaces=('obexd')
   conflicts=('obexd')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}/client"
+  cd ${pkgbase}-${pkgver}/client
   install -m755 -d "${pkgdir}/usr/lib/obexd"
   install -m755 -d "${pkgdir}/usr/share/dbus-1/services"
   install -m755 obex-client "${pkgdir}/usr/lib/obexd/"
@@ -39,7 +40,7 @@ package_obexd-server() {
   depends=('bluez' 'libical')
   conflicts=('obex-data-server')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}/src"
+  cd ${pkgbase}-${pkgver}/src
   install -m755 -d "${pkgdir}/usr/lib/obexd"
   install -m755 -d "${pkgdir}/usr/share/dbus-1/services"
   install -m755 obexd "${pkgdir}/usr/lib/obexd/"
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD
index ebbda8a51..8192a800f 100644
--- a/extra/octave/PKGBUILD
+++ b/extra/octave/PKGBUILD
@@ -1,35 +1,32 @@
-# $Id: PKGBUILD 168608 2012-10-13 11:48:28Z andyrtr $
+# $Id: PKGBUILD 171914 2012-11-23 13:37:21Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor : shining <shiningxc.at.gmail.com>
 # Contributor : cyberdune <cyberdune@gmail.com>
 
 pkgname=octave
-pkgver=3.6.2
-pkgrel=2
+pkgver=3.6.3
+pkgrel=1
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.octave.org"
 license=('GPL')
-depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull' 'fltk' 'suitesparse')
-makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'suitesparse' 'texlive-core')
+depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'suitesparse' 'arpack')
+makedepends=('gcc-fortran' 'texlive-core')
 optdepends=('texinfo: for help-support in octave'
             'gnuplot: alternative plotting')
-source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2"
-        buildfix.diff
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig}
         octave-gethelp.patch)
 options=('!emptydirs')
 install=octave.install
-sha1sums=('145fef0122268086727a60e1c33e29d56fd546d7'
-          'a7cdba1e05fbdd182facdd804aeec37729255551'
+sha1sums=('e8bd0c0b33ab9714ddb524f2258546c3536f0628'
+          'de009a9e6803de6b831cbd836cbc85c291de8a3c'
           'd39d54763ac86114029f8bc5d60763d2adce27bb')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # patch by Gentoo http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-gets.patch?view=log
-  patch -Np0 -i ${srcdir}/buildfix.diff
   # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-help.patch?view=log
-  patch -Np0 -i ${srcdir}/octave-gethelp.patch
+  patch -Np0 -i "${srcdir}/octave-gethelp.patch"
 
   autoreconf -vfi
 
@@ -44,11 +41,11 @@ build() {
 }
 
 package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
 
   # add octave library path to ld.so.conf.d
-  install -d ${pkgdir}/etc/ld.so.conf.d
-  echo "/usr/lib/${pkgname}/${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
+  install -d "${pkgdir}/etc/ld.so.conf.d"
+  echo "/usr/lib/${pkgname}/${pkgver}" > "${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
 }
diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD
index 1ab9defb5..b308fb888 100644
--- a/extra/opal/PKGBUILD
+++ b/extra/opal/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 163159 2012-07-08 09:32:20Z ibiru $
+# $Id: PKGBUILD 172102 2012-11-28 10:32:11Z jgc $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 pkgname=opal
-pkgver=3.10.5
+pkgver=3.10.9
 pkgrel=1
 pkgdesc="Open Phone Abstraction Library"
 arch=(i686 x86_64 'mips64el')
@@ -11,9 +11,10 @@ license=('GPL')
 depends=('ptlib' 'libtheora' 'x264' 'speex' 'gsm')
 makedepends=('ffmpeg')
 options=(!makeflags)
-source=(http://downloads.sourceforge.net/sourceforge/opalvoip/$pkgname-$pkgver.tar.bz2
+source=(http://ftp.gnome.org/pub/GNOME/sources/opal/${pkgver%.*}/opal-$pkgver.tar.xz
         opal-ffmpeg.patch)
-md5sums=('22b0d716ed1cbc935245539e0bbab38f' '53bb06a376fb57a306522bfa6a573217')
+sha256sums=('86c717a881f5283cfb58a5d52573c337b904115b90fa3e53c77fc543605e7950'
+            'd81542907ace54015b7c69c275b0c67f449eeb252ba971ba6ca728a5e20db231')
 
 build() {
   cd "${srcdir}/opal-${pkgver}"
diff --git a/extra/opal/opal-ffmpeg.patch b/extra/opal/opal-ffmpeg.patch
index ebfd1f037..c40e1ddfb 100644
--- a/extra/opal/opal-ffmpeg.patch
+++ b/extra/opal/opal-ffmpeg.patch
@@ -1,7 +1,7 @@
-diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx
---- opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx	2012-04-26 06:56:01.000000000 +0200
-+++ opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx	2012-06-10 16:39:35.447021150 +0200
-@@ -51,6 +51,7 @@
+diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/plugins/video/H.263-1998/h263-1998.cxx
+--- opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx	2012-08-23 04:18:42.000000000 +0200
++++ opal-3.10.7.patched/plugins/video/H.263-1998/h263-1998.cxx	2012-08-28 19:53:12.080918973 +0200
+@@ -48,6 +48,7 @@
  #endif
  
  #include "h263-1998.h"
@@ -9,7 +9,7 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/
  #include <limits>
  #include <iomanip>
  #include <stdio.h>
-@@ -324,9 +325,9 @@
+@@ -317,9 +318,9 @@
      // Level 2+ 
      // works with eyeBeam, signaled via  non-standard "D"
      if (atoi(value) == 1)
@@ -21,7 +21,7 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/
      return;
    }
  
-@@ -335,9 +336,9 @@
+@@ -328,9 +329,9 @@
      // Annex F: Advanced Prediction Mode
      // does not work with eyeBeam
      if (atoi(value) == 1)
@@ -33,7 +33,7 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/
      return;
    }
  #endif
-@@ -367,9 +368,9 @@
+@@ -360,9 +361,9 @@
      // Annex K: Slice Structure
      // does not work with eyeBeam
      if (atoi(value) != 0)
@@ -45,7 +45,7 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/
      return;
    }
  
-@@ -377,9 +378,9 @@
+@@ -370,9 +371,9 @@
      // Annex S: Alternative INTER VLC mode
      // does not work with eyeBeam
      if (atoi(value) == 1)
@@ -56,8 +56,8 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/
 +      av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
      return;
    }
- }
-@@ -445,15 +446,6 @@
+ 
+@@ -450,15 +451,6 @@
    PTRACE(5, m_prefix, "qmax set to " << m_context->qmax);
    PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size);
  
@@ -73,7 +73,7 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/
    return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0;
  }
  
-@@ -516,7 +508,7 @@
+@@ -521,7 +513,7 @@
  
      // Need to copy to local buffer to guarantee 16 byte alignment
      memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2);
@@ -82,7 +82,7 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/
  
      /*
      m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE;
-@@ -598,13 +590,13 @@
+@@ -603,13 +595,13 @@
    m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack;
    m_context->opaque = this; // used to separate out packets from different encode threads
  
@@ -99,21 +99,23 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/
  
    return true;
  }
-diff -ru opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx
---- opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx	2012-04-26 06:56:00.000000000 +0200
-+++ opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx	2012-06-10 16:49:11.210568639 +0200
-@@ -25,6 +25,7 @@
+Only in opal-3.10.7.patched/plugins/video/H.263-1998: h263-1998.cxx.orig
+diff -ru opal-3.10.7/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.7.patched/plugins/video/H.264/gpl/h264_helper.cxx
+--- opal-3.10.7/plugins/video/H.264/gpl/h264_helper.cxx	2012-08-23 04:18:41.000000000 +0200
++++ opal-3.10.7.patched/plugins/video/H.264/gpl/h264_helper.cxx	2012-08-28 19:53:12.080918973 +0200
+@@ -27,6 +27,7 @@
  #include <fstream>
  #include <stdlib.h> 
  #include <sys/stat.h>
 +#include <unistd.h>
  
- 
- #ifndef PLUGINCODEC_TRACING
-diff -ru opal-3.10.5/plugins/video/H.264/h264-x264.cxx opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx
---- opal-3.10.5/plugins/video/H.264/h264-x264.cxx	2012-04-26 06:56:00.000000000 +0200
-+++ opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx	2012-06-10 17:04:19.695646950 +0200
-@@ -1035,13 +1035,10 @@
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+Only in opal-3.10.7.patched/plugins/video/H.264/gpl: h264_helper.cxx.orig
+diff -ru opal-3.10.7/plugins/video/H.264/h264-x264.cxx opal-3.10.7.patched/plugins/video/H.264/h264-x264.cxx
+--- opal-3.10.7/plugins/video/H.264/h264-x264.cxx	2012-08-23 04:18:41.000000000 +0200
++++ opal-3.10.7.patched/plugins/video/H.264/h264-x264.cxx	2012-08-28 19:53:12.080918973 +0200
+@@ -1071,13 +1071,10 @@
          return false;
  
        m_context->workaround_bugs = FF_BUG_AUTODETECT;
@@ -128,32 +130,31 @@ diff -ru opal-3.10.5/plugins/video/H.264/h264-x264.cxx opal-3.10.5.patched/plugi
                            CODEC_FLAG2_SKIP_RD |
                            CODEC_FLAG2_CHUNKS;
  
-diff -ru opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx
---- opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx	2012-04-26 06:56:00.000000000 +0200
-+++ opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx	2012-06-10 17:04:46.012171051 +0200
+Only in opal-3.10.7.patched/plugins/video/H.264: h264-x264.cxx.orig
+diff -ru opal-3.10.7/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.7.patched/plugins/video/H.264/shared/x264wrap.cxx
+--- opal-3.10.7/plugins/video/H.264/shared/x264wrap.cxx	2012-08-23 04:18:41.000000000 +0200
++++ opal-3.10.7.patched/plugins/video/H.264/shared/x264wrap.cxx	2012-08-28 19:53:12.084252306 +0200
 @@ -33,6 +33,7 @@
  
  #include <codec/opalplugin.hpp>
  #include <stdio.h>
 +#include <unistd.h>
  
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+Only in opal-3.10.7.patched/plugins/video/H.264/shared: x264wrap.cxx.orig
+diff -ru opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.7.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+--- opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2012-08-23 04:18:44.000000000 +0200
++++ opal-3.10.7.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2012-08-28 19:54:35.460923804 +0200
+@@ -103,6 +103,7 @@
  
- #if defined(X264_LICENSED) || defined(GPL_HELPER_APP)
-diff -ru opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
---- opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2012-04-26 06:56:02.000000000 +0200
-+++ opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2012-06-10 16:46:33.498089705 +0200
-@@ -101,8 +101,10 @@
- #include <libavutil/bswap.h>
- #include <libavcodec/mpegvideo.h>
- 
-+
  #else /* LIBAVCODEC_HAVE_SOURCE_DIR */
- #include LIBAVCODEC_HEADER
+ #include "../common/ffmpeg.h"
 +#include <libavutil/opt.h>
  #endif /* LIBAVCODEC_HAVE_SOURCE_DIR */
  }
  
-@@ -589,17 +591,17 @@
+@@ -589,17 +590,17 @@
      m_avpicture->quality = m_videoQMin;
  
  #ifdef USE_ORIG
@@ -174,7 +175,7 @@ diff -ru opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.5.patched/pl
  #endif
      m_avcontext->opaque = this;              // for use in RTP callback
  }
-@@ -804,7 +806,7 @@
+@@ -804,7 +805,7 @@
          // Should the next frame be an I-Frame?
          if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0))
          {
@@ -183,7 +184,7 @@ diff -ru opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.5.patched/pl
          }
          else // No IFrame requested, let avcodec decide what to do
          {
-@@ -1325,7 +1327,7 @@
+@@ -1325,7 +1326,7 @@
  
  void MPEG4DecoderContext::SetStaticDecodingParams() {
      m_avcontext->flags |= CODEC_FLAG_4MV; 
diff --git a/extra/openbabel/PKGBUILD b/extra/openbabel/PKGBUILD
index 078e83de1..bcea79b31 100644
--- a/extra/openbabel/PKGBUILD
+++ b/extra/openbabel/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 140672 2011-10-18 02:34:13Z eric $
+# $Id: PKGBUILD 171707 2012-11-21 16:07:23Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=openbabel
-pkgver=2.3.1
+pkgver=2.3.2
 pkgrel=1
 pkgdesc="A library designed to interconvert between many file formats used in molecular modeling and computational chemistry"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openbabel.org/wiki/Main_Page"
 license=('GPL')
 depends=('gcc-libs' 'libxml2')
-makedepends=('cmake' 'eigen' 'wxgtk')
-optdepends=('eigen: to use bindings'
+makedepends=('cmake' 'eigen2' 'wxgtk')
+optdepends=('eigen2: to use bindings'
         'wxgtk: GUI interface')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('1f029b0add12a3b55582dc2c832b04f8')
+md5sums=('9b0007560d9d838b40ab4ad06daf5610')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index b10a02daa..12688a67f 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,57 +1,60 @@
-# $Id: PKGBUILD 168644 2012-10-13 18:33:04Z schiv $
+# $Id: PKGBUILD 171611 2012-11-20 13:12:19Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.4.2
-pkgrel=4
+pkgver=2.4.3
+pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 url="http://opencv.org/"
-depends=('jasper' 'gstreamer0.10-base' 'openexr>=1.7.0'
-         'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
-makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
+depends=('jasper' 'gstreamer0.10-base' 'intel-tbb'
+         'xine-lib' 'libdc1394' 'openexr' 'gtkglext')
+makedepends=('cmake' 'python2-numpy' 'eigen2'
+             'libcl' 'opencl-headers' 'mesa')
 optdepends=('opencv-docs'
             'opencv-samples'
             'eigen2'
+            'libcl'
             'python2-numpy: Python 2.x interface')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2")
-md5sums=('059ef86fc1724d69b75832a0d2929ff5')
-
-_cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
-            '-D CMAKE_INSTALL_PREFIX=/usr'
-            '-D CMAKE_SKIP_RPATH=ON'
-            '-D BUILD_TESTS=OFF'
-            '-D ENABLE_SSE=ON'
-            '-D ENABLE_SSE2=ON'
+source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2"
+        'pkgconfig.patch'
+        'fsh.patch')
+md5sums=('c0a5af4ff9d0d540684c0bf00ef35dbe'
+         'cb916260b5ec594fe7a0cc2e54fc569f'
+         '35256e3ccace373feba8131d1540a0de')
+
+_cmakeopts=('-D WITH_OPENCL=ON'
+            '-D WITH_OPENGL=ON'
+            '-D WITH_TBB=ON'
+            '-D WITH_XINE=ON'
+            '-D ENABLE_SSE=OFF'
+            '-D ENABLE_SSE2=OFF'
             '-D ENABLE_SSE3=OFF'
-            '-D ENABLE_SSSE3=OFF'
-            '-D ENABLE_SSE41=OFF'
-            '-D ENABLE_SSE42=OFF'
+            '-D BUILD_PACKAGE=OFF'
+            '-D BUILD_WITH_DEBUG_INFO=OFF'
+            '-D BUILD_TESTS=OFF'
+            '-D BUILD_PERF_TESTS=OFF'
             '-D BUILD_EXAMPLES=ON'
             '-D INSTALL_C_EXAMPLES=ON'
             '-D INSTALL_PYTHON_EXAMPLES=ON'
-            '-D WITH_XINE=ON'
-            '-D WITH_QT=OFF'
-            '-D WITH_QT_OPENGL=OFF'
-            '-D WITH_UNICAP=OFF'
-            '-D WITH_PVAPI=OFF'
-            '-D WITH_OPENNI=OFF'
-            '-D WITH_TBB=OFF'
-            '-D WITH_IPP=OFF'
-            '-D WITH_CUDA=OFF'
-            '-D USE_FAST_MATH=ON')
+            '-D CMAKE_BUILD_TYPE=Release'
+            '-D CMAKE_INSTALL_PREFIX=/usr'
+            '-D CMAKE_SKIP_RPATH=ON')
 
 build() {
   cd "$srcdir/$_realname-$pkgver"
 
-  # x64, i.e "Athlon64" and upwards, can use SSE3
-  [ $CARCH = x86_64 ] && \
-    _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON}
+  # fix pkg-config mess
+  # see https://bugs.archlinux.org/task/32430
+  patch -Np1 -i "$srcdir/pkgconfig.patch"
+
+  # fix another upstream mess
+  # see http://code.opencv.org/issues/2512
+  patch -Np1 -i "$srcdir/fsh.patch"
 
   cmake ${_cmakeopts[@]} .
 
@@ -69,18 +72,12 @@ package_opencv() {
 
   cd "$pkgdir/usr/share"
 
-  # prepare FSH-friendly dirs
-  #if [ -d OpenCV ]; then
-  #  mv opencv/samples OpenCV/
-  #  rm -r opencv
-  #  mv OpenCV opencv
-  #fi
-
   # separate docs package; also be -R friendly
-  [ -d $_realname/doc ] && mv $_realname/doc "$srcdir/opencv-doc"
+  [ -d doc/$pkgname ] && mv doc/$pkgname "$srcdir/opencv-doc" \
+    && rm -r doc
 
   # separate samples package
-  [ -d $_realname/samples ] && mv $_realname/samples "$srcdir/opencv-samples"
+  [ -d $pkgname/samples ] && mv $pkgname/samples "$srcdir/opencv-samples"
 }
 
 package_opencv-docs() {
@@ -92,11 +89,11 @@ package_opencv-docs() {
   cd "$srcdir"
 
   mkdir -p "$pkgdir/usr/share/doc"
-  cp -r opencv-doc "$pkgdir/usr/share/doc/$_realname"
+  cp -r opencv-doc "$pkgdir/usr/share/doc/opencv"
 
   # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
+  #  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 package_opencv-samples() {
@@ -107,12 +104,12 @@ package_opencv-samples() {
 
   cd "$srcdir"
 
-  mkdir -p "$pkgdir/usr/share/$_realname"
-  cp -r opencv-samples "$pkgdir/usr/share/$_realname/samples"
+  mkdir -p "$pkgdir/usr/share/opencv"
+  cp -r opencv-samples "$pkgdir/usr/share/opencv/samples"
 
   # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
+  #  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/opencv/fsh.patch b/extra/opencv/fsh.patch
new file mode 100644
index 000000000..fc6fb4b2a
--- /dev/null
+++ b/extra/opencv/fsh.patch
@@ -0,0 +1,103 @@
+diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake
+--- OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake	2012-11-05 18:42:32.460958392 +0000
++++ OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake	2012-11-05 18:52:43.766689315 +0000
+@@ -47,7 +47,7 @@
+ 
+   #need better solution....
+   if(libpath MATCHES "3rdparty")
+-    set(installDir "share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}")
++    set(installDir "share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}")
+   else()
+     set(installDir "${OPENCV_LIB_INSTALL_PATH}")
+   endif()
+diff -Nbaur OpenCV-2.4.3.orig/CMakeLists.txt OpenCV-2.4.3/CMakeLists.txt
+--- OpenCV-2.4.3.orig/CMakeLists.txt	2012-11-05 18:42:32.700956757 +0000
++++ OpenCV-2.4.3/CMakeLists.txt	2012-11-05 18:55:42.358787848 +0000
+@@ -221,9 +221,9 @@
+ if(ANDROID OR WIN32)
+   set(OPENCV_DOC_INSTALL_PATH doc)
+ elseif(INSTALL_TO_MANGLED_PATHS)
+-  set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc)
++  set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION})
+ else()
+-  set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
++  set(OPENCV_DOC_INSTALL_PATH share/doc/opencv)
+ endif()
+ 
+ if(ANDROID)
+@@ -237,14 +237,14 @@
+   set(LIBRARY_OUTPUT_PATH         "${OpenCV_BINARY_DIR}/lib")
+   set(3P_LIBRARY_OUTPUT_PATH      "${OpenCV_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}")
+   set(OPENCV_LIB_INSTALL_PATH     lib${LIB_SUFFIX})
+-  set(OPENCV_3P_LIB_INSTALL_PATH  share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
++  set(OPENCV_3P_LIB_INSTALL_PATH  share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH})
+   set(OPENCV_INCLUDE_INSTALL_PATH include)
+ 
+   math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
+   if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
+     set(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv)
+   else()
+-    set(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
++    set(OPENCV_CONFIG_INSTALL_PATH share/opencv)
+   endif()
+ endif()
+ 
+diff -Nbaur OpenCV-2.4.3.orig/data/CMakeLists.txt OpenCV-2.4.3/data/CMakeLists.txt
+--- OpenCV-2.4.3.orig/data/CMakeLists.txt	2012-11-05 18:42:32.460958392 +0000
++++ OpenCV-2.4.3/data/CMakeLists.txt	2012-11-05 18:52:43.816688977 +0000
+@@ -5,6 +5,6 @@
+   install(FILES ${HAAR_CASCADES} DESTINATION sdk/etc/haarcascades COMPONENT main)
+   install(FILES ${LBP_CASCADES}  DESTINATION sdk/etc/lbpcascades  COMPONENT main)
+ elseif(NOT WIN32)
+-  install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT main)
+-  install(FILES ${LBP_CASCADES}  DESTINATION share/OpenCV/lbpcascades  COMPONENT main)
++  install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT main)
++  install(FILES ${LBP_CASCADES}  DESTINATION share/opencv/lbpcascades  COMPONENT main)
+ endif()
+diff -Nbaur OpenCV-2.4.3.orig/samples/c/CMakeLists.txt OpenCV-2.4.3/samples/c/CMakeLists.txt
+--- OpenCV-2.4.3.orig/samples/c/CMakeLists.txt	2012-11-05 18:42:32.697623446 +0000
++++ OpenCV-2.4.3/samples/c/CMakeLists.txt	2012-11-05 18:52:43.826688906 +0000
+@@ -54,7 +54,7 @@
+ if (INSTALL_C_EXAMPLES AND NOT WIN32)
+   file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+   install(FILES ${C_SAMPLES}
+-          DESTINATION share/OpenCV/samples/c
++          DESTINATION share/opencv/samples/c
+           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ endif ()
+ 
+diff -Nbaur OpenCV-2.4.3.orig/samples/cpp/CMakeLists.txt OpenCV-2.4.3/samples/cpp/CMakeLists.txt
+--- OpenCV-2.4.3.orig/samples/cpp/CMakeLists.txt	2012-11-05 18:42:32.677623583 +0000
++++ OpenCV-2.4.3/samples/cpp/CMakeLists.txt	2012-11-05 18:52:43.823355598 +0000
+@@ -64,7 +64,7 @@
+ if (INSTALL_C_EXAMPLES AND NOT WIN32)
+   file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+   install(FILES ${C_SAMPLES}
+-          DESTINATION share/OpenCV/samples/cpp
++          DESTINATION share/opencv/samples/cpp
+           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ endif()
+ 
+diff -Nbaur OpenCV-2.4.3.orig/samples/gpu/CMakeLists.txt OpenCV-2.4.3/samples/gpu/CMakeLists.txt
+--- OpenCV-2.4.3.orig/samples/gpu/CMakeLists.txt	2012-11-05 18:42:32.670956962 +0000
++++ OpenCV-2.4.3/samples/gpu/CMakeLists.txt	2012-11-05 18:52:43.820022288 +0000
+@@ -64,7 +64,7 @@
+ if (INSTALL_C_EXAMPLES AND NOT WIN32)
+   file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+   install(FILES ${install_list}
+-          DESTINATION share/OpenCV/samples/${project}
++          DESTINATION share/opencv/samples/${project}
+           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ endif()
+ 
+diff -Nbaur OpenCV-2.4.3.orig/samples/gpu/performance/CMakeLists.txt OpenCV-2.4.3/samples/gpu/performance/CMakeLists.txt
+--- OpenCV-2.4.3.orig/samples/gpu/performance/CMakeLists.txt	2012-11-05 18:42:32.674290272 +0000
++++ OpenCV-2.4.3/samples/gpu/performance/CMakeLists.txt	2012-11-05 18:52:43.823355598 +0000
+@@ -21,6 +21,6 @@
+ if(INSTALL_C_EXAMPLES AND NOT WIN32)
+   file(GLOB GPU_FILES performance/*.cpp performance/*.h)
+   install(FILES ${GPU_FILES}
+-          DESTINATION share/OpenCV/samples/gpu/performance
++          DESTINATION share/opencv/samples/gpu/performance
+           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ endif()
diff --git a/extra/opencv/pkgconfig.patch b/extra/opencv/pkgconfig.patch
new file mode 100644
index 000000000..84d268e61
--- /dev/null
+++ b/extra/opencv/pkgconfig.patch
@@ -0,0 +1,35 @@
+diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake
+--- OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake	2012-11-04 08:40:14.243505926 +0000
++++ OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake	2012-11-04 08:40:42.286649120 +0000
+@@ -10,7 +10,7 @@
+ # -------------------------------------------------------------------------------------------
+ set(prefix      "${CMAKE_INSTALL_PREFIX}")
+ set(exec_prefix "\${prefix}")
+-set(libdir      "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS
++set(libdir      "\${prefix}/${OPENCV_LIB_INSTALL_PATH}")
+ set(includedir  "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}")
+ set(VERSION     ${OPENCV_VERSION})
+ 
+@@ -36,10 +36,11 @@
+ ocv_list_reverse(OpenCV_EXTRA_COMPONENTS)
+ 
+ #build the list of components
+-set(OpenCV_LIB_COMPONENTS_ "")
++set(OpenCV_LIB_COMPONENTS_ "-L\${libdir}")
+ foreach(CVLib ${OpenCV_LIB_COMPONENTS})
+   get_target_property(libpath ${CVLib} LOCATION_${CMAKE_BUILD_TYPE})
+   get_filename_component(libname "${libpath}" NAME)
++  get_filename_component(lname "${libpath}" NAME_WE)
+ 
+   if(INSTALL_TO_MANGLED_PATHS)
+     set(libname "${libname}.${OPENCV_VERSION}")
+@@ -52,7 +53,8 @@
+     set(installDir "${OPENCV_LIB_INSTALL_PATH}")
+   endif()
+ 
+-  set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} \${exec_prefix}/${installDir}/${libname}")
++  string(REPLACE "libopencv" "-lopencv" lname "${lname}")
++  set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} ${lname}")
+ endforeach()
+ 
+ # add extra dependencies required for OpenCV
diff --git a/extra/openexr/PKGBUILD b/extra/openexr/PKGBUILD
index b4d8a0f33..6a72be6f9 100644
--- a/extra/openexr/PKGBUILD
+++ b/extra/openexr/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168476 2012-10-12 12:47:54Z tpowa $
+# $Id: PKGBUILD 169756 2012-10-27 23:42:17Z eric $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=openexr
 pkgver=1.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An high dynamic-range image file format library"
 url="http://www.openexr.com/"
 arch=(i686 x86_64 'mips64el')
@@ -15,7 +15,7 @@ source=("https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-${pkgver}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i ${srcdir}/gcc43.patch
+  patch -p0 -i "${srcdir}/gcc43.patch"
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD
index b703d4fb2..a9b06c207 100644
--- a/extra/opengtl/PKGBUILD
+++ b/extra/opengtl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 159432 2012-05-24 08:42:21Z foutrelis $
+# $Id: PKGBUILD 169817 2012-10-30 10:47:49Z foutrelis $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Andries Radu <admiral0@live.it>
 
 pkgname=opengtl
-pkgver=0.9.16
-pkgrel=2
+pkgver=0.9.17
+pkgrel=1
 pkgdesc="A set of library for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications"
 url="http://www.opengtl.org"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,15 +13,10 @@ depends=('gcc-libs' 'llvm')
 makedepends=('cmake' 'libpng')
 optdepends=('libpng: for using the png extension')
 source=(http://download.opengtl.org/OpenGTL-${pkgver}.tar.bz2)
-sha1sums=('3cfe4a08e5778c13f7e74dfc822adb68f97ad048')
+sha1sums=('10369bd11109312466389b3b050469dd69e54d2b')
 
 build() {
   cd "${srcdir}"
-  # Fix build with LLVM 3.1
-  sed -i 's/LLVM_VERSION STREQUAL "3.0"/LLVM_VERSION STREQUAL "3.1"/' \
-    OpenGTL-${pkgver}/CMakeLists.txt
-  sed -i 's/ConstantArray::get/ConstantDataArray::getString/' \
-    OpenGTL-${pkgver}/OpenGTL/GTLCore/AST/Expression.cpp
   mkdir build
   cd build
   cmake ../OpenGTL-${pkgver} \
diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD
index 61305009e..86e346cba 100644
--- a/extra/openmpi/PKGBUILD
+++ b/extra/openmpi/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 167415 2012-10-02 00:13:37Z stephane $
+# $Id: PKGBUILD 170075 2012-10-31 21:09:28Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 pkgname=openmpi
-pkgver=1.6.2
+pkgver=1.6.3
 pkgrel=1
 pkgdesc="High performance message passing library (MPI)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,15 +12,15 @@ depends=('gcc-fortran' 'openssh' 'libltdl' 'hwloc')
 makedepends=('inetutils')
 options=(!libtool)
 source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('694fd3bac911cdb22f77175884d819b6fea871df')
+sha1sums=('a61aa2dee4c47d93d88e49ebed36de25df4f6492')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
 
    if [ "$CARCH" = "mips64el" ]; then
-     valgrind="--without-valgrind"
+     valgrind="--without-valgrind --disable-memchecker"
    else
-     valgrind="--with-valgrind"
+     valgrind="--with-valgrind --enable-memchecker"
    fi
    # Make sure we use the system ltdl librariry rather than the ones in the tarball
    rm -r opal/libltdl
@@ -33,7 +33,6 @@ build() {
                --with-threads=posix \
                --enable-smp-locks \
                $valgrind \
-               --enable-memchecker \
                --enable-debug \
                --enable-pretty-print-stacktrace \
                --without-slurm \
diff --git a/extra/oprofile/PKGBUILD b/extra/oprofile/PKGBUILD
index 7dc0fe077..41b02b3be 100644
--- a/extra/oprofile/PKGBUILD
+++ b/extra/oprofile/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163607 2012-07-16 23:59:16Z eric $
+# $Id: PKGBUILD 169713 2012-10-27 01:52:54Z stephane $
 # Maintainer : Aaron Griffin <aaron@archlinux.org>
 
 pkgname=oprofile
-pkgver=0.9.7
-pkgrel=4
+pkgver=0.9.8
+pkgrel=1
 pkgdesc="A system-wide profiler for Linux systems, capable of profiling all running code at low overhead"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://oprofile.sourceforge.net"
@@ -14,7 +14,7 @@ optdepends=('qt: for oprof_start gui')
 options=('!libtool')
 install=oprofile.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-sha1sums=('f5befd8aafc77d449e955f0585216f5d7b967de2')
+sha1sums=('28416b853641f913e5f90954f2e3837efd96f6cd')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/opus/PKGBUILD b/extra/opus/PKGBUILD
index c250b548d..b047b7a95 100644
--- a/extra/opus/PKGBUILD
+++ b/extra/opus/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=opus
 pkgver=1.0.1
 pkgrel=2
 pkgdesc="codec designed for interactive speech and audio transmission over the Internet"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.opus-codec.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/oxine/PKGBUILD b/extra/oxine/PKGBUILD
deleted file mode 100644
index b0ab5e6ae..000000000
--- a/extra/oxine/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 150882 2012-02-23 13:48:09Z allan $
-# Maintainer:
-# Contributor: Rouslan Solomakhin <rouslan@localnet.com>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=oxine
-pkgver=0.7.1
-pkgrel=6.1
-pkgdesc="A lightweight, purely osd based xine frontend for set-top boxes and home entertainment systems"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://oxine.sourceforge.net/"
-license=('GPL')
-depends=('xine-lib' 'libexif' 'eject' 'libcdio' 'curl' 'libxtst')
-source=(http://downloads.sourceforge.net/sourceforge/oxine/${pkgname}-${pkgver}.tar.gz)
-md5sums=('2a2d05ee21892624e35cf539e532c0dd')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|#include <curl/types.h>||' configure src/download.c
-  ./configure --prefix=/usr --disable-hal --without-jsw --disable-extractor \
-    --without-imagemagick --disable-gdkpixbuf --disable-weather
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD
index 282cc6864..a837649c3 100644
--- a/extra/pango/PKGBUILD
+++ b/extra/pango/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 161372 2012-06-10 10:55:15Z jgc $ 
+# $Id: PKGBUILD 172098 2012-11-28 10:31:22Z jgc $ 
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pango
-pkgver=1.30.1
+pkgver=1.32.3
 pkgrel=1
 pkgdesc="A library for layout and rendering of text"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-depends=('glib2' 'cairo' 'libxft' 'libthai' 'freetype2')
-makedepends=('gobject-introspection' 'libxt' 'gtk-doc')
-options=('!libtool' '!emptydirs')
+depends=('libthai' 'cairo' 'libxft' 'harfbuzz')
+makedepends=('harfbuzz' 'fontconfig' 'cairo' 'libxft' 'libthai' 'gobject-introspection')
+options=('!libtool')
 install=pango.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
+source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
 url="http://www.pango.org/"
-sha256sums=('3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe')
+sha256sums=('19a1a4fa021fcf96261de3cb809295ac06546f2a061c3c623141f2f4989b6a36')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -25,5 +25,6 @@ build() {
 
 package() {
   cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
+  make -j1 DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/etc/pango"
 }
diff --git a/extra/pangox-compat/PKGBUILD b/extra/pangox-compat/PKGBUILD
new file mode 100644
index 000000000..08734edd0
--- /dev/null
+++ b/extra/pangox-compat/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 169992 2012-10-30 23:00:58Z heftig $ 
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=pangox-compat
+pkgver=0.0.2
+pkgrel=1
+pkgdesc="X Window System font support for Pango"
+arch=('i686' 'x86_64' 'mips64el')
+license=('LGPL')
+depends=('pango')
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
+url="http://www.pango.org/"
+sha256sums=('552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make -j1 DESTDIR="${pkgdir}" install
+}
diff --git a/extra/pdksh/PKGBUILD b/extra/pdksh/PKGBUILD
deleted file mode 100644
index 6ad3ddaad..000000000
--- a/extra/pdksh/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 128476 2011-06-24 03:30:58Z eric $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=pdksh
-pkgver=5.2.14
-pkgrel=6.1
-pkgdesc="A public domain clone of the AT&T Korn shell"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.cs.mun.ca/~michael/pdksh/"
-license=('custom')
-depends=('glibc')
-install=pdksh.install
-#ftp://ftp.cs.mun.ca/pub/$pkgname/$pkgname-$pkgver.tar.gz
-source=(http://www.cs.mun.ca/~michael/pdksh/files/$pkgname-$pkgver.tar.gz pdksh-5.2.14.patch usr_ksh.sh)
-md5sums=('871106b3bd937e1afba9f2ef7c43aef3' 'f11d1e711627d21a547c09e344e30dd3'\
-         '56084a657ecafd5dd0813a6056036712')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i ../$pkgname-$pkgver.patch
-  ./configure --prefix=/ --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make prefix="$pkgdir" mandir="$pkgdir/usr/share/man/man1" install
-  install -D -m 755 "${srcdir}/usr_ksh.sh" "${pkgdir}/usr/bin/ksh"
-  install -D -m644 LEGAL "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/extra/pdksh/pdksh-5.2.14.patch b/extra/pdksh/pdksh-5.2.14.patch
deleted file mode 100644
index 134e04f34..000000000
--- a/extra/pdksh/pdksh-5.2.14.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ru pdksh-5.2.14/siglist.sh pdksh-5.2.14.arch/siglist.sh
---- pdksh-5.2.14/siglist.sh	1996-09-18 12:52:41.000000000 -0400
-+++ pdksh-5.2.14.arch/siglist.sh	2004-09-06 08:17:15.000000000 -0400
-@@ -11,19 +11,18 @@
- out=tmpo$$.c
- ecode=1
- trapsigs='0 1 2 13 15'
--trap 'rm -f $in $out; trap 0; exit $ecode' $trapsigs
-+trap 'rm -f $in $out; exit $ecode' $trapsigs
- 
- CPP="${1-cc -E}"
- 
- # The trap here to make up for a bug in bash (1.14.3(1)) that calls the trap
--(trap $trapsigs;
-- echo '#include "sh.h"';
-+(echo '#include "sh.h"';
-  echo '	{ QwErTy SIGNALS , "DUMMY" , "hook for number of signals" },';
-  sed -e '/^[	 ]*#/d' -e 's/^[	 ]*\([^ 	][^ 	]*\)[	 ][	 ]*\(.*[^ 	]\)[ 	]*$/#ifdef SIG\1\
- 	{ QwErTy SIG\1 , "\1", "\2" },\
- #endif/') > $in
- $CPP $in  > $out
--sed -n 's/{ QwErTy/{/p' < $out | awk '{print NR, $0}' | sort +2n +0n |
-+sed -n 's/{ QwErTy/{/p' < $out | awk '{print NR, $0}' | sort -g --key=3 |
-     sed 's/^[0-9]* //' |
-     awk 'BEGIN { last=0; nsigs=0; }
- 	{
diff --git a/extra/pdksh/pdksh.install b/extra/pdksh/pdksh.install
deleted file mode 100644
index 17463a17e..000000000
--- a/extra/pdksh/pdksh.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  if [ ! "$(grep /bin/ksh etc/shells)" ]; then
-    echo "updating /etc/shells... done."
-    sed -i "s|/bin/bash|/bin/bash\n/bin/ksh|" etc/shells
-  else
-    sed -i "s|/usr/bin/ksh|/bin/ksh|" etc/shells
-
-    echo ""
-    echo ">> WARNING: /usr/bin/ksh has moved to /bin/ksh,"
-    echo ">> please update your user accounts as needed"
-    echo ""
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  echo -ne "\nupdating /etc/shells... "
-  sed -i "s|/bin/ksh||" etc/shells
-}
diff --git a/extra/pdksh/usr_ksh.sh b/extra/pdksh/usr_ksh.sh
deleted file mode 100644
index 17a96d1bf..000000000
--- a/extra/pdksh/usr_ksh.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-echo "WARNING: you should be calling ksh with /bin/ksh,"
-echo "not with /usr/bin/ksh. Please execute chsh to fix"
-echo "this. Legacy /usr/bin/ksh support will go away!"
-echo ""
-
-exec /bin/ksh $@
-
diff --git a/extra/pdns-recursor/PKGBUILD b/extra/pdns-recursor/PKGBUILD
deleted file mode 100644
index a949ebea0..000000000
--- a/extra/pdns-recursor/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 151458 2012-02-26 11:37:32Z pierre $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=pdns-recursor
-pkgver=3.3
-pkgrel=2
-pkgdesc="PowerDNS recursor"
-url="http://www.powerdns.com"
-license=('GPL')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('gcc-libs' 'lua')
-makedepends=('boost')
-backup=('etc/powerdns/recursor.conf')
-source=("http://downloads.powerdns.com/releases/${pkgname}-${pkgver}.tar.bz2"
-        'pdns-recursor.rc')
-md5sums=('87daeeebb6f7af9e07814ff6c43300dd'
-         '5b3aa3c8ed2edf55821af16cfb7ef252')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d -m755 "${pkgdir}/etc/rc.d"
-  mv "${pkgdir}/etc/powerdns/recursor.conf-dist" "${pkgdir}/etc/powerdns/recursor.conf"
-  install -m755 "${srcdir}/pdns-recursor.rc" "${pkgdir}/etc/rc.d/pdns-recursor"
-  rm -rf "${pkgdir}/etc/init.d"
-}
diff --git a/extra/pdns-recursor/pdns-recursor.rc b/extra/pdns-recursor/pdns-recursor.rc
deleted file mode 100644
index 992f0b086..000000000
--- a/extra/pdns-recursor/pdns-recursor.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting PowerDNS recursor"
-    ! /usr/sbin/rec_control ping > /dev/null 2>&1 && /usr/sbin/pdns_recursor --daemon
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon pdns-recursor
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping PowerDNS recursor"
-    rec_control quit > /dev/null 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon pdns-recursor
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/pdns/2.9.18-default-mysql-options.patch b/extra/pdns/2.9.18-default-mysql-options.patch
deleted file mode 100755
index a9048e13e..000000000
--- a/extra/pdns/2.9.18-default-mysql-options.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur pdns-2.9.18.orig/modules/gmysqlbackend/smysql.cc pdns-2.9.18/modules/gmysqlbackend/smysql.cc
---- pdns-2.9.18.orig/modules/gmysqlbackend/smysql.cc	2005-04-23 23:40:15.000000000 +0200
-+++ pdns-2.9.18/modules/gmysqlbackend/smysql.cc	2005-07-17 10:38:35.363597586 +0200
-@@ -15,6 +15,9 @@
- 	       const string &password)
- {
-   mysql_init(&d_db);
-+#if MYSQL_VERSION_ID > 32349
-+  mysql_options(&d_db, MYSQL_READ_DEFAULT_GROUP, "client");
-+#endif
-   if (!mysql_real_connect(&d_db, host.empty() ? 0 : host.c_str(), 
- 			  user.empty() ? 0 : user.c_str(), 
- 			  password.empty() ? 0 : password.c_str(),
diff --git a/extra/pdns/PKGBUILD b/extra/pdns/PKGBUILD
deleted file mode 100644
index 855f10911..000000000
--- a/extra/pdns/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 151459 2012-02-26 11:41:02Z pierre $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=pdns
-pkgver=2.9.22.6
-pkgrel=1
-pkgdesc="A modern, advanced and high performance authoritative-only nameserver"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.powerdns.com"
-license=('GPL')
-depends=('gcc-libs' 'zlib' 'postgresql-libs' 'libmysqlclient' 'sqlite3' 'libldap')
-makedepends=('boost')
-provides=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
-replaces=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
-conflicts=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
-install=pdns.install
-options=('!makeflags' '!libtool')
-backup=('etc/powerdns/pdns.conf')
-source=("http://downloads.powerdns.com/releases/${pkgname}-${pkgver}.tar.gz"
-        '2.9.18-default-mysql-options.patch'
-        'pdns-2.9.22-gcc44.patch'
-        'pdns.rc'
-        'pdns.conf')
-md5sums=('ff97ba980b322adb61c3e9c9e9c4adef'
-         '90fb32e843326d14359c508cef855929'
-         '530642273005bdabae27792098834ea6'
-         '16e2d32e9781be7afa8f1700740bcdb0'
-         'a390ab49c4fcde205629be33bddc2e6c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/2.9.18-default-mysql-options.patch"
-  patch -p1 -i "${srcdir}/pdns-2.9.22-gcc44.patch"
-  touch AUTHORS NEWS
-  libtoolize --force --copy
-  aclocal
-  autoconf
-  automake --add-missing
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc/powerdns \
-    --libexecdir=/usr/lib \
-    --libdir=/usr/lib/powerdns \
-    --mandir=/usr/share/man \
-    --with-modules="" \
-    --with-dynmodules="ldap pipe gmysql gpgsql gsqlite3 geo" \
-    --disable-recursor \
-    --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  rm "${pkgdir}/etc/powerdns/pdns.conf-dist"
-  install -m644 "${srcdir}/pdns.conf" "${pkgdir}/etc/powerdns/"
-  install -m755 "${srcdir}/pdns.rc" "${pkgdir}/etc/rc.d/pdns"
-}
diff --git a/extra/pdns/pdns-2.9.22-gcc44.patch b/extra/pdns/pdns-2.9.22-gcc44.patch
deleted file mode 100644
index 35c1c7777..000000000
--- a/extra/pdns/pdns-2.9.22-gcc44.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur pdns-2.9.22.orig/pdns/dnsparser.cc pdns-2.9.22/pdns/dnsparser.cc
---- pdns-2.9.22.orig/pdns/dnsparser.cc	2008-11-15 22:32:46.000000000 +0200
-+++ pdns-2.9.22/pdns/dnsparser.cc	2009-07-06 22:09:02.000000000 +0300
-@@ -16,6 +16,7 @@
-     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
- 
-+#include <stdio.h>
- #include "dnsparser.hh"
- #include "dnswriter.hh"
- #include <boost/lexical_cast.hpp>
-diff -ur pdns-2.9.22.orig/pdns/rcpgenerator.cc pdns-2.9.22/pdns/rcpgenerator.cc
---- pdns-2.9.22.orig/pdns/rcpgenerator.cc	2008-11-15 23:20:27.000000000 +0200
-+++ pdns-2.9.22/pdns/rcpgenerator.cc	2009-07-06 22:07:26.000000000 +0300
-@@ -16,6 +16,7 @@
-     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
- 
-+#include <stdio.h>
- #include "rcpgenerator.hh"
- #include "dnsparser.hh"
- #include "misc.hh"
diff --git a/extra/pdns/pdns.conf b/extra/pdns/pdns.conf
deleted file mode 100644
index 1bf24e73f..000000000
--- a/extra/pdns/pdns.conf
+++ /dev/null
@@ -1,290 +0,0 @@
-# Autogenerated configuration file template
-#################################
-# allow-axfr-ips	If disabled, DO allow zonetransfers from these IP addresses
-#
-# allow-axfr-ips=
-
-#################################
-# allow-recursion	List of netmasks that are allowed to recurse
-#
-allow-recursion=127.0.0.1
-
-#################################
-# allow-recursion-override	Local data overrrides hosts on the internet
-#
-allow-recursion-override=yes
-
-#################################
-# cache-ttl	Seconds to store packets in the PacketCache
-#
-cache-ttl=60
-
-#################################
-# chroot	If set, chroot to this directory for more security
-#
-chroot=/var/empty
-
-#################################
-# config-dir	Location of configuration directory (pdns.conf)
-#
-config-dir=/etc
-
-#################################
-# config-name	Name of this virtual configuration - will rename the binary image
-#
-# config-name=
-
-#################################
-# control-console	Debugging switch - don't use
-#
-# control-console=no
-
-#################################
-# daemon	Operate as a daemon
-#
-daemon=yes
-
-#################################
-# default-soa-name	name to insert in the SOA record if none set in the backend
-#
-# default-soa-name=a.misconfigured.powerdns.server
-
-#################################
-# disable-axfr	Disable zonetransfers but do allow TCP queries
-#
-# disable-axfr=no
-
-#################################
-# disable-tcp	Do not listen to TCP queries
-#
-# disable-tcp=no
-
-#################################
-# distributor-threads	Default number of Distributor (backend) threads to start
-#
-distributor-threads=3
-
-#################################
-# fancy-records	Process URL and MBOXFW records
-#
-# fancy-records=no
-
-#################################
-# guardian	Run within a guardian process
-#
-guardian=yes
-
-#################################
-# launch	Which backends to launch and order to query them in
-#
-#launch=
-
-#################################
-# lazy-recursion	Only recurse if question cannot be answered locally
-#
-lazy-recursion=yes
-
-#################################
-# load-modules	Load this module - supply absolute or relative path
-#
-# load-modules=
-
-#################################
-# local-address	Local IP address to which we bind
-#
-local-address=127.0.0.1
-
-#################################
-# local-ipv6	Local IP address to which we bind
-#
-# local-ipv6=
-
-#################################
-# local-port	The port on which we listen
-#
-local-port=53
-
-#################################
-# log-dns-details	If PDNS should log failed update requests
-#
-#log-dns-details=off
-
-#################################
-# log-failed-updates	If PDNS should log failed update requests
-#
-#log-failed-updates=off
-
-#################################
-# logfile	Logfile to use
-#
-# logfile=pdns.log
-
-#################################
-# logging-facility	Log under a specific facility
-#
-# logging-facility=
-
-#################################
-# loglevel	Amount of logging. Higher is more. Do not set below 3
-#
-loglevel=3
-
-#################################
-# master	Act as a master
-#
-# master=no
-
-#################################
-# max-queue-length	Maximum queuelength before considering situation lost
-#
-# max-queue-length=5000
-
-#################################
-# max-tcp-connections	Maximum number of TCP connections
-#
-# max-tcp-connections=10
-
-#################################
-# module-dir	Default directory for modules
-#
-module-dir=/usr/lib/powerdns
-
-#################################
-# negquery-cache-ttl	Seconds to store packets in the PacketCache
-#
-negquery-cache-ttl=60
-
-#################################
-# only-soa	Make sure that no SOA serial is less than this number
-#
-# only-soa=org
-
-#################################
-# out-of-zone-additional-processing	Do out of zone additional processing
-#
-# out-of-zone-additional-processing=no
-
-#################################
-# query-cache-ttl	Seconds to store packets in the PacketCache
-#
-# query-cache-ttl=20
-
-#################################
-# query-logging	Hint backends that queries should be logged
-#
-# query-logging=no
-
-#################################
-# queue-limit	Maximum number of milliseconds to queue a query
-#
-# queue-limit=1500
-
-#################################
-# receiver-threads	Number of receiver threads to launch
-#
-# receiver-threads=1
-
-#################################
-# recursive-cache-ttl	Seconds to store packets in the PacketCache
-#
-# recursive-cache-ttl=10
-
-#################################
-# recursor	If recursion is desired, IP address of a recursing nameserver
-#
-#recursor=
-
-#################################
-# setgid	If set, change group id to this gid for more security
-#
-setgid=nobody
-
-#################################
-# setuid	If set, change user id to this uid for more security
-#
-setuid=nobody
-
-#################################
-# skip-cname	Do not perform CNAME indirection for each query
-#
-# skip-cname=no
-
-#################################
-# slave	Act as a slave
-#
-# slave=no
-
-#################################
-# slave-cycle-interval	Reschedule failed SOA serial checks once every .. seconds
-#
-# slave-cycle-interval=60
-
-#################################
-# smtpredirector	Our smtpredir MX host
-#
-# smtpredirector=a.misconfigured.powerdns.smtp.server
-
-#################################
-# soa-minimum-ttl	Default SOA mininum ttl
-#
-# soa-minimum-ttl=3600
-
-#################################
-# soa-serial-offset	Make sure that no SOA serial is less than this number
-#
-# soa-serial-offset=0
-
-#################################
-# socket-dir	Where the controlsocket will live
-#
-socket-dir=/var/run
-
-#################################
-# strict-rfc-axfrs	Perform strictly rfc compliant axfrs (very slow)
-#
-# strict-rfc-axfrs=no
-
-#################################
-# urlredirector	Where we send hosts to that need to be url redirected
-#
-# urlredirector=127.0.0.1
-
-#################################
-# use-logfile	Use a log file
-#
-use-logfile=no
-
-#################################
-# webserver	Start a webserver for monitoring
-#
-webserver=no
-
-#################################
-# webserver-address	IP Address of webserver to listen on
-#
-# webserver-address=127.0.0.1
-
-#################################
-# webserver-password	Password required for accessing the webserver
-#
-# webserver-password=
-
-#################################
-# webserver-port	Port of webserver to listen on
-#
-# webserver-port=8081
-
-#################################
-# webserver-print-arguments	If the webserver should print arguments
-#
-# webserver-print-arguments=no
-
-#################################
-# wildcard-url	Process URL and MBOXFW records
-#
-# wildcard-url=no
-
-#################################
-# wildcards	Honor wildcards in the database
-#
-wildcards=yes
diff --git a/extra/pdns/pdns.install b/extra/pdns/pdns.install
deleted file mode 100644
index f41b36b20..000000000
--- a/extra/pdns/pdns.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  cat << 'EOM'
-==> PowerDNS is built without recursor now. To use the recursor, 
-==> please install the pdns-recursor package and update the 
-==> configuration in /etc/powerdns/recursor.conf
-EOM
-}
-
-post_upgrade() {
-  post_install $1
-}
diff --git a/extra/pdns/pdns.rc b/extra/pdns/pdns.rc
deleted file mode 100644
index 2f143ddae..000000000
--- a/extra/pdns/pdns.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting DNS"
-    ! /usr/sbin/pdns_control ping > /dev/null 2>&1 && /usr/sbin/pdns_server --daemon
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon pdns
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DNS"
-    pdns_control quit > /dev/null 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon pdns
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/perl-time-hires/PKGBUILD b/extra/perl-time-hires/PKGBUILD
deleted file mode 100644
index d72b0df14..000000000
--- a/extra/perl-time-hires/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 160559 2012-06-02 10:28:27Z bluewind $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: mezcal <fila at pruda dot com>
-
-pkgname=perl-time-hires
-pkgver=1.9725
-pkgrel=2
-pkgdesc="Perl module: high resolution time, sleep, and alarm"
-arch=('i686' 'x86_64' 'mips64el')
-license=('PerlArtistic')
-url="http://search.cpan.org/dist/Time-HiRes/"
-depends=('perl')
-options=(!emptydirs)
-source=("http://search.cpan.org/CPAN/authors/id/Z/ZE/ZEFRAM/Time-HiRes-${pkgver}.tar.gz")
-md5sums=('cb1108c076d26f3d2fed0bb91313135a')
-
-build() {
-  cd "${srcdir}/Time-HiRes-${pkgver}"
-
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-
-  make
-}
-
-check() {
-  cd "${srcdir}/Time-HiRes-${pkgver}"
-
-  make test
-}
-
-package() {
-  cd "${srcdir}/Time-HiRes-${pkgver}"
-
-  make install DESTDIR="${pkgdir}"
-}
diff --git a/extra/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD
index d7bf91f92..fc12aa997 100644
--- a/extra/phonon-vlc/PKGBUILD
+++ b/extra/phonon-vlc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 165106 2012-08-11 07:25:00Z andrea $
+# $Id: PKGBUILD 170852 2012-11-12 18:34:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon-vlc
-pkgver=0.6.0
+pkgver=0.6.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://phonon.kde.org/'
@@ -12,7 +12,7 @@ depends=('vlc')
 makedepends=('cmake' 'automoc4' 'phonon')
 provides=('phonon-backend')
 source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/src/phonon-backend-vlc-${pkgver}.tar.xz")
-md5sums=('13c7adb90f62cb568d17bc9ced9406e9')
+md5sums=('d227b92619124a2b85e2d2e5f0fff90e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD
index 4198b42df..0535acd73 100644
--- a/extra/phonon/PKGBUILD
+++ b/extra/phonon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 149569 2012-02-08 14:44:08Z andrea $
+# $Id: PKGBUILD 169725 2012-10-27 10:50:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon
 pkgver=4.6.0
-pkgrel=2.1
+pkgrel=3
 epoch=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://phonon.kde.org/'
@@ -13,15 +13,18 @@ depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist')
 optdepends=('pulseaudio: PulseAudio support')
 makedepends=('cmake' 'automoc4' 'pulseaudio' 'qtwebkit')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
-        'fix-plugindir-for-qt-app.patch')
+        'fix-plugindir-for-qt-app.patch'
+        'fix-qmake.patch')
 md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173'
-         'e37d67038c2501f25ac7ee7c2de54a9a')
+         'e37d67038c2501f25ac7ee7c2de54a9a'
+         'c17d8617e9482f02b3e098842946b679')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}"/fix-plugindir-for-qt-app.patch
+  patch -p1 -i "${srcdir}"/fix-qmake.patch
+  cd ../
 
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -34,6 +37,6 @@ build() {
 }
 
 package(){
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/phonon/fix-qmake.patch b/extra/phonon/fix-qmake.patch
new file mode 100644
index 000000000..2add588d4
--- /dev/null
+++ b/extra/phonon/fix-qmake.patch
@@ -0,0 +1,27 @@
+From: Oswald Buddenhagen <ossi@kde.org>
+Date: Sat, 27 Oct 2012 07:58:16 +0000
+Subject: remove unnecessary if() statement
+X-Git-Url: http://quickgit.kde.org/?p=phonon.git&amp;a=commitdiff&amp;h=a8c431494d2a6f3785c132f14d00d38ea0e5b328
+---
+remove unnecessary if() statement
+
+as it happens, this works around a qmake breakage relating to parsing if()
+
+BUG: 295037
+FIXED-IN: 4.6.1
+---
+
+
+--- a/qt_phonon.pri
++++ b/qt_phonon.pri
+@@ -3,7 +3,7 @@
+ # the next build of Qt. So pretend we're not there in this case.
+ # This file is loaded by qt_config.prf, before .qmake.cache has been loaded.
+ # Consequently, we have to do some stunts to get values out of the cache.
+-if(!exists($$_QMAKE_CACHE_)| \
+-   !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build)): \
++!exists($$_QMAKE_CACHE_)| \
++   !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build): \
+     QT_CONFIG += phonon
+ 
+
diff --git a/extra/php-xcache/PKGBUILD b/extra/php-xcache/PKGBUILD
index bd4bb1472..6d7f6800b 100644
--- a/extra/php-xcache/PKGBUILD
+++ b/extra/php-xcache/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163591 2012-07-16 07:46:41Z pierre $
+# $Id: PKGBUILD 170770 2012-11-11 06:21:29Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=php-xcache
-pkgver=2.0.1
-pkgrel=1
+pkgver=3.0.0
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='A PHP opcode cacher'
 url='http://xcache.lighttpd.net/'
@@ -12,8 +12,8 @@ license=('custom')
 source=("http://xcache.lighttpd.net/pub/Releases/${pkgver}/xcache-${pkgver}.tar.bz2"
         'xcache.ini')
 backup=('etc/php/conf.d/xcache.ini')
-md5sums=('d3bc9645dc1b084c1eb45cfc4d8e9ccc'
-         'bba7ead3e592a7980aa91a8600973587')
+md5sums=('63be7c8b14ffc01babe5378111f13228'
+         '8fd9ce537ada9463c4b0c042243158c0')
 
 build() {
 	cd $srcdir/xcache-$pkgver
@@ -34,7 +34,7 @@ package() {
 	install -Dm644 $srcdir/xcache.ini $pkgdir/etc/php/conf.d/xcache.ini
 
 	install -dm755 $pkgdir/usr/share/php-xcache/admin
-	install -m644 admin/* $pkgdir/usr/share/php-xcache/admin/
+	cp -r htdocs/* $pkgdir/usr/share/php-xcache/admin/
 
 	install -Dm644 COPYING $pkgdir/usr/share/licenses/php-xcache/COPYING
 }
diff --git a/extra/php-xcache/xcache.ini b/extra/php-xcache/xcache.ini
index c2677a5ca..b814dbce1 100644
--- a/extra/php-xcache/xcache.ini
+++ b/extra/php-xcache/xcache.ini
@@ -1,3 +1,3 @@
-;zend_extension=/usr/lib/php/modules/xcache.so
+;extension=xcache.so
 xcache.size=64M
 xcache.var_size=64M
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 6c617530c..fc6f699f3 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169306 2012-10-19 05:27:26Z pierre $
+# $Id: PKGBUILD 171900 2012-11-22 18:08:46Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,7 +21,7 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.4.8
+pkgver=5.4.9
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('PHP')
@@ -33,7 +33,7 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
         'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('bb8c816a9299be8995255ef70c63b800'
+md5sums=('076a9f84d861d3f664a2878d5773ba78'
          '0b0bc7a917fc592bdf11dcd3c5c255e9'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          '3cfde0cc4ed09b55f1ce531437a4eb88'
diff --git a/extra/physfs/PKGBUILD b/extra/physfs/PKGBUILD
index 4975fb54d..5e84b8e28 100644
--- a/extra/physfs/PKGBUILD
+++ b/extra/physfs/PKGBUILD
@@ -2,23 +2,19 @@
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=physfs
-pkgver=2.0.2
-pkgrel=2.1
+pkgver=2.0.3
+pkgrel=1
 pkgdesc="A library to provide abstract access to various archives"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://icculus.org/physfs/"
 license=('ZLIB')
 depends=('zlib')
 makedepends=('cmake' 'doxygen')
-options=('!makeflags')
-source=(http://icculus.org/physfs/downloads/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('2d3d3cc819ad26542d34451f44050b85635344d0')
+source=(http://icculus.org/physfs/downloads/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('327308c777009a41bbabb9159b18c4c0ac069537')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's/-Werror//' CMakeLists.txt
-  export CFLAGS="$CFLAGS -fno-strict-aliasing"
-  export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
   cmake . -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DPHYSFS_BUILD_TEST=OFF -DPHYSFS_BUILD_WX_TEST=OFF
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index 995881099..758c9794f 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163104 2012-07-07 05:24:14Z foutrelis $
+# $Id: PKGBUILD 169990 2012-10-30 23:00:51Z heftig $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -7,13 +7,13 @@
 
 pkgname=('pidgin' 'libpurple' 'finch')
 pkgver=2.10.6
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pidgin.im/"
 license=('GPL')
 makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
-             'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10'
-             'farstream' 'avahi' 'tk' 'ca-certificates' 'intltool'
+             'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10' 'avahi'
+             'tk' 'ca-certificates' 'intltool'
              'networkmanager')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
@@ -35,6 +35,7 @@ build() {
     --enable-cyrus-sasl \
     --disable-doxygen \
     --enable-nm \
+    --disable-vv \
     --with-python=/usr/bin/python2 \
     --with-system-ssl-certs=/etc/ssl/certs
     make
@@ -43,9 +44,8 @@ build() {
 package_pidgin(){
   pkgdesc="Multi-protocol instant messaging client"
   depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
-           'gstreamer0.10' 'hicolor-icon-theme')
-  optdepends=('aspell: for spelling correction'
-              'gstreamer0.10-good-plugins: video and voice support')
+           'hicolor-icon-theme')
+  optdepends=('aspell: for spelling correction')
   install=pidgin.install
 
   cd "$srcdir/pidgin-$pkgver"
@@ -66,7 +66,7 @@ package_pidgin(){
 
 package_libpurple(){
   pkgdesc="IM library extracted from Pidgin"
-  depends=('farstream' 'libsasl' 'libidn' 'dbus-glib' 'nss')
+  depends=('gstreamer0.10' 'libsasl' 'libidn' 'dbus-glib' 'nss')
   optdepends=('avahi: Bonjour protocol support'
               'ca-certificates: SSL CA certificates'
               'python2-dbus: for purple-remote and purple-url-handler'
@@ -81,7 +81,7 @@ package_libpurple(){
 
 package_finch(){
   pkgdesc="A ncurses-based messaging client"
-  depends=("libpurple=$pkgver-$pkgrel" 'python2' 'gstreamer0.10')
+  depends=("libpurple=$pkgver-$pkgrel" 'libx11' 'python2')
 
   cd "$srcdir/pidgin-$pkgver"
 
diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD
new file mode 100644
index 000000000..d0712b912
--- /dev/null
+++ b/extra/pigeonhole/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 172166 2012-11-30 14:16:14Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+# Contributorr: Peter Lewis <plewis@aur.archlinux.org>
+# Contributor: Sebastian Köhler <sebkoehler@whoami.org.uk>
+
+# This must be built against the version of dovecot being used,
+# else mail delivery will fail.
+# Specify the version of dovecot to be used here:
+_dcpkgver=2.1.12
+# Make sure to bump pkgrel if changing this.
+
+pkgname=pigeonhole
+pkgver=0.3.3
+pkgrel=3
+pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1"
+arch=('i686' 'x86_64')
+url="http://pigeonhole.dovecot.org/"
+license=('LGPL')
+depends=('dovecot='$_dcpkgver)
+conflicts=('dovecot-sieve' 'pigeonhole-hg')
+source=("http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-$pkgname-$pkgver.tar.gz"{,.sig}
+        "dovecot.conf")
+options=('!libtool')
+sha256sums=('1d581f6292c6e760b26a06193a0af266ba3b6f3a0431e6617fcf6e1c84f7dd0e'
+            '8604f9c52cff28506873cf4d0026c57ef73def5f05877126ea561774f1b8ffec'
+            'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858')
+
+build() {
+  cd "$srcdir/dovecot-2.1-$pkgname-$pkgver"
+
+  ./configure --prefix=/usr \
+    --with-dovecot=/usr/lib/dovecot \
+    --disable-static
+  make
+}
+
+package() {
+  cd "$srcdir/dovecot-2.1-$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+  install -m 644 -D "$srcdir/dovecot.conf" "$pkgdir/etc/ld.so.conf.d/dovecot.conf"
+}
diff --git a/extra/pigeonhole/dovecot.conf b/extra/pigeonhole/dovecot.conf
new file mode 100644
index 000000000..061a50c90
--- /dev/null
+++ b/extra/pigeonhole/dovecot.conf
@@ -0,0 +1 @@
+/usr/lib/dovecot
diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD
index 58782f157..0d5263c1e 100644
--- a/extra/pixman/PKGBUILD
+++ b/extra/pixman/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 162772 2012-06-30 07:29:52Z andyrtr $
+# $Id: PKGBUILD 170784 2012-11-11 10:23:18Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=pixman
-pkgver=0.26.2
+pkgver=0.28.0
 pkgrel=1
 pkgdesc="The pixel-manipulation library for X and cairo"
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +13,7 @@ license=('custom')
 depends=('glibc')
 options=('!libtool')
 source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('1daf014714cc29147726abada12359345d156705')
+sha1sums=('cfc7a18a8811bf4ff0890f547c315bda8097f6ad')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/plotutils/PKGBUILD b/extra/plotutils/PKGBUILD
index a9dd3a8d8..b2947f933 100644
--- a/extra/plotutils/PKGBUILD
+++ b/extra/plotutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 148880 2012-02-05 11:53:57Z ibiru $
+# $Id: PKGBUILD 171506 2012-11-18 08:51:56Z eric $
 # Maintainer: damir <damir@archlinux.org>
 # Packager: Maksim Sipos (maxsipos at gmail dot com)
 
 pkgname=plotutils
 pkgver=2.6
-pkgrel=2.1
+pkgrel=3
 arch=('x86_64' 'i686' 'mips64el')
 pkgdesc="Set of utilities and libraries for plotting."
 url="http://directory.fsf.org/graphics/plotutils.html"
@@ -12,9 +12,11 @@ license=("GPL")
 depends=("libpng" "gcc-libs" "libxaw>=1.0.5")
 options=('!libtool')
 install=plotutils.install
-source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz plotutils-2.6-libpng-1.5.patch)
+source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz{,.sig} 
+        plotutils-2.6-libpng-1.5.patch)
 sha1sums=('7921301d9dfe8991e3df2829bd733df6b2a70838'
-          '426f6ee04186af5059ab54322efaf0a6a976682b')
+          'ab78e2d06402aaac367da7a0e5810439d5b9853f'
+          '492f0e04f8265ab50d9ba0905a0f5adf3ec06ab8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/plotutils/plotutils-2.6-libpng-1.5.patch b/extra/plotutils/plotutils-2.6-libpng-1.5.patch
index b86d9f457..8a10d19e5 100644
--- a/extra/plotutils/plotutils-2.6-libpng-1.5.patch
+++ b/extra/plotutils/plotutils-2.6-libpng-1.5.patch
@@ -7,7 +7,7 @@ fix building with libpng-1.5
  
    /* cleanup after libpng errors (error handler does a longjmp) */
 -  if (setjmp (png_ptr->jmpbuf))
-+  if (png_jmpbuf (png_ptr))
++  if (setjmp (png_jmpbuf (png_ptr)))
      {
        png_destroy_write_struct (&png_ptr, (png_info **)NULL);
        return -1;
@@ -16,7 +16,7 @@ fix building with libpng-1.5
      }
  
 -  longjmp (png_ptr->jmpbuf, 1);
-+  longjmp (png_jmpbuf (png_ptr), 1);
++  png_longjmp (png_ptr, 1);
  }
  
  static void 
@@ -25,7 +25,7 @@ fix building with libpng-1.5
      }
  
 -  longjmp (png_ptr->jmpbuf, 1);
-+  longjmp (png_jmpbuf (png_ptr), 1);
++  png_longjmp (png_ptr, 1);
  }
  
  static void 
diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD
index e95a35d00..174dac9ae 100644
--- a/extra/polkit/PKGBUILD
+++ b/extra/polkit/PKGBUILD
@@ -1,26 +1,33 @@
-# $Id: PKGBUILD 158972 2012-05-13 21:06:37Z jgc $
+# $Id: PKGBUILD 169989 2012-10-30 23:00:46Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=polkit
-pkgver=0.105
-pkgrel=1
+pkgver=0.107
+pkgrel=4
 pkgdesc="Application development toolkit for controlling system-wide privileges"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://www.freedesktop.org/wiki/Software/PolicyKit"
-depends=('glib2' 'pam' 'expat')
+depends=('glib2' 'pam' 'expat' 'libsystemd' 'js')
 makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
 replaces=('policykit')
 options=('!libtool')
+install=polkit.install
 source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz
-        polkit.pam)
-md5sums=('9c29e1b6c214f0bd6f1d4ee303dfaed9'
-         '6564f95878297b954f0572bc1610dd15')
+        polkit.pam fix-empty-wheel.patch)
+md5sums=('0e4f9c53f43fd1b25ac3f0d2e09b2ae1'
+         '6564f95878297b954f0572bc1610dd15'
+         'c99ab2a7919ad0b69fde4804c043b07f')
 
 build() {
   cd $pkgname-$pkgver
+
+  # https://bugs.archlinux.org/task/31717
+  patch -Np1 -i ../fix-empty-wheel.patch
+
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
+      --with-systemdsystemunitdir=/usr/lib/systemd/system \
       --disable-static --enable-gtk-doc
   make
 }
@@ -29,5 +36,8 @@ package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
+  chown 102 "$pkgdir/etc/polkit-1/rules.d"
+  chown 102 "$pkgdir/usr/share/polkit-1/rules.d"
+
   install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1"
 }
diff --git a/extra/polkit/autogen.sh b/extra/polkit/autogen.sh
new file mode 100755
index 000000000..d08b00a49
--- /dev/null
+++ b/extra/polkit/autogen.sh
@@ -0,0 +1,123 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+DIE=0
+
+(test -f $srcdir/configure.ac) || {
+    echo -n "**Error**: Directory $srcdir does not look like the"
+    echo " top-level package directory"
+    exit 1
+}
+
+olddir=`pwd`
+cd "$srcdir"
+
+touch ChangeLog
+
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: You must have autoconf installed."
+  echo "Download the appropriate package for your distribution,"
+  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+  DIE=1
+}
+
+(grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null) && {
+  (libtoolize --version) < /dev/null > /dev/null 2>&1 || {
+    echo
+    echo "**Error**: You must have libtool installed."
+    echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
+    DIE=1
+  }
+}
+
+(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "You must have gtk-doc installed to compile $PROJECT."
+	echo "Install the appropriate package for your distribution,"
+	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
+	DIE=1
+}
+
+(automake --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: You must have automake installed."
+  echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
+  DIE=1
+  NO_AUTOMAKE=yes
+}
+
+
+# if no automake, don't bother testing for aclocal
+test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: Missing aclocal.  The version of automake"
+  echo "installed doesn't appear recent enough."
+  echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"
+  DIE=1
+}
+
+
+# if no automake, don't bother testing for autoreconf
+test -n "$NO_AUTOMAKE" || (autoreconf --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: You must have autoreconf installed."
+  echo "You can get autoreconf from ..."
+  DIE=1
+}
+
+
+if test "$DIE" -eq 1; then
+  exit 1
+fi
+
+if test -z "$*"; then
+  echo "**Warning**: I am going to run configure with no arguments."
+  echo "If you wish to pass any to it, please specify them on the"
+  echo $0 " command line."
+  echo
+fi
+
+case $CC in
+xlc )
+  am_opt=--include-deps;;
+esac
+
+      aclocalinclude="$ACLOCAL_FLAGS"
+
+      echo "Running autoreconf on test/mocklibc ..."
+      (cd "test/mocklibc"; autoreconf --install)
+
+      if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
+	if test -z "$NO_LIBTOOLIZE" ; then 
+	  echo "Running libtoolize..."
+	  libtoolize --force --copy
+	fi
+      fi
+      echo "Running aclocal $aclocalinclude ..."
+      aclocal $aclocalinclude
+      if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
+	echo "Running autoheader..."
+	autoheader
+      fi
+      echo "Running automake --gnu -Wno-portability $am_opt ..."
+      automake --add-missing --gnu -Wno-portability $am_opt
+      echo "Running autoconf ..."
+      autoconf
+
+intltoolize --copy --force --automake                  || exit 1
+
+cd "$olddir"
+
+conf_flags="--enable-maintainer-mode --enable-gtk-doc"
+
+if test x$NOCONFIGURE = x; then
+  echo "Running $srcdir/configure $conf_flags $@ ..."
+  $srcdir/configure $conf_flags "$@" \
+  && echo "Now type make to compile." || exit 1
+else
+  echo "Skipping configure process."
+fi
diff --git a/extra/polkit/fix-empty-wheel.patch b/extra/polkit/fix-empty-wheel.patch
new file mode 100644
index 000000000..d6f99c43d
--- /dev/null
+++ b/extra/polkit/fix-empty-wheel.patch
@@ -0,0 +1,47 @@
+From fa04223240d46641b0773dbf9f7d72f529046bea Mon Sep 17 00:00:00 2001
+From: David Zeuthen <zeuthen@gmail.com>
+Date: Tue, 18 Sep 2012 18:47:06 +0000
+Subject: Fall back to authenticating as uid 0 if the list of admin identities is empty
+
+For example, this can happen if the wheel group has no members. This
+was reported in Red Hat bug 834494, see
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=834494
+
+Signed-off-by: David Zeuthen <zeuthen@gmail.com>
+---
+diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c
+index 1d4a555..3bd2f0b 100644
+--- a/src/polkitbackend/polkitbackendinteractiveauthority.c
++++ b/src/polkitbackend/polkitbackendinteractiveauthority.c
+@@ -1293,15 +1293,11 @@ polkit_backend_interactive_authority_get_admin_identities (PolkitBackendInteract
+                                                            PolkitDetails                     *details)
+ {
+   PolkitBackendInteractiveAuthorityClass *klass;
+-  GList *ret;
++  GList *ret = NULL;
+ 
+   klass = POLKIT_BACKEND_INTERACTIVE_AUTHORITY_GET_CLASS (authority);
+ 
+-  if (klass->get_admin_identities == NULL)
+-    {
+-      ret = g_list_prepend (NULL, polkit_unix_user_new (0));
+-    }
+-  else
++  if (klass->get_admin_identities != NULL)
+     {
+       ret = klass->get_admin_identities (authority,
+                                          caller,
+@@ -2257,6 +2253,10 @@ authentication_agent_initiate_challenge (AuthenticationAgent         *agent,
+         }
+     }
+ 
++  /* Fall back to uid 0 if no users are available (rhbz #834494) */
++  if (user_identities == NULL)
++    user_identities = g_list_prepend (NULL, polkit_unix_user_new (0));
++
+   session = authentication_session_new (agent,
+                                         cookie,
+                                         subject,
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/polkit/polkit.install b/extra/polkit/polkit.install
new file mode 100644
index 000000000..fbb98919e
--- /dev/null
+++ b/extra/polkit/polkit.install
@@ -0,0 +1,18 @@
+post_install() {
+       getent group polkitd >/dev/null || groupadd -g 102 polkitd
+       getent passwd polkitd >/dev/null || useradd -c 'Policy Kit Daemon' -u 102 -g polkitd -d '/' -s /bin/false polkitd
+       passwd -l polkitd &>/dev/null
+}
+
+post_upgrade() {
+       post_install
+}
+
+post_remove() {
+       if getent passwd polkitd >/dev/null; then
+               userdel polkitd
+       fi
+       if getent group polkitd >/dev/null; then
+               groupdel polkitd
+       fi
+}
diff --git a/extra/portmidi/PKGBUILD b/extra/portmidi/PKGBUILD
new file mode 100644
index 000000000..ac16436ff
--- /dev/null
+++ b/extra/portmidi/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 170712 2012-11-10 01:03:47Z eric $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+# Contributor: Denis Martinez <deuns.martinez AT gmail DOT com>
+
+pkgname=portmidi
+pkgver=217
+pkgrel=3
+pkgdesc="Platform independent library for real-time MIDI input/output."
+arch=('i686' 'x86_64')
+url='http://portmedia.sourceforge.net/'
+license=('GPL')
+depends=('alsa-lib')
+makedepends=('cmake' 'java-environment')
+source=("http://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip"
+        'portmidi-217-build-fix.patch')
+md5sums=('03f46fd3947e2ef4c8c465baaf832241'
+         '59cb428b29a33bab3bb5811cda479a9b')
+
+build() {
+  cd "${srcdir}/${pkgname}"
+
+  sed -i "s#/usr/local#/usr#" */CMakeLists.txt pm_python/setup.py
+  mkdir -p pm_java/Release
+
+  # build fix for "pm_java/CMakeLists.txt" (fixes FS#27118)
+  patch -p1 -i ../portmidi-217-build-fix.patch
+
+  cmake . -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release \
+    -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release \
+    -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=Release
+
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
+
+  make DESTDIR="${pkgdir}" install
+
+  # Fix missing symlink for libporttime.so (FS#21528).
+  mv "${pkgdir}/usr/lib/libportmidi_s.a" "${pkgdir}/usr/lib/libportmidi.a"
+  ln -s "/usr/lib/libportmidi.so" "${pkgdir}/usr/lib/libporttime.so"
+  ln -s "/usr/lib/libportmidi.a" "${pkgdir}/usr/lib/libporttime.a"
+}
diff --git a/extra/portmidi/portmidi-217-build-fix.patch b/extra/portmidi/portmidi-217-build-fix.patch
new file mode 100644
index 000000000..3e2dfef29
--- /dev/null
+++ b/extra/portmidi/portmidi-217-build-fix.patch
@@ -0,0 +1,29 @@
+diff -rup portmidi.orig/pm_java/CMakeLists.txt portmidi/pm_java/CMakeLists.txt
+--- portmidi.orig/pm_java/CMakeLists.txt	2009-11-04 16:20:44.000000000 +0100
++++ portmidi/pm_java/CMakeLists.txt	2012-01-24 21:13:08.513182169 +0100
+@@ -15,13 +15,11 @@ if(UNIX)
+     add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class
+         COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java
+ 	MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java
+-	DEPENDS pmdefaults/PmDefaults.java
+-	WORKING_DIRECTORY pm_java)
++	DEPENDS pmdefaults/PmDefaults.java)
+     add_custom_command(OUTPUT pmdefaults/PmDefaults.class
+         COMMAND javac -classpath . pmdefaults/PmDefaults.java
+ 	MAIN_DEPENDENCY pmdefaults/PmDefaults.java
+-	DEPENDS pmdefaults/PmDefaultsFrame.java
+-	WORKING_DIRECTORY pm_java)
++	DEPENDS pmdefaults/PmDefaultsFrame.java)
+     add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
+         COMMAND	cp pmdefaults/portmusic_logo.png .
+         COMMAND	jar cmf pmdefaults/manifest.txt pmdefaults.jar
+@@ -31,8 +29,7 @@ if(UNIX)
+ 	COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+ 	COMMAND rm portmusic_logo.png
+ 	MAIN_DEPENDENCY pmdefaults/PmDefaults.class
+-	DEPENDS ${PMDEFAULTS_ALL_CLASSES}
+-	WORKING_DIRECTORY pm_java)
++	DEPENDS ${PMDEFAULTS_ALL_CLASSES})
+     add_custom_target(pmdefaults_target ALL 
+         DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar)
+     # message(STATUS "add_custom_target: pmdefaults.jar")
diff --git a/extra/psiconv/PKGBUILD b/extra/psiconv/PKGBUILD
index 65d14b940..a7053b1d3 100644
--- a/extra/psiconv/PKGBUILD
+++ b/extra/psiconv/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143959 2011-11-30 22:26:38Z giovanni $
+# $Id: PKGBUILD 169757 2012-10-27 23:42:19Z eric $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=psiconv
 pkgver=0.9.8
-pkgrel=9.1
+pkgrel=10
 pkgdesc="Converts Psion 5(MX) files to more commonly used file formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://software.frodo.looijaard.name/psiconv/"
@@ -17,7 +17,7 @@ source=("http://software.frodo.looijaard.name/${pkgname}/files/${pkgname}-${pkgv
 md5sums=('8d7548e3c6b9cd408544736133728acd')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --mandir=/usr/share/man
@@ -25,6 +25,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD
index 2f9dc9054..1ccea5f67 100644
--- a/extra/pstoedit/PKGBUILD
+++ b/extra/pstoedit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 137995 2011-09-13 21:30:18Z eric $
+# $Id: PKGBUILD 169758 2012-10-27 23:42:22Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tobias Powalowski <t.powa@gmx.de>
 
 pkgname=pstoedit
 pkgver=3.60
-pkgrel=2.1
+pkgrel=3
 pkgdesc="Translates PostScript and PDF graphics into other vector formats"
 arch=("i686" "x86_64" 'mips64el')
 url="http://www.pstoedit.net/"
diff --git a/extra/ptlib/PKGBUILD b/extra/ptlib/PKGBUILD
index a08fbf75e..b2897cf99 100644
--- a/extra/ptlib/PKGBUILD
+++ b/extra/ptlib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 163198 2012-07-09 00:03:09Z ibiru $
+# $Id: PKGBUILD 172101 2012-11-28 10:32:09Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=ptlib
-pkgver=2.10.5
+pkgver=2.10.9
 pkgrel=1
 pkgdesc="Portable Windows Library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,8 +11,8 @@ license=('GPL')
 depends=('sdl' 'libpulse' 'v4l-utils' 'libldap')
 replaces=('pwlib')
 conflicts=('pwlib')
-source=(http://downloads.sourceforge.net/sourceforge/opalvoip/$pkgname-$pkgver.tar.bz2)
-md5sums=('20e0bc3cc85affed55e1481bf96c8c6b')
+source=(http://ftp.gnome.org/pub/GNOME/sources/ptlib/${pkgver%.*}/ptlib-$pkgver.tar.xz)
+sha256sums=('d948e326ce238880ce9b52f9f0cd76a4897618e17cc08a347e4a713f36a575fe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -22,7 +22,7 @@ build() {
       --enable-oss --enable-v4l2 \
       --disable-avc --enable-sdl \
       --enable-ipv6 --enable-v4l \
-      --enable-dc --disable-odbc \
+      --disable-dc --disable-odbc \
       --enable-expat --enable-httpforms
   make
 }
@@ -31,4 +31,3 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('a5a571457ff3a398995b34f66d6c3cbb')
diff --git a/extra/pycurl/PKGBUILD b/extra/pycurl/PKGBUILD
index ee7b516cf..c385381fd 100644
--- a/extra/pycurl/PKGBUILD
+++ b/extra/pycurl/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=pycurl
 pkgname=('python2-pycurl')
 pkgver=7.19.0
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pycurl.sourceforge.net/"
 license=('GPL')
 makedepends=('python2' 'curl')
diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD
index 48c5691d2..3a1f1c750 100644
--- a/extra/pygobject/PKGBUILD
+++ b/extra/pygobject/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 169002 2012-10-17 10:19:46Z allan $
+# $Id: PKGBUILD 170844 2012-11-12 15:18:06Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=pygobject
 pkgname=(python-gobject python2-gobject pygobject-devel)
-pkgver=3.2.2
-pkgrel=2
+pkgver=3.4.2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="https://live.gnome.org/PyGObject"
 license=('LGPL')
 makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz)
 options=('!libtool')
-sha256sums=('4653790baaff0176fd814b88cfb5378c45906a120b25d01be2554f423b726eb0')
+sha256sums=('2b87ef3170be3a20a53fbdb348ae4ecb41a72a17ec6531baa67147c3437d2aad')
 
 build() {
   cp -a "$pkgbase-$pkgver" python2-build
diff --git a/extra/pypgsql/COPYING b/extra/pypgsql/COPYING
deleted file mode 100644
index c13985414..000000000
--- a/extra/pypgsql/COPYING
+++ /dev/null
@@ -1,20 +0,0 @@
-    pyPgSQL, version 2.5
-    A Python DB-API 2.0 compliant interface for PostgreSQL
-    Copyright 2000 by Billy G. Allie.
-    All rights reserved.
-
-    Permission to use, copy, modify, and distribute this software and it's
-    documentation for any purpose and without fee is hereby granted,
-    provided that the above copyright notice appear in all copies and that
-    both that copyright notice and this permission notice appear in
-    supporting documentation, and that the copyright owner's name not be
-    used in advertising or publicity pertaining to distribution of the
-    software without specific, written prior permission.
-
-    THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-    INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN
-    NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-    CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-    USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-    OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
diff --git a/extra/pypgsql/PKGBUILD b/extra/pypgsql/PKGBUILD
deleted file mode 100644
index 374b2d6aa..000000000
--- a/extra/pypgsql/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 151045 2012-02-24 14:28:44Z pierre $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-pkgname=pypgsql
-pkgver=2.5.1
-pkgrel=8
-pkgdesc="A python client library for postgresql"
-arch=('i686' 'x86_64' 'mips64el')
-license=('custom')
-url="http://pypgsql.sourceforge.net/"
-depends=('python-egenix-mx-base' 'postgresql-libs')
-source=("http://downloads.sourceforge.net/${pkgname}/pyPgSQL-${pkgver}.tar.gz"
-        'COPYING')
-md5sums=('82670f6f1652aa4766fdaec2cb43debd'
-         '235c239b51a8b8e6b53c414ef71d7612')
-
-package() {
-  cd ${srcdir}/pyPgSQL-${pkgver}
-  python2 setup.py install --root=${pkgdir}
-
-  # install custom license
-  install -Dm644 $srcdir/COPYING \
-    $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
diff --git a/extra/python-imaging/PKGBUILD b/extra/python-imaging/PKGBUILD
deleted file mode 100644
index e4cd1b9ae..000000000
--- a/extra/python-imaging/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 144447 2011-12-05 21:28:19Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: simo <simo@archlinux.org>
-
-pkgname=python-imaging
-pkgver=1.1.7
-pkgrel=4.1
-pkgdesc="PIL. Provides image processing capabilities for python"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.pythonware.com/products/pil/index.htm"
-license=('custom:"pil"')
-depends=('python2' 'libjpeg' 'freetype2' 'lcms') 
-makedepends=('tk' 'sane')
-optdepends=('tk' 'sane')
-provides=("pil=${pkgver}")
-conflicts=('pil')
-replaces=('pil')
-source=(http://effbot.org/downloads/Imaging-${pkgver}.tar.gz)
-md5sums=('fc14a54e1ce02a0225be8854bfba478e')
-
-build() {
-  cd "${srcdir}"/Imaging-${pkgver}
-  python2 setup.py build_ext
-  cd Sane
-  python2 setup.py build_ext
-}
-
-package() {
-  cd "${srcdir}"/Imaging-${pkgver}
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  
-  pushd Sane
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  popd
-  
-  install -dm755 "${pkgdir}"/usr/include/python2.7/
-  install -m644 -t "${pkgdir}"/usr/include/python2.7/ libImaging/*.h 
-
-  # do not have files ending in .py in /usr/bin
-  for f in pildriver pilprint pilconvert pilfile pilfont; do
-    mv "${pkgdir}"/usr/bin/${f}{.py,}
-  done
-
-  # Install license
-  install -Dm644 "${srcdir}"/Imaging-${pkgver}/README \
-                 "${pkgdir}"/usr/share/licenses/${pkgname}/README
-}
diff --git a/extra/python-pycurl/PKGBUILD b/extra/python-pycurl/PKGBUILD
deleted file mode 100644
index 2562d35f1..000000000
--- a/extra/python-pycurl/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 150558 2012-02-18 14:39:59Z pierre $
-# Maintainer:
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
-
-pkgname=python-pycurl
-pkgver=7.19.0
-pkgrel=6
-pkgdesc="A Python interface to libcurl"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://pycurl.sourceforge.net"
-license=('GPL')
-depends=('python2' 'curl')
-replaces=('pycurl')
-provides=('pycurl')
-source=("http://pycurl.sourceforge.net/download/pycurl-${pkgver}.tar.gz")
-md5sums=('919d58fe37e69fe87ce4534d8b6a1c7b')
-
-package() {
-  cd "${srcdir}"/pycurl-${pkgver}
-  python2 setup.py install --curl-config=/usr/bin/curl-config --prefix ${pkgdir}/usr
-}
diff --git a/extra/qalculate-kde/PKGBUILD b/extra/qalculate-kde/PKGBUILD
index b7d5d8b96..7f88109ff 100644
--- a/extra/qalculate-kde/PKGBUILD
+++ b/extra/qalculate-kde/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=qalculate-kde
 pkgver=0.9.7
 pkgrel=3
 pkgdesc="KDE frontend for libqalculate"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://qalculate.sourceforge.net/"
 license=('GPL')
 depends=('libqalculate' 'kdelibs3' 'cln')
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index adef636f2..8cd545d66 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 166385 2012-09-07 12:55:19Z tpowa $
+# $Id: PKGBUILD 172024 2012-11-26 16:12:59Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=('i686' 'x86_64' 'mips64el')
@@ -42,8 +42,5 @@ package() {
     done
 
 }
-md5sums=('78eb1e984f4532aa9f2bdd3c127b5b61'
-         'b316a066d2f1bb57d8f5b7ea1d0d1caf'
-         '8687179e77ab954c4a43017d030f7349')
-md5sums=('78eb1e984f4532aa9f2bdd3c127b5b61'
+md5sums=('189bc5b87281a72f8c72a0f7ebaa6d00'
          'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/extra/qhull/PKGBUILD b/extra/qhull/PKGBUILD
index 5c4c333a1..a8da5462e 100644
--- a/extra/qhull/PKGBUILD
+++ b/extra/qhull/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150554 2012-02-18 13:03:41Z pierre $
+# $Id: PKGBUILD 171913 2012-11-23 13:37:18Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Jason Taylor <jftaylor21@gmail.com>
@@ -6,32 +6,35 @@
 
 pkgname=qhull
 pkgver=2012.1
-pkgrel=1.1
+pkgrel=2
 pkgdesc="A general dimension code for computing convex hulls and related structures"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.qhull.org/"
 license=('custom')
 depends=('gcc-libs')
 makedepends=('cmake')
-source=("http://www.qhull.org/download/$pkgname-$pkgver-src.tgz")
 options=('!libtool')
+source=("http://www.qhull.org/download/$pkgname-$pkgver-src.tgz")
 md5sums=('d0f978c0d8dfb2e919caefa56ea2953c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  if [ "${CARCH}" != "i686" ]; then
+    EXTRAOPTS="-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC"
+  fi
+
   mkdir srcbuild
   cd srcbuild
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DDOC_INSTALL_DIR=/usr/share/doc \
-    -DMAN_INSTALL_DIR=/usr/share/man/man1 -DLIB_INSTALL_DIR=/usr/lib ..
+  cmake -DCMAKE_INSTALL_PREFIX=/usr $EXTRAOPTS ..
   make
 }
 
 package() { 
   cd "$srcdir/$pkgname-$pkgver/srcbuild"
 
-  make DESTDIR=$pkgdir install
+  make DESTDIR="$pkgdir" install
 
   # Install license
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/license.txt"
+  install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING.txt" "$pkgdir/usr/share/licenses/$pkgname/license.txt"
 }
diff --git a/extra/qjson/PKGBUILD b/extra/qjson/PKGBUILD
index eb1633e8e..9c5c987cc 100644
--- a/extra/qjson/PKGBUILD
+++ b/extra/qjson/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 145864 2012-01-03 12:44:42Z andrea $
+# $Id: PKGBUILD 172063 2012-11-27 13:49:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qjson
-pkgver=0.7.1
-pkgrel=2
+pkgver=0.8.1
+pkgrel=1
 pkgdesc="A qt-based library that maps JSON data to QVariant objects"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://qjson.sourceforge.net"
 depends=('qt')
 makedepends=('cmake')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('5a833ad606c164ed8aa69f0873366ace')
+source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/flavio/${pkgname}/archive/${pkgver}.tar.gz")
+md5sums=('4eef13da988edf8f91c260a3e1baeea9')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
-  cmake ../${pkgname} \
+  cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release
   make
 }
 
 package() {
-  cd "${srcdir}/build"
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/qpdf/PKGBUILD b/extra/qpdf/PKGBUILD
index 6ba997c51..abde6eacb 100644
--- a/extra/qpdf/PKGBUILD
+++ b/extra/qpdf/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=qpdf
 pkgver=3.0.2
 pkgrel=1
 pkgdesc="QPDF: A Content-Preserving PDF Transformation System"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qpdf.sourceforge.net/"
 license=('custom:Artistic-2.0')
 depends=('pcre' 'perl')
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index 111fad187..821676247 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 167191 2012-09-27 12:38:07Z andrea $
+# $Id: PKGBUILD 172171 2012-11-30 15:30:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
-pkgver=4.8.3
-pkgrel=4
+pkgver=4.8.4
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
@@ -20,23 +20,19 @@ source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop'
         'qtconfig.desktop'
         'improve-cups-support.patch'
-        'fix-crash-in-assistant.patch'
-        'undo-fix-jit-crash-on-x86_64.patch'
 	'declarative-fix-sigbus.patch'
-        'disable-ssl-compression.patch')
-md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b'
-         'fc211414130ab2764132e7370f8e5caa'
-         '85179f5e0437514f8639957e1d8baf62'
-         'f11852b97583610f3dbb669ebc3e21bc'
-         '6b771c8a81dd90b45e8a79afa0e5bbfd'
+        'fix-crash-in-assistant.patch')
+md5sums=('89c5ecba180cae74c66260ac732dc5cb'
+         'f1837a03fd0ebbd2da58975845f278e3'
+         '480fea1ed076992b688373c8db274be0'
+         '5595c24d5bb942c21e3a4d299e6d0bf1'
+         '824a3b77a25e98567f640e0441ccdebc'
          'c439c7731c25387352d8453ca7574971'
-         '57590084078b6379f0501f7728b02ae2'
-         '094e5a4e30e52423c77daa4a9c782df5'
-	 'aac963d05a9d5733e2bfce9e26607f51' 
-         '94e9e433342018bf35e8d6d968b7432c')
+         'aac963d05a9d5733e2bfce9e26607f51'
+         '57590084078b6379f0501f7728b02ae2')
 
 build() {
-  cd "${srcdir}"/${_pkgfqn}
+  cd ${_pkgfqn}
 
   # MIPS N32-specific fix, shouldn't affect correctness on other platforms.
   patch -Np1 -i "${srcdir}/declarative-fix-sigbus.patch"
@@ -47,12 +43,6 @@ build() {
   # (FS#29469)
   patch -p1 -i "${srcdir}"/fix-crash-in-assistant.patch
 
-  # (FS#31654)
-  patch -Rp1 -i "${srcdir}"/undo-fix-jit-crash-on-x86_64.patch
-
-  # Security fix
-  patch -p1 -i "${srcdir}"/disable-ssl-compression.patch
-  
   export QT4DIR="${srcdir}"/${_pkgfqn}
   export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
 
@@ -105,10 +95,11 @@ package_qt() {
     [ "$CARCH" != "mips64el" ] && optdepends+=('libfbclient: Firebird/iBase driver')
     optdepends+=('libxinerama: Xinerama support'
                 'libxcursor: Xcursor support'
-                'libxfixes: Xfixes support')
+                'libxfixes: Xfixes support'
+                'icu: Unicode support')
     install='qt.install'
 
-    cd "${srcdir}"/${_pkgfqn}
+    cd ${_pkgfqn}
     make INSTALL_ROOT="${pkgdir}" install
 
     # install missing icons and desktop files
@@ -148,11 +139,11 @@ package_qt-private-headers(){
     install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script}
     
     for i in QtCore QtDeclarative QtGui QtScript; do
-      cp -r "${srcdir}"/${_pkgfqn}/include/${i}/private/ \
+      cp -r ${_pkgfqn}/include/${i}/private/ \
         "${pkgdir}"/usr/include/${i}/
     done
 
     for i in corelib declarative gui script; do
-      cp -r "${srcdir}"/${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/
+      cp -r ${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/
     done
 }
diff --git a/extra/qt/assistant.desktop b/extra/qt/assistant.desktop
index a9e98c44b..37ff84b44 100644
--- a/extra/qt/assistant.desktop
+++ b/extra/qt/assistant.desktop
@@ -4,6 +4,5 @@ Comment=Shows Qt documentation and examples
 Exec=/usr/bin/assistant
 Icon=assistant
 Terminal=false
-Encoding=UTF-8
 Type=Application
 Categories=Qt;Development;Documentation;
diff --git a/extra/qt/designer.desktop b/extra/qt/designer.desktop
index 9b7b6e9aa..f0b381d02 100644
--- a/extra/qt/designer.desktop
+++ b/extra/qt/designer.desktop
@@ -6,6 +6,5 @@ Exec=/usr/bin/designer
 Icon=designer
 MimeType=application/x-designer;
 Terminal=false
-Encoding=UTF-8
 Type=Application
 Categories=Qt;Development;
diff --git a/extra/qt/fix-qtscript-crash.patch b/extra/qt/fix-qtscript-crash.patch
new file mode 100644
index 000000000..97b1cc62d
--- /dev/null
+++ b/extra/qt/fix-qtscript-crash.patch
@@ -0,0 +1,34 @@
+From e6b7178bc2e62a37b4737695bced1b46bced9215 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= <jedrzej.nowacki@digia.com>
+Date: Mon, 22 Oct 2012 15:17:19 +0200
+Subject: [PATCH] Fix mmap usage.
+
+Add missing MAP_NORESERVE and fix error checking.
+
+Special thanks to Olivier JG for debugging the issue.
+
+Task-number: QTBUG-27322
+Change-Id: Ia9f4aa80415f0127318714912b524131a5b0f18a
+Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
+---
+ .../JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp             | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
+index 16d0fb1..e1237e4 100644
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
+@@ -305,8 +305,8 @@ public:
+         randomLocation += (1 << 24);
+         randomLocation <<= 21;
+ #endif
+-        m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0);
+-        if (!m_base)
++        m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0);
++        if (m_base == MAP_FAILED)
+             CRASH();
+ 
+         // For simplicity, we keep all memory in m_freeList in a 'released' state.
+-- 
+1.8.0
+
diff --git a/extra/qt/linguist.desktop b/extra/qt/linguist.desktop
index 8cbe86599..3b203e0bd 100644
--- a/extra/qt/linguist.desktop
+++ b/extra/qt/linguist.desktop
@@ -5,6 +5,5 @@ Exec=/usr/bin/linguist
 Icon=linguist
 MimeType=text/vnd.trolltech.linguist;application/x-linguist;
 Terminal=false
-Encoding=UTF-8
 Type=Application
 Categories=Qt;Development;
diff --git a/extra/qt/qsortfilterproxymodel.patch b/extra/qt/qsortfilterproxymodel.patch
new file mode 100644
index 000000000..33770e47d
--- /dev/null
+++ b/extra/qt/qsortfilterproxymodel.patch
@@ -0,0 +1,63 @@
+From 989e6c5ee6f3e38b24632ec5caf49c5b03d17aed Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <stephen.kelly@kdab.com>
+Date: Fri, 14 Sep 2012 15:42:34 +0200
+Subject: [PATCH] Fix crash when invalidating a QSortFilterProxyModel
+
+Backport of d7a15fbfd93fb566c7793596ea50d8786b9eb654 from qtbase.
+
+Task-number: QTBUG-27122
+Change-Id: I0b1eda292fd9648e6f08629f7a069b66bb8b59e8
+Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
+---
+ src/gui/itemviews/qsortfilterproxymodel.cpp        | 28 +++++++---
+ .../tst_qsortfilterproxymodel.cpp                  | 61 ++++++++++++++++++++++
+ 2 files changed, 83 insertions(+), 6 deletions(-)
+
+diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp
+index d937b63..9fe224e 100644
+--- a/src/gui/itemviews/qsortfilterproxymodel.cpp
++++ b/src/gui/itemviews/qsortfilterproxymodel.cpp
+@@ -1036,18 +1036,34 @@ void QSortFilterProxyModelPrivate::filter_changed(const QModelIndex &source_pare
+     Mapping *m = it.value();
+     QSet<int> rows_removed = handle_filter_changed(m->proxy_rows, m->source_rows, source_parent, Qt::Vertical);
+     QSet<int> columns_removed = handle_filter_changed(m->proxy_columns, m->source_columns, source_parent, Qt::Horizontal);
+-    QVector<QModelIndex> mappedChildren = m->mapped_children;
+-    QVector<QModelIndex>::iterator it2 = mappedChildren.end();
+-    while (it2 != mappedChildren.begin()) {
+-        --it2;
+-        const QModelIndex source_child_index = *it2;
++
++    // We need to iterate over a copy of m->mapped_children because otherwise it may be changed by other code, invalidating
++    // the iterator it2.
++    // The m->mapped_children vector can be appended to with indexes which are no longer filtered
++    // out (in create_mapping) when this function recurses for child indexes.
++    const QVector<QModelIndex> mappedChildren = m->mapped_children;
++    QVector<int> indexesToRemove;
++    for (int i = 0; i < mappedChildren.size(); ++i) {
++        const QModelIndex source_child_index = mappedChildren.at(i);
+         if (rows_removed.contains(source_child_index.row()) || columns_removed.contains(source_child_index.column())) {
+-            it2 = mappedChildren.erase(it2);
++            indexesToRemove.push_back(i);
+             remove_from_mapping(source_child_index);
+         } else {
+             filter_changed(source_child_index);
+         }
+     }
++    QVector<int>::const_iterator removeIt = indexesToRemove.constEnd();
++    const QVector<int>::const_iterator removeBegin = indexesToRemove.constBegin();
++
++    // We can't just remove these items from mappedChildren while iterating above and then
++    // do something like m->mapped_children = mappedChildren, because mapped_children might
++    // be appended to in create_mapping, and we would lose those new items.
++    // Because they are always appended in create_mapping, we can still remove them by
++    // position here.
++    while (removeIt != removeBegin) {
++        --removeIt;
++        m->mapped_children.remove(*removeIt);
++    }
+ }
+ 
+ /*!
+-- 
+1.8.0
+
diff --git a/extra/qt/qtconfig.desktop b/extra/qt/qtconfig.desktop
index 46dcf9e3d..95770ff6a 100644
--- a/extra/qt/qtconfig.desktop
+++ b/extra/qt/qtconfig.desktop
@@ -4,7 +4,6 @@ Comment=Configure Qt behavior, styles, fonts
 Exec=/usr/bin/qtconfig
 Icon=qtlogo
 Terminal=false
-Encoding=UTF-8
 Type=Application
 Categories=Qt;Settings;
 NoDisplay=true
diff --git a/extra/qwt/PKGBUILD b/extra/qwt/PKGBUILD
index 9f465e8fc..f55a910f8 100644
--- a/extra/qwt/PKGBUILD
+++ b/extra/qwt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 149627 2012-02-08 20:47:17Z pierre $
+# $Id: PKGBUILD 171291 2012-11-17 00:59:56Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=qwt
 pkgver=6.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Qt Widgets for Technical Applications"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://qwt.sourceforge.net/"
@@ -32,6 +32,11 @@ package() {
 
   make INSTALL_ROOT=${pkgdir} QTDIR=/usr install
 
+  # install web designer plugin
+  install -d ${pkgdir}/usr/lib/qt/plugins/designer/
+  install -Dm755 designer/plugins/designer/libqwt_designer_plugin.so \
+    ${pkgdir}/usr/lib/qt/plugins/designer/
+
   # Move man files to proper directory.
 #  install -d ${pkgdir}/usr/share/man/man3
 #  mv -f ${pkgdir}/usr/share/doc/qwt/man/man3/* ${pkgdir}/usr/share/man/man3
diff --git a/extra/qwtplot3d/PKGBUILD b/extra/qwtplot3d/PKGBUILD
index 5d9fd6df2..b51d260b8 100644
--- a/extra/qwtplot3d/PKGBUILD
+++ b/extra/qwtplot3d/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 147208 2012-01-24 18:38:05Z ronald $
+# $Id: PKGBUILD 171261 2012-11-16 23:35:36Z allan $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=qwtplot3d
 pkgver=0.2.7
-pkgrel=4
+pkgrel=5
 pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets"
 arch=("i686" "x86_64" 'mips64el')
 license=('custom:zlib')
 url="http://qwtplot3d.sourceforge.net/"
-depends=('qt' 'qwt' 'mesa')
+depends=('qt' 'qwt')
+makedepends=('mesa' 'glu')
 source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz"
         qwtplot3d-gcc44.patch qwtplot3d-qt-4.8.0.patch)
 sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea'
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index ac3dafa31..1550da603 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 162770 2012-06-30 07:08:33Z ronald $
+# $Id: PKGBUILD 172476 2012-12-03 18:59:33Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: K. Piche <kpiche@rogers.com>
 
 pkgname=r
-pkgver=2.15.1
-pkgrel=2
+pkgver=2.15.2
+pkgrel=1
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -22,7 +22,7 @@ source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
 	'r.png'
 	'R.conf')
 install=r.install
-sha1sums=('f0e6912be6dfc0d1fdc4be66048304d8befe8424'
+sha1sums=('c80da687d66ee88d1e34fc1ae5c1bd525f9513dd'
           '13aa29219bcaa102e575de8c1c8e0833d233e836'
           'a69a07ec363440efc18ce0a7f2af103375dea978'
           '43668da6cfd1b4455a99f23e79e2059294dddac9')
diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD
index 45f67c278..2c9ccd486 100644
--- a/extra/racket/PKGBUILD
+++ b/extra/racket/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 164993 2012-08-08 04:47:49Z eric $
+# $Id: PKGBUILD 170577 2012-11-09 03:34:54Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=racket
-pkgver=5.3
+pkgver=5.3.1
 pkgrel=1
 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,13 +14,12 @@ options=('!libtool' '!strip')
 install=racket.install
 source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \
         drracket.desktop)
-sha1sums=('16883898c0cc418ba44732e3f62a54cf043a1de8'
+sha1sums=('5aa74a2eafd44a521c27c34f4b4264670f1bf571'
           'a20808f6b250225704856f82a544681a962a299d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/src"
   [ "$CARCH" == "x86_64" ] && export CFLAGS+="-fPIC"
-  sed -i 's/struct siginfo/siginfo_t/' racket/gc2/sighand.c
   ./configure --prefix=/usr --enable-shared
   make
 }
diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD
index 8578b9794..a57a39c55 100644
--- a/extra/raptor/PKGBUILD
+++ b/extra/raptor/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162675 2012-06-27 20:59:49Z tomegun $
+# $Id: PKGBUILD 171519 2012-11-18 10:28:05Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: eric <eric@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=raptor
 pkgver=2.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://librdf.org/raptor"
diff --git a/extra/raptor1/PKGBUILD b/extra/raptor1/PKGBUILD
deleted file mode 100644
index 085809cc9..000000000
--- a/extra/raptor1/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 144014 2011-12-01 20:20:30Z andrea $
-# Maintainer:
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: eric <eric@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=raptor1
-pkgver=1.4.21
-pkgrel=4
-pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples - old V1 api for compatibility"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://librdf.org/raptor"
-depends=('curl' 'libxslt')
-license=('LGPL')
-options=('!libtool' '!docs')
-source=("http://librdf.org/dist/source/raptor-$pkgver.tar.gz"
-        'curl.patch')
-md5sums=('992061488af7a9e2d933df6b694bb876'
-         '8fe28761645d6a6607b25c94f9ada964')
-
-build() {
-  cd "${srcdir}"/raptor-${pkgver}
-  patch -p1 -i "${srcdir}"/curl.patch
-
-  ./configure --prefix=/usr \
-    --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/raptor-${pkgver}"
-  make prefix="${pkgdir}"/usr install
-  
-  mv "${pkgdir}"/usr/bin/rapper "${pkgdir}"/usr/bin/rapperV1
-  rm -f "${pkgdir}"/usr/share/man/man1/rapper.1
-}
diff --git a/extra/raptor1/curl.patch b/extra/raptor1/curl.patch
deleted file mode 100644
index 590140536..000000000
--- a/extra/raptor1/curl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up raptor-1.4.21/src/raptor_internal.h.curl raptor-1.4.21/src/raptor_internal.h
---- raptor-1.4.21/src/raptor_internal.h.curl	2010-01-29 17:54:42.000000000 -0600
-+++ raptor-1.4.21/src/raptor_internal.h	2011-07-31 11:02:44.182465296 -0500
-@@ -852,7 +852,6 @@ int raptor_utf8_is_nfc(const unsigned ch
- 
- #ifdef RAPTOR_WWW_LIBCURL
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #endif
- 
diff --git a/extra/rest/PKGBUILD b/extra/rest/PKGBUILD
index bb2aa2639..0667874d2 100644
--- a/extra/rest/PKGBUILD
+++ b/extra/rest/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142505 2011-11-10 20:16:20Z ibiru $
+# $Id: PKGBUILD 169985 2012-10-30 23:00:29Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=rest
-pkgver=0.7.12
-pkgrel=1.1
+pkgver=0.7.90
+pkgrel=1
 pkgdesc="A helper library for RESTful services."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
@@ -12,7 +12,7 @@ depends=('glib2' 'libxml2' 'libsoup-gnome')
 makedepends=('gobject-introspection')
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('16ffa4929078dabfcfac31f9ce942072ebab67e3339ce9f378127457b03baf3a')
+sha256sums=('1d682acaac4d946cc7c98a2dd9d65a8c83a6fdb8ca6759e70b8b5042fe66c022')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/rhythmbox/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch b/extra/rhythmbox/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch
new file mode 100644
index 000000000..dc3f3429a
--- /dev/null
+++ b/extra/rhythmbox/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch
@@ -0,0 +1,37 @@
+From a8f5d8cec87ef1586897e94e49bdf54db64bf97b Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember@gmail.com>
+Date: Thu, 11 Oct 2012 10:59:16 +0200
+Subject: [PATCH] Disable the context pane plugin when webkit isn't available
+
+---
+ plugins/Makefile.am | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index e4f6e69..3a9ea03 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -14,7 +14,6 @@ SUBDIRS =						\
+ if ENABLE_PYTHON
+ SUBDIRS +=						\
+ 	artsearch					\
+-	context						\
+ 	im-status					\
+ 	lyrics						\
+ 	magnatune					\
+@@ -24,8 +23,12 @@ SUBDIRS +=						\
+ 	sendto						\
+ 	rb
+ 
++if WITH_WEBKIT
++SUBDIRS += context
+ endif
+ 
++endif # ENABLE_PYTHON
++
+ if WITH_LIRC
+ SUBDIRS += lirc
+ endif
+-- 
+1.7.12.1
+
diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD
index 40647db10..4a7101d97 100644
--- a/extra/rhythmbox/PKGBUILD
+++ b/extra/rhythmbox/PKGBUILD
@@ -1,42 +1,55 @@
-# $Id: PKGBUILD 164369 2012-07-31 19:43:21Z eric $
+# $Id: PKGBUILD 171480 2012-11-18 00:28:26Z eric $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rhythmbox
-pkgver=2.97
-pkgrel=2
+pkgver=2.98
+pkgrel=4
 pkgdesc="An iTunes-like music playback and management application"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.rhythmbox.org"
-depends=('clutter' 'clutter-gtk' 'clutter-gst' 'dconf' 'desktop-file-utils' 'grilo'
-         'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib'
-         'libdmapsharing' 'libgpod' 'libmtp' 'libmusicbrainz4' 'libnotify' 'libpeas' 'libwebkit3'
-         'media-player-info' 'mx' 'python2-gobject' 'python2-mako' 'totem-plparser'
-         'tdb' 'libdiscid')
-[ "$CARCH" != "mips64el" ] && depends+=('lirc-utils')
-makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection' 'vala')
+depends=('dconf' 'desktop-file-utils' 'gstreamer0.10-base-plugins' 
+         'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib'
+         'libnotify' 'libpeas' 'media-player-info' 'python2-gobject' 
+         'totem-plparser' 'tdb')
+makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection' 
+             'vala' 'gnome-common' 'gtk-doc' 'grilo' 'libdmapsharing' 'lirc-utils' 
+             'libgpod' 'libmtp')
 optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
             'gstreamer0.10-bad-plugins: Extra media codecs'
             'gstreamer0.10-ffmpeg: Extra media codecs'
-            'brasero: cd burning')
+            'brasero: Audio CD Recorder plugin'
+            'libdmapsharing: DAAP Music Sharing plugin'
+            'grilo-plugins: Grilo media browser plugin'
+            'lirc-utils: LIRC plugin'
+            'libgpod: Portable Players - iPod plugin'
+            'libmtp: Portable Players - MTP plugin'
+            'zeitgeist: Zeitgeist plugin')
 options=('!libtool' '!emptydirs')
 install=rhythmbox.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
-sha256sums=('b52567cf45bf13c0452593da7f907920bd4cf31916ca8dcd15d555336b4947e4')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz
+	Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch
+	rhythmbox-2.98-xinitthreads.patch)
+sha256sums=('a5c0a18a7c76133d36c7dcbdc37e304eae8272703985b17b540d68603b0c76d5'
+            '6510214e7fe0a18d17d8c599ae065bd48c2e1f82931fe82e3d1cc684a0801cd6'
+            'cd9af451a411e5a621c385d43f5ddd3664b3d085fc12dc7d5e5cd1f5db9e73b0')
 
 build() {
   cd "$pkgname-$pkgver"
+  patch -Np1 -i "${srcdir}/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch"
+  patch -Np1 -i "${srcdir}/rhythmbox-2.98-xinitthreads.patch"
+  autoreconf -fi
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/rhythmbox \
       --localstatedir=/var --disable-static \
-      --enable-daap --enable-python --enable-musicbrainz \
-      --with-mdns=avahi --disable-scrollkeeper
+      --enable-daap --enable-python --enable-vala \
+      --with-mdns=avahi --disable-scrollkeeper --without-webkit
   make
 }
 
 package() {
   cd "$pkgname-$pkgver"
-
   make DESTDIR="$pkgdir" install
+  rm -r "$pkgdir/usr/lib/rhythmbox/sample-plugins"
 }
diff --git a/extra/rhythmbox/rhythmbox-2.98-xinitthreads.patch b/extra/rhythmbox/rhythmbox-2.98-xinitthreads.patch
new file mode 100644
index 000000000..6a6426038
--- /dev/null
+++ b/extra/rhythmbox/rhythmbox-2.98-xinitthreads.patch
@@ -0,0 +1,76 @@
+From 1780aab638aa39704be34fc214de39b4847a87b2 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 17 Oct 2012 19:02:50 +0200
+Subject: [PATCH] shell: Call XInitThreads() on X11 systems
+
+Otherwise bad things can happen with some plugins that expect
+mutexes to work, like the visualiser plugin and Clutter.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686320
+---
+ configure.ac | 15 +++++++++++++++
+ shell/main.c | 12 ++++++++++++
+ 2 files changed, 27 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 009c838..8a88d72 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -86,10 +86,25 @@ PKG_PROG_PKG_CONFIG
+ 
+ PKG_CHECK_MODULES(RB_CLIENT, glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS gio-unix-2.0 >= $GLIB_REQS)
+ 
++dnl Always require libX11 for XInitThreads() on X11 systems
++X11_PKG=""
++gdk_targets=`$PKG_CONFIG --variable targets gdk-3.0`
++for target in $gdk_targets; do
++	case "$target" in
++		x11)
++			X11_PKG=x11
++			break
++			;;
++		*)
++			;;
++	esac
++done
++
+ dnl  note: gio-unix-2.0 is here for libmediaplayerid
+ PKG_CHECK_MODULES(RHYTHMBOX,				\
+ 		  gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQS \
+ 		  gtk+-3.0 >= $GTK_REQS			\
++		  $X11_PKG				\
+ 		  gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQS	\
+ 		  glib-2.0 >= $GLIB_REQS		\
+ 		  gio-2.0 >= $GLIB_REQS			\
+diff --git a/shell/main.c b/shell/main.c
+index 3c0346d..696f3e9 100644
+--- a/shell/main.c
++++ b/shell/main.c
+@@ -34,6 +34,11 @@
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ 
++#ifdef GDK_WINDOWING_X11
++/* X11 headers */
++#include <X11/Xlib.h>
++#endif
++
+ #include <girepository.h>
+ 
+ #include "rb-shell.h"
+@@ -51,6 +56,13 @@ main (int argc, char **argv)
+ 	int new_argc;
+ 	char **new_argv;
+ 
++#ifdef GDK_WINDOWING_X11
++	if (XInitThreads () == 0) {
++		g_critical ("Initialising threading support failed.");
++		return 1;
++	}
++#endif
++
+ 	/* disable multidevice so clutter-gtk events work.
+ 	 * this needs to be done before gtk_open, so the visualizer
+ 	 * plugin can't do it.
+-- 
+1.7.12.1
\ No newline at end of file
diff --git a/extra/rssh/PKGBUILD b/extra/rssh/PKGBUILD
deleted file mode 100644
index 1b950c66e..000000000
--- a/extra/rssh/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 164390 2012-08-01 04:02:33Z bisson $
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=rssh
-pkgver=2.3.3
-pkgrel=4
-pkgdesc='Restricted shell for use with OpenSSH, allowing only scp and/or sftp'
-url='http://www.pizzashack.org/rssh/'
-license=('custom:rssh')
-arch=('i686' 'x86_64' 'mips64el')
-backup=('etc/rssh.conf')
-depends=('openssh')
-source=("http://downloads.sourceforge.net/sourceforge/rssh/rssh-${pkgver}.tar.gz"
-        'env-breach.patch'
-        'destdir.patch'
-        'rsync.patch')
-sha1sums=('0a6dd80b5e6059e0db12c9f1276121dd966b610a'
-          '434712f82f24c60834a10142ca5c49b8a57555a7'
-          '85bd1694decae5872cbeeafd578b147eb13313c6'
-          '86564eab4493f4b4502a022e5938babb31450a00')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	patch -p1 -i ../env-breach.patch # FS#30950
-	patch -p1 -i ../rsync.patch # FS#21783
-	patch -p1 -i ../destdir.patch
-
-	./configure \
-		--prefix=/usr \
-		--libexecdir=/usr/lib/rssh \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/rssh/LICENSE
-}
diff --git a/extra/rssh/destdir.patch b/extra/rssh/destdir.patch
deleted file mode 100644
index 90fa03e6d..000000000
--- a/extra/rssh/destdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -aur old//Makefile.am new//Makefile.am
---- old//Makefile.am	2006-12-21 23:22:37.000000000 +0100
-+++ new//Makefile.am	2010-11-25 18:15:29.253376150 +0100
-@@ -16,7 +16,7 @@
- 	$(CC) -c $(DEFS) $(ourdefs) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $<
- 
- install-exec-hook:
--	chmod u+s $(libexecdir)/rssh_chroot_helper
-+	chmod u+s $(DESTDIR)$(libexecdir)/rssh_chroot_helper
- 
- rpm:	dist
- 	rpmbuild -ta --sign $(base).tar.gz
-diff -aur old//Makefile.in new//Makefile.in
---- old//Makefile.in	2010-08-01 15:59:54.000000000 +0200
-+++ new//Makefile.in	2010-11-25 18:15:29.253376150 +0100
-@@ -830,7 +830,7 @@
- 	$(CC) -c $(DEFS) $(ourdefs) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $<
- 
- install-exec-hook:
--	chmod u+s $(libexecdir)/rssh_chroot_helper
-+	chmod u+s $(DESTDIR)$(libexecdir)/rssh_chroot_helper
- 
- rpm:	dist
- 	rpmbuild -ta --sign $(base).tar.gz
diff --git a/extra/rssh/env-breach.patch b/extra/rssh/env-breach.patch
deleted file mode 100644
index e9193c7bd..000000000
--- a/extra/rssh/env-breach.patch
+++ /dev/null
@@ -1,228 +0,0 @@
---- rssh-2.3.3/main.c.in	2010-08-01 15:43:30.000000000 -0400
-+++ rssh-2.3.3/main.c.in	2012-05-11 16:44:39.000000000 -0400
-@@ -184,7 +184,7 @@
- 	 * determine if the command in cmdline is acceptable to run, and store
- 	 * name of program to exec in cmd
- 	 */
--	if ( !(*cmd = check_command_line(cmdline, opts)) ) return NULL;
-+	if ( !(*cmd = get_command(cmdline, opts)) ) return NULL;
- 
- 	/* if we need to do chroot processing, do it */
- 	if ( opts->shell_flags & RSSH_USE_CHROOT ){
-@@ -252,7 +252,9 @@
- 	}
- 
- 	/* return vector of pointers to command line arguments */
--	return build_arg_vector(cmdline, 0);
-+	argvec = build_arg_vector(cmdline, 0);
-+	if (check_command_line(argvec, opts)) return argvec;
-+	else return NULL;
- }
- 
- void vers_info( void )
---- rssh-2.3.3/util.c	2010-08-01 09:07:00.000000000 -0400
-+++ rssh-2.3.3/util.c	2012-05-11 16:43:10.000000000 -0400
-@@ -106,7 +106,7 @@
- 	/* print error message to user and log attempt */
- 	fprintf(stderr, "\nThis account is restricted by rssh.\n"
- 		"%s\n\nIf you believe this is in error, please contact "
--	        "your system administrator.\n\n", cmd);
-+		"your system administrator.\n\n", cmd);
- 	if ( argc < 3 )
- 		log_msg("user %s attempted to log in with a shell",
- 			username);
-@@ -132,31 +132,35 @@
-  */
- bool opt_exist(char *cl, char opt)
- {
--	int	i = 0;
-+	int	i = 1;
- 	int	len;
--	char	*token;
--	bool	optstring = FALSE;
--
- 
- 	len = strlen(cl);
- 
- 	/* process command line character by character */
--	while ( i < (len - 2) ){
--		if ( cl[i] == ' ' || cl[i] == '\t' ){
--			if ( cl[i+1] == '-' ){ 
--				optstring = TRUE;
--				i+=2;
--			}
--		}
--		if ( cl[i] == opt && optstring ) return TRUE;
--		if ( cl[i] == ' ' || cl[i] == '\t' || cl[i] == '-' ) 
--			optstring = FALSE;
-+	if (!(cl[0] == '-')) return FALSE;
-+	while ( i < (len) ){
-+		if ( cl[i] == opt ) return TRUE;
- 		i++;
- 	}
- 	return FALSE;
- }
- 
- 
-+bool opt_filter(char **vec, const char opt)
-+{
-+	while (vec && *vec){
-+		if (opt_exist(*vec, opt)){
-+			fprintf(stderr, "\nillegal insecure %c option", opt);
-+			log_msg("insecure %c option in scp command line!", opt);
-+			return TRUE;
-+		}
-+		vec++;
-+	}
-+	return FALSE;
-+}
-+
-+
- bool check_command( char *cl, ShellOptions_t *opts, char *cmd, int cmdflag )
- {
- 	int	cl_len;		/* length of command line */
-@@ -186,69 +190,78 @@
- 	return FALSE;
- }
- 
-+
- /*
-  * check_command_line() - take the command line passed to rssh, and verify
-- * 			  that the specified command is one the user is
-- * 			  allowed to run.  Return the path of the command
-- * 			  which will be run if it is ok, or return NULL if it
-- * 			  is not.
-+ *			  that the specified command is one the user is
-+ *			  allowed to run and validate the arguments.  Return the
-+ *			  path of the command which will be run if it is ok, or
-+ *			  return NULL if it is not.
-  */
--char *check_command_line( char *cl, ShellOptions_t *opts )
-+char *check_command_line( char **cl, ShellOptions_t *opts )
- {
- 
--	if ( check_command(cl, opts, PATH_SFTP_SERVER, RSSH_ALLOW_SFTP) )
-+	if ( check_command(*cl, opts, PATH_SFTP_SERVER, RSSH_ALLOW_SFTP) )
- 		return PATH_SFTP_SERVER;
- 
--	if ( check_command(cl, opts, PATH_SCP, RSSH_ALLOW_SCP) ){
-+	if ( check_command(*cl, opts, PATH_SCP, RSSH_ALLOW_SCP) ){
- 		/* filter -S option */
--		if ( opt_exist(cl, 'S') ){
--			fprintf(stderr, "\ninsecure -S option not allowed.");
--			log_msg("insecure -S option in scp command line!");
--			return NULL;
--		}
-+		if ( opt_filter(cl, 'S') ) return NULL;
- 		return PATH_SCP;
- 	}
- 
--	if ( check_command(cl, opts, PATH_CVS, RSSH_ALLOW_CVS) ){
--		if ( opt_exist(cl, 'e') ){
--			fprintf(stderr, "\ninsecure -e option not allowed.");
--			log_msg("insecure -e option in cvs command line!");
--			return NULL;
--		}
-+	if ( check_command(*cl, opts, PATH_CVS, RSSH_ALLOW_CVS) ){
-+		if ( opt_filter(cl, 'e') ) return NULL;
- 		return PATH_CVS;
- 	}
- 
--	if ( check_command(cl, opts, PATH_RDIST, RSSH_ALLOW_RDIST) ){
-+	if ( check_command(*cl, opts, PATH_RDIST, RSSH_ALLOW_RDIST) ){
- 		/* filter -P option */
--		if ( opt_exist(cl, 'P') ){
--			fprintf(stderr, "\ninsecure -P option not allowed.");
--			log_msg("insecure -P option in rdist command line!");
--			return NULL;
--		}
-+		if ( opt_filter(cl, 'P') ) return NULL;
- 		return PATH_RDIST;
- 	}
- 
--	if ( check_command(cl, opts, PATH_RSYNC, RSSH_ALLOW_RSYNC) ){
-+	if ( check_command(*cl, opts, PATH_RSYNC, RSSH_ALLOW_RSYNC) ){
- 		/* filter -e option */
--		if ( opt_exist(cl, 'e') ){
--			fprintf(stderr, "\ninsecure -e option not allowed.");
--			log_msg("insecure -e option in rdist command line!");
--			return NULL;
--		}
--		
--		if ( strstr(cl, "--rsh=" ) ){
--			fprintf(stderr, "\ninsecure --rsh= not allowed.");
--			log_msg("insecure --rsh option in rsync command line!");
--			return NULL;
-+		if ( opt_filter(cl, 'e') ) return NULL;
-+		while (cl && *cl){
-+			if ( strstr(*cl, "--rsh=" ) ){
-+				fprintf(stderr, "\ninsecure --rsh= not allowed.");
-+				log_msg("insecure --rsh option in rsync command line!");
-+				return NULL;
-+			}
- 		}
--
- 		return PATH_RSYNC;
- 	}
-+	/* No match, return NULL */
-+	return NULL;
-+}
-+
-+
-+/*
-+ * get_command() - take the command line passed to rssh, and verify
-+ *		   that the specified command is one the user is allowed to run.
-+ *		   Return the path of the command which will be run if it is ok,
-+ *		   or return NULL if it is not.
-+ */
-+char *get_command( char *cl, ShellOptions_t *opts )
-+{
- 
-+	if ( check_command(cl, opts, PATH_SFTP_SERVER, RSSH_ALLOW_SFTP) )
-+		return PATH_SFTP_SERVER;
-+	if ( check_command(cl, opts, PATH_SCP, RSSH_ALLOW_SCP) )
-+		return PATH_SCP;
-+	if ( check_command(cl, opts, PATH_CVS, RSSH_ALLOW_CVS) )
-+		return PATH_CVS;
-+	if ( check_command(cl, opts, PATH_RDIST, RSSH_ALLOW_RDIST) )
-+		return PATH_RDIST;
-+	if ( check_command(cl, opts, PATH_RSYNC, RSSH_ALLOW_RSYNC) )
-+		return PATH_RSYNC;
- 	return NULL;
- }
- 
- 
-+
- /*
-  * extract_root() - takes a root directory and the full path to some other
-  *                  directory, and returns a pointer to a string which
-@@ -264,7 +277,7 @@
- 	len = strlen(root);
- 	/* get rid of a trailing / from the root path */
- 	if ( root[len - 1] == '/' ){
--	       	root[len - 1] = '\0';
-+		root[len - 1] = '\0';
- 		len--;
- 	}
- 	if ( (strncmp(root, path, len)) ) return NULL;
-@@ -309,7 +322,7 @@
-  *                     same name, and returns FALSE if the bits are not valid
-  */
- int validate_access( const char *temp, bool *allow_sftp, bool *allow_scp,
--	       	     bool *allow_cvs, bool *allow_rdist, bool *allow_rsync )
-+		     bool *allow_cvs, bool *allow_rdist, bool *allow_rsync )
- {
- 	int	i;
- 
---- rssh-2.3.3/util.h	2006-12-21 17:22:38.000000000 -0500
-+++ rssh-2.3.3/util.h	2012-05-11 16:21:12.000000000 -0400
-@@ -33,7 +33,8 @@
- #include "rsshconf.h"
- 
- void fail( int flags, int argc, char **argv );
--char *check_command_line( char *cl, ShellOptions_t *opts );
-+char *check_command_line( char **cl, ShellOptions_t *opts );
-+char *get_command( char *cl, ShellOptions_t *opts);
- char *extract_root( char *root, char *path );
- int  validate_umask( const char *temp, int *mask );
- int validate_access( const char *temp, bool *allow_sftp, bool *allow_scp,
diff --git a/extra/rssh/rsync.patch b/extra/rssh/rsync.patch
deleted file mode 100644
index 7d0a51195..000000000
--- a/extra/rssh/rsync.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naur old/util.c new/util.c
---- old/util.c	2012-08-01 13:48:47.803620731 +1000
-+++ new/util.c	2012-08-01 13:55:13.622614598 +1000
-@@ -56,6 +56,7 @@
- #ifdef HAVE_LIBGEN_H
- #include <libgen.h>
- #endif /* HAVE_LIBGEN_H */
-+#include <regex.h>
- 
- /* LOCAL INCLUDES */
- #include "pathnames.h"
-@@ -192,6 +193,33 @@
- 
- 
- /*
-+ * check_rsync_e() - take the command line passed to rssh and look for a -e
-+ *                   option.  If one is found, make sure --server is provided
-+ *                   and the option contains only the protocol information.
-+ *                   Returns 1 if the command line is safe; 0 otherwise.
-+ */
-+static int check_rsync_e( char *cl )
-+{
-+	int	status;
-+	regex_t	re;
-+
-+	/*
-+	 * This is more complicated than it looks because we don't want to
-+	 * trigger on the e in --server, but we do want to catch the common
-+	 * case of -ltpre.iL (which contains -e.).
-+	 */
-+	static const char pattern[] = "[ \t\v\f]-([^-][^ ]*)?e[^.0-9]";
-+
-+	if ( strstr(cl, "--server") == NULL ) return 0;
-+	if ( regcomp(&re, pattern, REG_EXTENDED | REG_NOSUB) != 0 ){
-+		return 0;
-+	}
-+	status = regexec(&re, cl, 0, NULL, 0);
-+	regfree(&re);
-+	return (status == 0) ? 0 : 1;
-+}
-+
-+/*
-  * check_command_line() - take the command line passed to rssh, and verify
-  *			  that the specified command is one the user is
-  *			  allowed to run and validate the arguments.  Return the
-@@ -211,7 +239,7 @@
- 	}
- 
- 	if ( check_command(*cl, opts, PATH_CVS, RSSH_ALLOW_CVS) ){
--		if ( opt_filter(cl, 'e') ) return NULL;
-+		if ( opt_filter(cl, 'e') && !check_rsync_e(cl) ) return NULL;
- 		return PATH_CVS;
- 	}
- 
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 917dbd71d..d85340e58 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Jeramy Rutley <jrutley@gmail.com>
 
 pkgname=('ruby' 'ruby-docs')
-pkgver=1.9.3_p286
+pkgver=1.9.3_p327
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ruby-lang.org/en/'
@@ -13,7 +13,7 @@ makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
 options=('!emptydirs' '!makeflags')
 source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
         'gemrc')
-md5sums=('2278eff4cfed3cbc0653bc73085caa34'
+md5sums=('7d602aba93f31ceef32800999855fbca'
          '6fb8e7a09955e0f64be3158fb4a27e7a')
 
 build() {
@@ -65,5 +65,3 @@ package_ruby-docs() {
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE"
   install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL"
 }
-md5sums=('e76848a86606a4fd5dcf14fc4b4e755e'
-         '6fb8e7a09955e0f64be3158fb4a27e7a')
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 5b058b0ae..b47b62c82 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 166802 2012-09-19 10:45:08Z tpowa $
+# $Id: PKGBUILD 169815 2012-10-30 08:04:35Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
 pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=3.6.8
+pkgver=3.6.9
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.6.8
+_realver=3.6.9
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 url="http://www.samba.org"
@@ -157,7 +157,7 @@ install='samba.install'
   install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf
   rm -rf ${pkgdir}/var/run
 }
-md5sums=('fbb245863eeef2fffe172df779a217be'
+md5sums=('0c48bbeb9549fcda37f108aa3c2a817f'
          'a45a4283723be2b0ae32439dc4496a09'
          '5697da77590ec092cc8a883bae06093c'
          'a4bbfa39fee95bba2e7ad6b535fae7e6'
diff --git a/extra/sbc/PKGBUILD b/extra/sbc/PKGBUILD
index 70a61c17b..76425d8ab 100644
--- a/extra/sbc/PKGBUILD
+++ b/extra/sbc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sbc
 pkgver=1.0
 pkgrel=1
 pkgdesc="Bluetooth Subband Codec (SBC) library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.bluez.org/"
 license=('GPL' 'LGPL')
 depends=('glibc')
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index 367b49064..da4d87cc5 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 168308 2012-10-08 09:08:03Z juergen $
+# $Id: PKGBUILD 171078 2012-11-16 14:24:00Z allan $
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Daniel White <daniel@whitehouse.id.au>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Leslie Polzer (skypher)
 
 pkgname=sbcl
-pkgver=1.1.0
-pkgrel=1
+pkgver=1.1.1
+pkgrel=2
 pkgdesc="Steel Bank Common Lisp"
 url="http://www.sbcl.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
-depends=('glibc')
-provides=('common-lisp' 'cl-asdf') # 'zlib') this is really annoying for tools like toru
+depends=('glibc' 'zlib')
+provides=('common-lisp' 'cl-asdf')
 makedepends=('sbcl' 'texinfo')
 [ "$CARCH" = "mips64el" ] && \
 makedepends=('clisp' 'texinfo')
 install=sbcl.install
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
         "arch-fixes.lisp")
-md5sums=('7390495ce158eac45002c028ed8c149b'
+md5sums=('1f000ca9d83072b2712d6cdfca7b41de'
          '7ac0c1936547f4278198b8bf7725204d')
 
 build() {
diff --git a/extra/screen/PKGBUILD b/extra/screen/PKGBUILD
index d691067a7..a152626c5 100644
--- a/extra/screen/PKGBUILD
+++ b/extra/screen/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 147962 2012-01-29 04:41:21Z allan $
+# $Id: PKGBUILD 170087 2012-11-01 01:12:40Z thomas $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Committer: dorphell <dorphell@gmx.net>
 
 pkgname=screen
 pkgver=4.0.3
-pkgrel=13
+pkgrel=15
 _ptygroup=5 #the UID of our PTY/TTY group
 pkgdesc="Full-screen window manager that multiplexes a physical terminal"
 arch=('i686' 'x86_64' 'mips64el')
@@ -32,7 +32,8 @@ build() {
         --with-sys-screenrc=/etc/screenrc --enable-colors256 \
        --enable-rxvt_osc --enable-telnet \
        --with-pty-group=$_ptygroup \
-       --mandir=/usr/share/man --infodir=/usr/share/info
+       --mandir=/usr/share/man --infodir=/usr/share/info \
+       --with-socket-dir=/run/screens
   make
 }
 
diff --git a/extra/screen/screen.install b/extra/screen/screen.install
index 9340e6067..3adc8f3f6 100644
--- a/extra/screen/screen.install
+++ b/extra/screen/screen.install
@@ -10,6 +10,11 @@ post_install() {
 
 post_upgrade() {
     post_install $1
+    if [ $(vercmp $2 4.0.3-15) -lt 0 ]; then
+        echo 'The location of the screen sockets has changed.'
+        echo 'If you need to access running screen sessions, run'
+        echo '  # SCREENDIR=/tmp/screens/S-$USER/ screen ...'
+    fi
 }
 
 pre_remove() {
diff --git a/extra/scummvm/PKGBUILD b/extra/scummvm/PKGBUILD
deleted file mode 100644
index cfa98e178..000000000
--- a/extra/scummvm/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 160951 2012-06-07 12:29:27Z juergen $
-# Maintainer: juergen <juergen@archlinux.org>
-# Contributor: Manolis Tzanidakis, Petter Gundersen
-
-pkgname=scummvm
-pkgver=1.4.1
-pkgrel=2
-pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.scummvm.org/"
-depends=('libmad' 'sdl' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('aa094c2224aad22d5340a1d2d919c883')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  ./configure --disable-debug \
-    --enable-release \
-    --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR=$startdir/pkg install
-  install -Dm644 dists/${pkgname}.desktop \
-	"${pkgdir}"/usr/share/applications/${pkgname}.desktop
-}
diff --git a/extra/sdl_mixer/PKGBUILD b/extra/sdl_mixer/PKGBUILD
index afa2e2091..56fb59859 100644
--- a/extra/sdl_mixer/PKGBUILD
+++ b/extra/sdl_mixer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 146688 2012-01-16 11:35:40Z heftig $
+# $Id: PKGBUILD 170804 2012-11-12 02:00:36Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -6,7 +6,7 @@
 
 pkgname=sdl_mixer
 pkgver=1.2.12
-pkgrel=1.1
+pkgrel=3
 pkgdesc="A simple multi-channel audio mixer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libsdl.org/projects/SDL_mixer/"
@@ -15,12 +15,22 @@ depends=('sdl>=1.2.12' 'libvorbis' 'libmikmod' 'smpeg')
 makedepends=('fluidsynth')
 optdepends=('fluidsynth: MIDI software synth, replaces built-in timidity')
 options=('!libtool')
-source=(http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-$pkgver.tar.gz)
-md5sums=('e03ff73d77a55e3572ad0217131dc4a1')
+source=(http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-$pkgver.tar.gz
+        mikmod1.patch mikmod2.patch fluidsynth-volume.patch double-free-crash.patch)
+md5sums=('e03ff73d77a55e3572ad0217131dc4a1'
+         '95a6d58686fe3017d58c39e3e1dd40f7'
+         'd823994c3961f2ff48644478f27a27d1'
+         'eed8b61defde36ac2077ef96d868ea3e'
+         '4b4835c63297f016a198cacb7dd68ec1')
 
 build() {
   cd "$srcdir/SDL_mixer-$pkgver"
 
+  patch -Np1 -i ../mikmod1.patch
+  patch -Np1 -i ../mikmod2.patch
+  patch -Np1 -i ../fluidsynth-volume.patch
+  patch -Np1 -i ../double-free-crash.patch
+
   sed -e "/CONFIG_FILE_ETC/s|/etc/timidity.cfg|/etc/timidity++/timidity.cfg|" \
       -e "/DEFAULT_PATH/s|/etc/timidity|/etc/timidity++|" \
       -e "/DEFAULT_PATH2/s|/usr/local/lib/timidity|/usr/lib/timidity|" \
diff --git a/extra/sdl_mixer/double-free-crash.patch b/extra/sdl_mixer/double-free-crash.patch
new file mode 100644
index 000000000..6f4e6a1ee
--- /dev/null
+++ b/extra/sdl_mixer/double-free-crash.patch
@@ -0,0 +1,32 @@
+
+# HG changeset patch
+# User Sam Lantinga <slouken@libsdl.org>
+# Date 1329087437 18000
+# Node ID 2d713670db9b832b0c5aa700824900bc1fc3c3cd
+# Parent  df72f22b4b411ad4b08f924329678aabd5ac97d6
+Fixed 1418 - crash on double free if loading WAV file failed
+
+diff -r df72f22b4b41 -r 2d713670db9b mixer.c
+--- a/mixer.c	Mon Jan 30 21:41:45 2012 -0500
++++ b/mixer.c	Sun Feb 12 17:57:17 2012 -0500
+@@ -610,13 +610,15 @@
+ 			break;
+ 		default:
+ 			SDL_SetError("Unrecognized sound file type");
+-			return(0);			
++			if ( freesrc ) {
++				SDL_RWclose(src);
++			}
++			loaded = NULL;
++			break;
+ 	}
+ 	if ( !loaded ) {
++		/* The individual loaders have closed src if needed */
+ 		SDL_free(chunk);
+-		if ( freesrc ) {
+-			SDL_RWclose(src);
+-		}
+ 		return(NULL);
+ 	}
+ 
+
diff --git a/extra/sdl_mixer/fluidsynth-volume.patch b/extra/sdl_mixer/fluidsynth-volume.patch
new file mode 100644
index 000000000..cf346ed02
--- /dev/null
+++ b/extra/sdl_mixer/fluidsynth-volume.patch
@@ -0,0 +1,23 @@
+
+# HG changeset patch
+# User James Le Cuirot <chewi@aura-online.co.uk>
+# Date 1330896767 0
+# Node ID c92001a2c18f628698c58aa4e05a7335d10d0e9e
+# Parent  2d713670db9b832b0c5aa700824900bc1fc3c3cd
+Raise the maximum FluidSynth gain from 0.8 to 1.2 because apparently the former is too quiet in some cases.
+
+diff -r 2d713670db9b -r c92001a2c18f fluidsynth.c
+--- a/fluidsynth.c	Sun Feb 12 17:57:17 2012 -0500
++++ b/fluidsynth.c	Sun Mar 04 21:32:47 2012 +0000
+@@ -176,8 +176,8 @@
+ 
+ void fluidsynth_setvolume(FluidSynthMidiSong *song, int volume)
+ {
+-	/* FluidSynth's default is 0.2. Make 0.8 the maximum. */
+-	fluidsynth.fluid_synth_set_gain(song->synth, (float) (volume * 0.00625));
++	/* FluidSynth's default is 0.2. Make 1.2 the maximum. */
++	fluidsynth.fluid_synth_set_gain(song->synth, (float) (volume * 1.2 / MIX_MAX_VOLUME));
+ }
+ 
+ int fluidsynth_playsome(FluidSynthMidiSong *song, void *dest, int dest_len)
+
diff --git a/extra/sdl_mixer/mikmod1.patch b/extra/sdl_mixer/mikmod1.patch
new file mode 100644
index 000000000..b3bb829d2
--- /dev/null
+++ b/extra/sdl_mixer/mikmod1.patch
@@ -0,0 +1,67 @@
+
+# HG changeset patch
+# User Sam Lantinga <slouken@libsdl.org>
+# Date 1342998807 25200
+# Node ID 56cad6484b04f83c8d42428c755a046678506436
+# Parent  c92001a2c18f628698c58aa4e05a7335d10d0e9e
+Paul P Komkoff Jr fixed malloc/free mismatch in the MikMod driver
+
+diff -r c92001a2c18f -r 56cad6484b04 CHANGES
+--- a/CHANGES	Sun Mar 04 21:32:47 2012 +0000
++++ b/CHANGES	Sun Jul 22 16:13:27 2012 -0700
+@@ -1,3 +1,7 @@
++1.2.13:
++Paul P Komkoff Jr - Sun Jul 22 16:12:28 PDT 2012
++ * Fixed malloc/free mismatch in the MikMod driver
++
+ 1.2.12:
+ Sam Lantinga - Sat Jan 14 22:00:29 2012 -0500
+  * Fixed seek offset with SMPEG (was relative, should be absolute)
+diff -r c92001a2c18f -r 56cad6484b04 dynamic_mod.c
+--- a/dynamic_mod.c	Sun Mar 04 21:32:47 2012 +0000
++++ b/dynamic_mod.c	Sun Jul 22 16:13:27 2012 -0700
+@@ -93,6 +93,13 @@
+ 			SDL_UnloadObject(mikmod.handle);
+ 			return -1;
+ 		}
++		mikmod.MikMod_free =
++			(void (*)(void*))
++			SDL_LoadFunction(mikmod.handle, "MikMod_free");
++		if ( mikmod.MikMod_free == NULL ) {
++			SDL_UnloadObject(mikmod.handle);
++			return -1;
++		}
+ 		mikmod.Player_Active =
+ 			(BOOL (*)(void))
+ 			SDL_LoadFunction(mikmod.handle, "Player_Active");
+diff -r c92001a2c18f -r 56cad6484b04 dynamic_mod.h
+--- a/dynamic_mod.h	Sun Mar 04 21:32:47 2012 +0000
++++ b/dynamic_mod.h	Sun Jul 22 16:13:27 2012 -0700
+@@ -35,6 +35,7 @@
+ 	void (*MikMod_RegisterDriver)(struct MDRIVER*);
+ 	int* MikMod_errno;
+ 	char* (*MikMod_strerror)(int);
++	void (*MikMod_free)(void*);
+ 	BOOL (*Player_Active)(void);
+ 	void (*Player_Free)(MODULE*);
+ 	MODULE* (*Player_LoadGeneric)(MREADER*,int,BOOL);
+diff -r c92001a2c18f -r 56cad6484b04 music_mod.c
+--- a/music_mod.c	Sun Mar 04 21:32:47 2012 +0000
++++ b/music_mod.c	Sun Jul 22 16:13:27 2012 -0700
+@@ -109,13 +109,13 @@
+ 
+ 	list = mikmod.MikMod_InfoDriver();
+ 	if ( list )
+-	  free(list);
++	  mikmod.MikMod_free(list);
+ 	else
+ 	  mikmod.MikMod_RegisterDriver(mikmod.drv_nos);
+ 
+ 	list = mikmod.MikMod_InfoLoader();
+ 	if ( list )
+-	  free(list);
++	  mikmod.MikMod_free(list);
+ 	else
+ 	  mikmod.MikMod_RegisterAllLoaders();
+ 
+
diff --git a/extra/sdl_mixer/mikmod2.patch b/extra/sdl_mixer/mikmod2.patch
new file mode 100644
index 000000000..6e89ca82a
--- /dev/null
+++ b/extra/sdl_mixer/mikmod2.patch
@@ -0,0 +1,35 @@
+
+# HG changeset patch
+# User Sam Lantinga <slouken@libsdl.org>
+# Date 1343000017 25200
+# Node ID 2ebb0d016f277f7f643d8a66ed0e1099e10d1fba
+# Parent  56cad6484b04f83c8d42428c755a046678506436
+Fixed normal linking with libmikmod and linking with earlier versions of libmikmod.
+
+diff -r 56cad6484b04 -r 2ebb0d016f27 dynamic_mod.c
+--- a/dynamic_mod.c	Sun Jul 22 16:13:27 2012 -0700
++++ b/dynamic_mod.c	Sun Jul 22 16:33:37 2012 -0700
+@@ -97,8 +97,8 @@
+ 			(void (*)(void*))
+ 			SDL_LoadFunction(mikmod.handle, "MikMod_free");
+ 		if ( mikmod.MikMod_free == NULL ) {
+-			SDL_UnloadObject(mikmod.handle);
+-			return -1;
++			/* libmikmod 3.1 and earlier doesn't have it */
++			mikmod.MikMod_free = free;
+ 		}
+ 		mikmod.Player_Active =
+ 			(BOOL (*)(void))
+@@ -246,6 +246,11 @@
+ 		mikmod.MikMod_RegisterDriver = MikMod_RegisterDriver;
+ 		mikmod.MikMod_errno = &MikMod_errno;
+ 		mikmod.MikMod_strerror = MikMod_strerror;
++#if LIBMIKMOD_VERSION < ((3<<16)|(2<<8))
++		mikmod.MikMod_free = free;
++#else
++		mikmod.MikMod_free = MikMod_free;
++#endif
+ 		mikmod.Player_Active = Player_Active;
+ 		mikmod.Player_Free = Player_Free;
+ 		mikmod.Player_LoadGeneric = Player_LoadGeneric;
+
diff --git a/extra/sdl_sound/PKGBUILD b/extra/sdl_sound/PKGBUILD
index cbc7a347c..ad57a55b4 100644
--- a/extra/sdl_sound/PKGBUILD
+++ b/extra/sdl_sound/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 137585 2011-09-09 23:22:23Z allan $
-# Maintainer:
+# $Id: PKGBUILD 170550 2012-11-08 15:28:40Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sdl_sound
 pkgver=1.0.3
-pkgrel=3.1
+pkgrel=4
 pkgdesc="A library to decode several popular sound file formats, such as .WAV and .MP3"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://icculus.org/SDL_sound/"
@@ -21,7 +21,7 @@ build() {
 
   CFLAGS="$CFLAGS -I/usr/include/smpeg" \
   CXXFLAGS="$CXXFLAGS -I/usr/include/smpeg" \
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-static
 
   make
 }
diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD
index dfd7ff235..cadce200e 100644
--- a/extra/seahorse/PKGBUILD
+++ b/extra/seahorse/PKGBUILD
@@ -1,29 +1,33 @@
-# $Id: PKGBUILD 156964 2012-04-23 09:10:10Z ibiru $
+# $Id: PKGBUILD 170821 2012-11-12 08:38:53Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Michel Brabants <michel.linux@tiscali.be>
 
 pkgname=seahorse
-pkgver=3.4.1
+pkgver=3.6.3
 pkgrel=1
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64 'mips64el')
-license=('GPL')
+license=(GPL)
 url="http://projects.gnome.org/seahorse/"
-depends=('gtk3' 'gcr' 'libgnome-keyring' 'libsoup' 'gpgme' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf')
-makedepends=('libldap' 'intltool' 'gnome-doc-utils' 'gobject-introspection' 'openssh' 'libsm')
+depends=(gtk3 gcr libsecret libsoup gpgme desktop-file-utils hicolor-icon-theme dconf)
+makedepends=(libldap intltool yelp-tools gobject-introspection openssh libsm)
 optdepends=('openssh: SSH support')
-provides=('x11-ssh-askpass')
+provides=(x11-ssh-askpass)
 options=('!libtool' '!emptydirs')
-groups=('gnome-extra')
+groups=(gnome-extra)
 install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
         seahorse-ssh-askpass.sh)
-sha256sums=('841443ed6d7f865e1c9347867527591287bcc5b2e281c8da11b2cb355d678faa'
+sha256sums=('9b712da1989725547a8093e638725ee6de74d7870661545a15374c7ebf335cc1'
             '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c')
 
 build() {
   cd "$pkgname-$pkgver"
+
+  # From Debian.
+  patch -p1 -i "$srcdir/10_gpgme_keyring_finalize_typo.patch"
+
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --enable-ldap --enable-hkp \
diff --git a/extra/serd/PKGBUILD b/extra/serd/PKGBUILD
index 581d2b891..836e19e29 100644
--- a/extra/serd/PKGBUILD
+++ b/extra/serd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=serd
 pkgver=0.18.0
 pkgrel=1
 pkgdesc="A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples."
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://drobilla.net/software/$pkgname/"
 license=('custom:ISC')
 depends=('glibc')
diff --git a/extra/skanlite/PKGBUILD b/extra/skanlite/PKGBUILD
deleted file mode 100644
index aa49681be..000000000
--- a/extra/skanlite/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 148928 2012-02-05 11:56:16Z ibiru $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=skanlite
-pkgver=0.8
-pkgrel=2
-pkgdesc="Image Scanning Application for KDE"
-arch=('i686' 'x86_64' 'mips64el')
-url='http://kde-apps.org/content/show.php?content=109803'
-license=('GPL')
-depends=('kdebase-runtime' 'libksane')
-makedepends=('pkgconfig' 'cmake' 'automoc4')
-source=("http://downloads.sourceforge.net/sanewidget/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('baa43dbc78be696e121969b0a3d88929')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD
index 7ac151623..bd9809027 100644
--- a/extra/slim/PKGBUILD
+++ b/extra/slim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 166599 2012-09-12 20:22:19Z tpowa $
+# $Id: PKGBUILD 171076 2012-11-16 14:05:41Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -6,12 +6,12 @@
 
 pkgname=slim
 pkgver=1.3.4
-pkgrel=3
+pkgrel=4
 pkgdesc='Desktop-independent graphical login manager for X11'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://slim.berlios.de/'
 license=('GPL2')
-depends=('consolekit' 'pam' 'libxmu' 'libpng' 'libjpeg' 'libxft')
+depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft')
 makedepends=('cmake' 'freeglut')
 backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim')
 source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
@@ -21,15 +21,13 @@ source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'slim.service'
         'session-name.patch'
         'libpng-1.4+-support.patch'
-        'fix-glibc-segfault-1.3.4.patch')
-
-install=install
+        'fix-array-overflow.patch')
 
 build() {
         cd "${srcdir}/${pkgname}-${pkgver}"
 	patch -p1 -i ../session-name.patch # FS#26693: fix default session name
         patch -Np1 -i ../libpng-1.4+-support.patch # taken from gentoo to build
-        patch -Np0 -i ../fix-glibc-segfault-1.3.4.patch # FS#30864
+        patch -Np0 -i ../fix-array-overflow.patch # FS#30864
         cd ${srcdir}
         mkdir build
         cd build
@@ -37,7 +35,7 @@ build() {
                 -DCMAKE_BUILD_TYPE=Release \
                 -DCMAKE_SKIP_RPATH=ON \
                 -DCMAKE_INSTALL_PREFIX=/usr \
-                -DUSE_PAM=yes -DUSE_CONSOLEKIT=yes
+                -DUSE_PAM=yes -DUSE_CONSOLEKIT=no
 	make
 }
 
diff --git a/extra/slim/fix-array-overflow.patch b/extra/slim/fix-array-overflow.patch
new file mode 100644
index 000000000..b035f8a78
--- /dev/null
+++ b/extra/slim/fix-array-overflow.patch
@@ -0,0 +1,13 @@
+Index: app.cpp
+===================================================================
+--- app.cpp	(revision 223)
++++ app.cpp	(working copy)
+@@ -593,7 +593,7 @@
+ 
+         n++;
+ 
+-        child_env = static_cast<char**>(malloc(sizeof(char*)*n));
++        child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1)));
+         memcpy(child_env, old_env, sizeof(char*)*n);
+         child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
+         child_env[n] = NULL;
diff --git a/extra/slv2/PKGBUILD b/extra/slv2/PKGBUILD
deleted file mode 100644
index 2bf246084..000000000
--- a/extra/slv2/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 151231 2012-02-25 09:24:44Z allan $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Leslie P. Polzer <polzer@stardawn.org>
-
-pkgname=slv2
-pkgver=0.6.6
-pkgrel=7
-pkgdesc="Library for LV2 hosts"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://drobilla.net/software/slv2"
-license=('GPL')
-depends=('redland>=1.0.13' 'lv2core' 'jack')
-makedepends=('python2')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://download.drobilla.net/$pkgname-$pkgver.tar.bz2)
-md5sums=('b8e8e0e82dd04324fcd533e8acd1ce85')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  python2 waf configure --prefix=/usr
-  python2 waf build $MAKEFLAGS
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  python2 waf install --destdir="$pkgdir/"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/slv2/slv2.changelog b/extra/slv2/slv2.changelog
deleted file mode 100644
index f394a5067..000000000
--- a/extra/slv2/slv2.changelog
+++ /dev/null
@@ -1,23 +0,0 @@
-22 Feb 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 0.6.6-3:
-	raptor rebuild
-
-24 Nov 2010 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* PKGBUILD :
-	Get rid of sed and use python2 directly for waf.
-	waf fix for python transition already included previously (unlogged).
-	Release only (no need binary update; no runtime python requirement).
-
-9 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 0.6.6-2 :
-	Brought into extra from community for ardour
-		- adds "LV2" plug-ins support
-
-	* PKGBUILD :
-	Minor cosmetic ammendments.
-
-	* slv2.changelog :
-	Added this changelog.
diff --git a/extra/snappy/PKGBUILD b/extra/snappy/PKGBUILD
index fbd7a1ac5..772e17688 100644
--- a/extra/snappy/PKGBUILD
+++ b/extra/snappy/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=snappy
 pkgver=1.0.5
 pkgrel=2
 pkgdesc='A fast compressor/decompressor library'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/snappy/"
 license=('BSD')
 depends=('glibc' 'gcc-libs')
diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD
index 826220077..c6da2530d 100644
--- a/extra/snd/PKGBUILD
+++ b/extra/snd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165577 2012-08-25 16:01:55Z schiv $
+# $Id: PKGBUILD 171550 2012-11-19 03:46:19Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: see .contrib
 
 pkgname=snd
-pkgver=13.0
+pkgver=13.2
 pkgrel=1
 pkgdesc="An advanced sound editor"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ optdepends=('wavpack' 'flac' 'speex' 'mpg123'
             'timidity++' 'vorbis-tools')
 install=$pkgname.install
 source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz")
-md5sums=('2288933fdaf012ed92c850d6dba90c54')
+md5sums=('303df8ac9e6d777e480e24b65a3bfaad')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/sord/PKGBUILD b/extra/sord/PKGBUILD
index 86f5d8fda..8d0a71024 100644
--- a/extra/sord/PKGBUILD
+++ b/extra/sord/PKGBUILD
@@ -3,16 +3,16 @@
 # Contributor: speps <speps at aur dot archlinux dot org>
 
 pkgname=sord
-pkgver=0.10.0
+pkgver=0.10.4
 pkgrel=1
 pkgdesc="A lightweight C library for storing RDF data in memory."
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://drobilla.net/software/$pkgname/"
 license=('custom:ISC')
 depends=('serd>=0.18.0' 'pcre')
 makedepends=('python2')
 source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-md5sums=('ad20105c0cefaed32d59c4665d682cab')
+md5sums=('9353e5b5e26c926c1a8c0e43fa577f31')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/sound-juicer/PKGBUILD b/extra/sound-juicer/PKGBUILD
index a7133cf72..8bb2aadec 100644
--- a/extra/sound-juicer/PKGBUILD
+++ b/extra/sound-juicer/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 156966 2012-04-23 09:10:13Z ibiru $
+# $Id: PKGBUILD 171308 2012-11-17 04:45:56Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Ben <contrasutra@myrealbox.com>
 
 pkgname=sound-juicer
-pkgver=3.4.0
+pkgver=3.5.0
 pkgrel=1
 pkgdesc="A cd ripper application"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-depends=('libmusicbrainz4' 'libdiscid' 'gtk3' 'gstreamer0.10-base-plugins'
-         'gstreamer0.10-good-plugins' 'brasero' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils')
+arch=(i686 x86_64 mips64el)
+license=(GPL)
+depends=(libmusicbrainz5 libdiscid gtk3 gst-plugins-base gst-plugins-good brasero
+         hicolor-icon-theme gconf)
+makedepends=(intltool gnome-doc-utils)
 options=(!emptydirs)
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-groups=('gnome-extra')
+groups=(gnome-extra)
 install=sound-juicer.install
-sha256sums=('49805cc73617e745ee09b62fec46979387e5713d39e5f75320b91ee8f0c44f12')
+sha256sums=('ea76703e08e67590af7b8ce5206c343eb01d77cd5023c0bc958a0c2f5a98d2e9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/squid/PKGBUILD b/extra/squid/PKGBUILD
deleted file mode 100644
index dfa9e37a5..000000000
--- a/extra/squid/PKGBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 162165 2012-06-22 13:00:02Z dreisner $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=squid
-pkgver=3.1.20
-pkgrel=2
-pkgdesc="A full-featured Web proxy cache server."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.squid-cache.org"
-depends=('openssl' 'pam' 'cron' 'perl' 'libltdl')
-makedepends=('libcap')
-license=('GPL')
-backup=('etc/squid/squid.conf'
-        'etc/squid/mime.conf'
-        'etc/conf.d/squid')
-install=squid.install
-source=("http://www.squid-cache.org/Versions/v3/3.1/$pkgname-$pkgver.tar.bz2"
-        'squid'
-        'squid.conf.d'
-        'squid.pam'
-        'squid.cron'
-        'squid.service')
-md5sums=('c4d733a383c0508fd0746d64a2d7278a'
-         '02f7b5bd793f778e40834fd6457d2199'
-         '2383772ef94efddc7b920628bc7ac5b0'
-         '270977cdd9b47ef44c0c427ab9034777'
-         'b499c2b725aefd7bd60bec2f1a9de392'
-         '20e00e1aa1198786795f3da32db3c1d8')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # gcc 4.6 doesn't support -fhuge-objects.
-  sed '/^    HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure
-
-  # fix cache_dir, cache_dir size, and effective group.
-  sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in
-  sed '/^#cache_dir/ s/100/256/
-       /^NAME: cache_effective_group/ {n;n;s/none/proxy/}' -i src/cf.data.pre
-
-  ./configure \
-      --prefix=/usr \
-      --datadir=/usr/share/squid \
-      --sysconfdir=/etc/squid \
-      --libexecdir=/usr/lib/squid \
-      --localstatedir=/var \
-      --with-logdir=/var/log/squid \
-      --with-pidfile=/run/squid.pid \
-      --enable-auth="basic,digest,ntlm" \
-      --enable-removal-policies="lru,heap" \
-      --enable-digest-auth-helpers="password" \
-      --enable-storeio="aufs,ufs,diskd" \
-      --enable-basic-auth-helpers="getpwnam,YP,NCSA,SMB,MSNT,PAM,multi-domain-NTLM" \
-      --enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \
-      --enable-ntlm-auth-helpers="smb_lm,fakeauth,no_check" \
-      --enable-delay-pools \
-      --enable-arp-acl \
-      --enable-ssl \
-      --enable-snmp \
-      --enable-linux-netfilter \
-      --enable-ident-lookups \
-      --enable-useragent-log \
-      --enable-cache-digests \
-      --enable-referer-log \
-      --enable-arp-acl \
-      --enable-htcp \
-      --enable-carp \
-      --enable-epoll \
-      --with-filedescriptors=4096 \
-      --with-large-files \
-      --enable-arp-acl \
-      --with-default-user=proxy \
-      --enable-async-io \
-      --enable-truncate
-
-  make
-}
-
-package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
-  install -Dm755 "$srcdir"/squid "$pkgdir"/etc/rc.d/squid
-  install -Dm755 "$srcdir"/squid.cron "$pkgdir"/etc/cron.weekly/squid
-  install -Dm644 "$srcdir"/squid.conf.d "$pkgdir"/etc/conf.d/squid
-  install -Dm644 "$srcdir"/squid.pam "$pkgdir"/etc/pam.d/squid
-
-  install -Dm644 "$srcdir/squid.service" "$pkgdir/usr/lib/systemd/system/squid.service"
-
-  # random unneeded empty dir...
-  rmdir "$pkgdir/usr/include"
-}
-
-# vim: ts=2 sw=2 et ft=sh
diff --git a/extra/squid/squid b/extra/squid/squid
deleted file mode 100644
index da5534427..000000000
--- a/extra/squid/squid
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[[ -f /etc/conf.d/squid ]] && . /etc/conf.d/squid
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/run/squid.pid
-{ read -r PID </run/squid.pid; } 2>/dev/null
-if [[ $pid && ! /proc/$pid/exe -ef /usr/sbin/squid ]]; then
-  rm /run/squid.pid
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting squid"
-    if [[ $PID ]] || ! squid $SQUID_ARGS; then
-      stat_fail
-    else
-      add_daemon squid
-      stat_done
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping squid"
-    if [[ -z $PID ]] || ! squid -k shutdown &>/dev/null; then
-      stat_fail
-    else
-      # squid takes forever to shutdown all its listening FDs
-      while [[ /proc/$PID/exe -ef /usr/sbin/squid ]]; do
-        stat_append "."
-        sleep 3
-      done
-      rm_daemon squid
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/squid/squid.conf.d b/extra/squid/squid.conf.d
deleted file mode 100644
index ea248b76c..000000000
--- a/extra/squid/squid.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to squid
-#
-SQUID_ARGS="-sYC"
diff --git a/extra/squid/squid.cron b/extra/squid/squid.cron
deleted file mode 100644
index c78e51105..000000000
--- a/extra/squid/squid.cron
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# exit without error if no pidfile exists
-{ read pid </run/squid.pid; } 2>/dev/null || exit 0
-
-# make sure found PID really is a squid process
-if [ /proc/$pid/exec -ef /usr/sbin/squid ]; then
-  /usr/sbin/squid -k rotate
-fi
diff --git a/extra/squid/squid.install b/extra/squid/squid.install
deleted file mode 100644
index e7aa5ff68..000000000
--- a/extra/squid/squid.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-  if [ -z "$(grep ^proxy: /etc/group)" ]; then
-    usr/sbin/groupadd -g 15 proxy &>/dev/null
-  fi
-
-  id proxy &>/dev/null || \
-    usr/sbin/useradd -u 15 -g proxy -d /var/empty proxy
-
-  chown proxy.proxy var/{cache,log}/squid
-
-#  cat << EOF
-#Release notes:  http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html
-#EOF
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/userdel proxy &> /dev/null
-  if [ ! -z "$(grep ^proxy: /etc/group)" ]; then
-    usr/sbin/groupdel proxy &>/dev/null
-  fi
-}
-
diff --git a/extra/squid/squid.pam b/extra/squid/squid.pam
deleted file mode 100644
index df8a8104f..000000000
--- a/extra/squid/squid.pam
+++ /dev/null
@@ -1,4 +0,0 @@
-#/etc/pam.d/squid
-#
-auth		required	pam_unix.so
-account		required	pam_unix.so
diff --git a/extra/squid/squid.service b/extra/squid/squid.service
deleted file mode 100644
index 9d41cc243..000000000
--- a/extra/squid/squid.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Web Proxy Cache Server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/squid.pid
-ExecStart=/usr/sbin/squid -sYC
-ExecStop=/usr/sbin/squid -k shutdown
-ExecReload=/usr/sbin/squid -k reconfigure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/sratom/PKGBUILD b/extra/sratom/PKGBUILD
index bc7881bba..372c1a723 100644
--- a/extra/sratom/PKGBUILD
+++ b/extra/sratom/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sratom
 pkgver=0.4.0
 pkgrel=1
 pkgdesc="An LV2 Atom RDF serialisation library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://drobilla.net/software/$pkgname/"
 license=('custom:ISC')
 depends=('lv2' 'sord')
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index ed44cee47..3ca41dae4 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 168489 2012-10-12 17:51:02Z stephane $
+# $Id: PKGBUILD 170250 2012-11-06 11:27:11Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
 pkgver=1.7.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64' 'mips64el')
 license=('APACHE')
@@ -21,6 +21,7 @@ backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
 url="http://subversion.apache.org/"
 provides=('svn')
 options=('!makeflags' '!libtool' '!emptydirs')
+install=${pkgname}.install
 source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
         svnserve
         svn
@@ -50,19 +51,20 @@ build() {
    if [ "$CARCH" = "mips64el" ]; then
    ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
                --with-zlib=/usr --with-neon=/usr --with-apxs \
-               --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.2 \
-               --with-gnome-keyring --with-kwallet
+               --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \
+               --disable-javahl --with-gnome-keyring --with-kwallet
    else
    ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
                --with-zlib=/usr --with-neon=/usr --with-apxs \
-               --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \
                --enable-javahl --with-gnome-keyring --with-kwallet
    fi
 
    make external-all
    make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all
    make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
-     swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl #swig-rb
+     swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl #swig-rb
+   
+   [ "$CARCH" = "mips64el" ] || make javahl 
 }
 
 #check() {
@@ -78,7 +80,9 @@ package() {
    make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \
      swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
      swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
-     install install-swig-py install-swig-pl install-javahl #install-swig-rb
+     install install-swig-py install-swig-pl #install-swig-rb
+
+   [ "$CARCH" = "mips64el" ] || make install-javahl 
 
    install -dm755 "${pkgdir}"/usr/share/subversion
    cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/
diff --git a/extra/subversion/subversion.install b/extra/subversion/subversion.install
new file mode 100644
index 000000000..6ba32b74a
--- /dev/null
+++ b/extra/subversion/subversion.install
@@ -0,0 +1,7 @@
+post_install() {
+   usr/bin/systemd-tmpfiles --create svnserve.conf || true
+}
+
+post_upgrade() {
+   post_install
+}
diff --git a/extra/suil/PKGBUILD b/extra/suil/PKGBUILD
index a963f543a..38532d2bc 100644
--- a/extra/suil/PKGBUILD
+++ b/extra/suil/PKGBUILD
@@ -1,11 +1,12 @@
 # $Id: PKGBUILD 73980 2012-07-18 00:34:26Z speps $
-# Maintainer: speps <speps at aur dot archlinux dot org>
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: speps <speps at aur dot archlinux dot org>
 
 pkgname=suil
-pkgver=0.6.4
+pkgver=0.6.6
 pkgrel=1
 pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://drobilla.net/software/$pkgname/"
 license=('custom:ISC')
 depends=('lv2')
@@ -13,7 +14,7 @@ makedepends=('python2' 'qt' 'gtk2')
 optdepends=('qt: Qt UIs wrapping support'
             'gtk2: Gtk2 UIs wrapping support')
 source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-md5sums=('9f34d3f15b4266e7cce59e3ac8f1fb3a')
+md5sums=('6b596ad806b7bf34dfba34afb48bb758')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/sushi/PKGBUILD b/extra/sushi/PKGBUILD
index 061107d0a..28ea033b8 100644
--- a/extra/sushi/PKGBUILD
+++ b/extra/sushi/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 157425 2012-04-28 09:27:36Z allan $
+# $Id: PKGBUILD 170902 2012-11-12 22:36:42Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=sushi
-pkgver=0.4.1
-pkgrel=2
+pkgver=3.6.1
+pkgrel=1
 pkgdesc="A quick previewer for Nautilus"
 arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=('GPL2')
 groups=(gnome-extra)
-depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz3' 'libwebkit3' 'gtksourceview3' 'evince')
+depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz5' 'webkitgtk3' 'gtksourceview3' 'evince')
+install=sushi.install
 makedepends=('intltool' 'gobject-introspection')
 options=(!libtool)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7889e4309443dd7dfd5c9546af23565d15813c3f8f2af6c6776702ca8911a7bd')
+sha256sums=('ddcfa4fd8ad6a8a7ff2da10a5190a031df9e9debf217cb1fcdeec2a181222af8')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/sushi/sushi.install b/extra/sushi/sushi.install
new file mode 100644
index 000000000..c19349f72
--- /dev/null
+++ b/extra/sushi/sushi.install
@@ -0,0 +1,11 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/sysklogd/LICENSE b/extra/sysklogd/LICENSE
deleted file mode 100644
index 7e9b5d59c..000000000
--- a/extra/sysklogd/LICENSE
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 1983, 1988 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
diff --git a/extra/sysklogd/PKGBUILD b/extra/sysklogd/PKGBUILD
deleted file mode 100644
index d07395b8d..000000000
--- a/extra/sysklogd/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 158662 2012-05-05 22:14:49Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=sysklogd
-pkgver=1.5
-pkgrel=4
-pkgdesc="System and kernel log daemons"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.infodrom.org/projects/sysklogd/"
-license=('GPL' 'BSD')
-depends=('glibc' 'bash')
-provides=('logger')
-backup=('etc/syslog.conf' 'etc/logrotate.d/syslog')
-source=(http://www.infodrom.org/projects/sysklogd/download/${pkgname}-${pkgver}.tar.gz{,.asc} \
-        syslog.conf syslog.logrotate syslogd klogd LICENSE \
-        sysklogd-1.4.1-caen-owl-syslogd-bind.diff \
-        sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff \
-        sysklogd-1.4.1-caen-owl-klogd-drop-root.diff \
-        sysklogd-1.5-syslog-func-collision.patch)
-sha1sums=('070cce745b023f2ce7ca7d9888af434d6d61c236'
-          '9599322fc176004d95b5111b05f665b5191dfe67'
-          '35b4cb76109a6ffe9269021a6bfb4f8da614a4eb'
-          'e67c0f78f13c94507d3f686b4e5b8340db4624fd'
-          '848beb23b9ca4de19c6022df03878dbe57e04c0a'
-          'f46088f761c033562a59bc13d4888b7343bc02fc'
-          'c416bcefd3d3d618139cc7912310caddf34c0c0b'
-          '849b2dcaf11060d583ccb3c48356a6971df45cf0'
-          '9701989490748b0c5a1727e0fc459179d0e350a8'
-          '76da0ecd9bca969e292a6ec58d7cd96e4c97e525'
-          '826e76a59834868658eb9f8d8f3aabd8bf748759')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-# CAEN/OWL security patches
-  patch -p1 -i ../sysklogd-1.4.1-caen-owl-syslogd-bind.diff
-  patch -p1 -i ../sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff 
-  patch -p1 -i ../sysklogd-1.4.1-caen-owl-klogd-drop-root.diff
-
-  patch -p1 -i ../sysklogd-1.5-syslog-func-collision.patch
-  sed -i -e "s/-O3/${CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE/" \
-         -e "s/LDFLAGS= -s/LDFLAGS= ${LDFLAGS}/" Makefile
-  sed -i 's/500 -s/755/' Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -d "${pkgdir}/usr/sbin" "${pkgdir}"/usr/share/man/{man5,man8}
-  make prefix="${pkgdir}" install
-  install -D -m644 ../syslog.conf "${pkgdir}/etc/syslog.conf"
-  install -D -m644 ../syslog.logrotate "${pkgdir}/etc/logrotate.d/syslog"
-  install -D -m755 ../syslogd "${pkgdir}/etc/rc.d/syslogd"
-  install -D -m755 ../klogd "${pkgdir}/etc/rc.d/klogd"
-  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/sysklogd/klogd b/extra/sysklogd/klogd
deleted file mode 100755
index 690e13ab4..000000000
--- a/extra/sysklogd/klogd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/klogd`
-case "$1" in
-  start)
-    stat_busy "Starting Kernel Logger"
-    [ -z "$PID" ] && /usr/sbin/klogd -c 4
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon klogd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Kernel Logger"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/klogd.pid
-      rm_daemon klogd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/sysklogd/sysklogd-1.4.1-caen-owl-klogd-drop-root.diff b/extra/sysklogd/sysklogd-1.4.1-caen-owl-klogd-drop-root.diff
deleted file mode 100644
index e2597fe1a..000000000
--- a/extra/sysklogd/sysklogd-1.4.1-caen-owl-klogd-drop-root.diff
+++ /dev/null
@@ -1,161 +0,0 @@
-diff -Naur sysklogd-1.4.1-orig/klogd.8 sysklogd-1.4.1/klogd.8
---- sysklogd-1.4.1-orig/klogd.8	2005-03-11 11:12:09.000000000 -0500
-+++ sysklogd-1.4.1/klogd.8	2005-10-17 23:47:41.615009160 -0400
-@@ -18,6 +19,12 @@
- .RB [ " \-f "
- .I fname
- ]
-+.RB [ " \-u "
-+.I username
-+]
-+.RB [ " \-j "
-+.I chroot_dir
-+]
- .RB [ " \-iI " ]
- .RB [ " \-n " ]
- .RB [ " \-o " ]
-@@ -53,6 +60,20 @@
- .BI "\-f " file
- Log messages to the specified filename rather than to the syslog facility.
- .TP
-+.BI "\-u " username
-+Tells klogd to become the specified user and drop root privileges before
-+starting logging.
-+.TP
-+.BI "\-j " chroot_dir
-+Tells klogd to
-+.BR chroot (2)
-+into this directory after initializing.
-+This option is only valid if the \-u option is also used to run klogd
-+without root privileges.
-+Note that the use of this option will prevent \-i and \-I from working
-+unless you set up the chroot directory in such a way that klogd can still
-+read the kernel module symbols.
-+.TP
- .BI "\-i \-I"
- Signal the currently executing klogd daemon.  Both of these switches control
- the loading/reloading of symbol information.  The \-i switch signals the
-diff -Naur sysklogd-1.4.1-orig/klogd.c sysklogd-1.4.1/klogd.c
---- sysklogd-1.4.1-orig/klogd.c	2004-04-29 09:29:03.000000000 -0400
-+++ sysklogd-1.4.1/klogd.c	2005-10-17 23:46:05.200556847 -0400
-@@ -261,6 +261,8 @@
- #include <stdarg.h>
- #include <paths.h>
- #include <stdlib.h>
-+#include <pwd.h>
-+#include <grp.h>
- #include "klogd.h"
- #include "ksyms.h"
- #ifndef TESTING
-@@ -311,6 +313,9 @@
- int debugging = 0;
- int symbols_twice = 0;
- 
-+char *server_user = NULL;
-+char *chroot_dir = NULL;
-+int log_flags = 0;
- 
- /* Function prototypes. */
- extern int ksyslog(int type, char *buf, int len);
-@@ -531,8 +536,9 @@
- 	 * First do a stat to determine whether or not the proc based
- 	 * file system is available to get kernel messages from.
- 	 */
--	if ( use_syscall ||
--	    ((stat(_PATH_KLOG, &sb) < 0) && (errno == ENOENT)) )
-+	if (!server_user &&
-+	    (use_syscall ||
-+	    ((stat(_PATH_KLOG, &sb) < 0) && (errno == ENOENT))))
- 	{
- 	  	/* Initialize kernel logging. */
- 	  	ksyslog(1, NULL, 0);
-@@ -980,6 +986,27 @@
- }
- 
- 
-+static int drop_root(void)
-+{
-+	struct passwd *pw;
-+
-+	if (!(pw = getpwnam(server_user))) return -1;
-+
-+	if (!pw->pw_uid) return -1;
-+
-+	if (chroot_dir) {
-+		if (chroot(chroot_dir)) return -1;
-+		if (chdir("/")) return -1;
-+	}
-+
-+	if (setgroups(0, NULL)) return -1;
-+	if (setgid(pw->pw_gid)) return -1;
-+	if (setuid(pw->pw_uid)) return -1;
-+
-+	return 0;
-+}
-+
-+
- int main(argc, argv)
- 
- 	int argc;
-@@ -997,7 +1024,7 @@
- 	chdir ("/");
- #endif
- 	/* Parse the command-line. */
--	while ((ch = getopt(argc, argv, "c:df:iIk:nopsvx2")) != EOF)
-+	while ((ch = getopt(argc, argv, "c:df:u:j:iIk:nopsvx2")) != EOF)
- 		switch((char)ch)
- 		{
- 		    case '2':		/* Print lines with symbols twice. */
-@@ -1019,6 +1046,10 @@
- 		    case 'I':
- 			SignalDaemon(SIGUSR2);
- 			return(0);
-+		    case 'j':		/* chroot 'j'ail */
-+			chroot_dir = optarg;
-+			log_flags |= LOG_NDELAY;
-+			break;
- 		    case 'k':		/* Kernel symbol file. */
- 			symfile = optarg;
- 			break;
-@@ -1034,6 +1065,9 @@
- 		    case 's':		/* Use syscall interface. */
- 			use_syscall = 1;
- 			break;
-+		    case 'u':		/* Run as this user */
-+			server_user = optarg;
-+			break;
- 		    case 'v':
- 			printf("klogd %s.%s\n", VERSION, PATCHLEVEL);
- 			exit (1);
-@@ -1042,6 +1076,10 @@
- 			break;
- 		}
- 
-+	if (chroot_dir && !server_user) {
-+		fputs("'-j' is only valid with '-u'", stderr);
-+		exit(1);
-+	}
- 
- 	/* Set console logging level. */
- 	if ( log_level != (char *) 0 )
-@@ -1139,7 +1177,7 @@
- 		}
- 	}
- 	else
--		openlog("kernel", 0, LOG_KERN);
-+		openlog("kernel", log_flags, LOG_KERN);
- 
- 
- 	/* Handle one-shot logging. */
-@@ -1166,6 +1204,11 @@
- 		InitMsyms();
- 	}
- 
-+	if (server_user && drop_root()) {
-+		syslog(LOG_ALERT, "klogd: failed to drop root");
-+		Terminate();
-+	}
-+
-         /* The main loop. */
- 	while (1)
- 	{
diff --git a/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-bind.diff b/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-bind.diff
deleted file mode 100644
index e79a67d0b..000000000
--- a/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-bind.diff
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -ur sysklogd-1.4.1.orig/sysklogd.8 sysklogd-1.4.1/sysklogd.8
---- sysklogd-1.4.1.orig/sysklogd.8	Sun Mar 11 22:35:51 2001
-+++ sysklogd-1.4.1/sysklogd.8	Mon Oct  8 07:20:31 2001
-@@ -15,6 +15,9 @@
- .I config file
- ]
- .RB [ " \-h " ] 
-+.RB [ " \-i "
-+.I IP address
-+]
- .RB [ " \-l "
- .I hostlist
- ]
-@@ -103,8 +106,15 @@
- Specifying this switch on the command line will cause the log daemon to
- forward any remote messages it receives to forwarding hosts which have been
- defined.
- This can cause syslog loops that fill up hard disks quite fast and
- thus needs to be used with caution.
-+.TP
-+.BI "\-i " "IP address"
-+If
-+.B syslogd
-+is configured to accept log input from a UDP port, specify an IP address
-+to bind to, rather than the default of INADDR_ANY.  The address must be in
-+dotted quad notation, DNS host names are not allowed.
- .TP
- .BI "\-l " "hostlist"
- Specify a hostname that should be logged only with its simple hostname
-diff -ur sysklogd-1.4.1.orig/syslogd.c sysklogd-1.4.1/syslogd.c
---- sysklogd-1.4.1.orig/syslogd.c	Sun Mar 11 22:40:10 2001
-+++ sysklogd-1.4.1/syslogd.c	Mon Oct  8 07:24:41 2001
-@@ -736,6 +736,8 @@
- int	NoHops = 1;		/* Can we bounce syslog messages through an
- 				   intermediate host. */
- 
-+char	*bind_addr = NULL;	/* bind UDP port to this interface only */
-+
- extern	int errno;
- 
- /* Function prototypes. */
-@@ -829,7 +831,7 @@
- 		funix[i]  = -1;
- 	}
- 
--	while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:v")) != EOF)
-+	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF)
- 		switch((char)ch) {
- 		case 'a':
- 			if (nfunix < MAXFUNIX)
-@@ -846,9 +848,17 @@
- 		case 'h':
- 			NoHops = 0;
- 			break;
-+		case 'i':
-+			if (bind_addr) {
-+				fprintf(stderr, "Only one -i argument allowed, "
-+					"the first one is taken.\n");
-+				break;
-+			}
-+			bind_addr = optarg;
-+			break;
- 		case 'l':
- 			if (LocalHosts) {
--				fprintf (stderr, "Only one -l argument allowed," \
-+				fprintf(stderr, "Only one -l argument allowed, "
- 					"the first one is taken.\n");
- 				break;
- 			}
-@@ -1175,7 +1185,7 @@
- int usage()
- {
- 	fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
--		" [-s domainlist] [-f conffile]\n");
-+		" [-s domainlist] [-f conffile] [-i IP address]\n");
- 	exit(1);
- }
- 
-@@ -1217,15 +1227,22 @@
- 	int fd, on = 1;
- 	struct sockaddr_in sin;
- 
-+	memset(&sin, 0, sizeof(sin));
-+	sin.sin_family = AF_INET;
-+	sin.sin_port = LogPort;
-+	if (bind_addr) {
-+		if (!inet_aton(bind_addr, &sin.sin_addr)) {
-+			logerror("syslog: not a valid IP address to bind to.");
-+			return -1;
-+		}
-+	}
-+
- 	fd = socket(AF_INET, SOCK_DGRAM, 0);
- 	if (fd < 0) {
- 		logerror("syslog: Unknown protocol, suspending inet service.");
- 		return fd;
- 	}
- 
--	memset(&sin, 0, sizeof(sin));
--	sin.sin_family = AF_INET;
--	sin.sin_port = LogPort;
- 	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, \
- 		       (char *) &on, sizeof(on)) < 0 ) {
- 		logerror("setsockopt(REUSEADDR), suspending inet");
diff --git a/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff b/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff
deleted file mode 100644
index b5813c1d2..000000000
--- a/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -ur sysklogd-1.4.1-caen-owl-syslogd-bind/sysklogd.8 sysklogd-1.4.1/sysklogd.8
---- sysklogd-1.4.1-caen-owl-syslogd-bind/sysklogd.8	Mon Oct  8 07:26:27 2001
-+++ sysklogd-1.4.1/sysklogd.8	Mon Oct  8 07:30:31 2001
-@@ -32,6 +32,9 @@
- .RB [ " \-s "
- .I domainlist
- ]
-+.RB [ " \-u"
-+.IB username
-+]
- .RB [ " \-v " ]
- .LP
- .SH DESCRIPTION
-@@ -159,6 +162,19 @@
- is specified and the host logging resolves to satu.infodrom.north.de
- no domain would be cut, you will have to specify two domains like:
- .BR "\-s north.de:infodrom.north.de" .
-+.TP
-+.BI "\-u " "username"
-+This causes the
-+.B syslogd
-+daemon to become the named user before starting up logging.
-+
-+Note that when this option is in use,
-+.B syslogd
-+will open all log files as root when the daemon is first started;
-+however, after a
-+.B SIGHUP
-+the files will be reopened as the non-privileged user.  You should
-+take this into account when deciding the ownership of the log files.
- .TP
- .B "\-v"
- Print version and exit.
-diff -ur sysklogd-1.4.1-caen-owl-syslogd-bind/syslogd.c sysklogd-1.4.1/syslogd.c
---- sysklogd-1.4.1-caen-owl-syslogd-bind/syslogd.c	Mon Oct  8 07:26:27 2001
-+++ sysklogd-1.4.1/syslogd.c	Mon Oct  8 07:40:35 2001
-@@ -491,6 +491,10 @@
- #include <arpa/nameser.h>
- #include <arpa/inet.h>
- #include <resolv.h>
-+
-+#include <pwd.h>
-+#include <grp.h>
-+
- #ifndef TESTING
- #include "pidfile.h"
- #endif
-@@ -737,6 +741,7 @@
- 				   intermediate host. */
- 
- char	*bind_addr = NULL;	/* bind UDP port to this interface only */
-+char	*server_user = NULL;	/* user name to run server as */
- 
- extern	int errno;
- 
-@@ -778,6 +783,21 @@
- static int create_inet_socket();
- #endif
- 
-+static int drop_root(void)
-+{
-+	struct passwd *pw;
-+
-+	if (!(pw = getpwnam(server_user))) return -1;
-+
-+	if (!pw->pw_uid) return -1;
-+
-+	if (initgroups(server_user, pw->pw_gid)) return -1;
-+	if (setgid(pw->pw_gid)) return -1;
-+	if (setuid(pw->pw_uid)) return -1;
-+
-+	return 0;
-+}
-+
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-@@ -831,7 +851,7 @@
- 		funix[i]  = -1;
- 	}
- 
--	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF)
-+	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:u:v")) != EOF)
- 		switch((char)ch) {
- 		case 'a':
- 			if (nfunix < MAXFUNIX)
-@@ -884,6 +904,9 @@
- 			}
- 			StripDomains = crunch_list(optarg);
- 			break;
-+		case 'u':
-+			server_user = optarg;
-+			break;
- 		case 'v':
- 			printf("syslogd %s.%s\n", VERSION, PATCHLEVEL);
- 			exit (0);
-@@ -1031,6 +1054,11 @@
- 		kill (ppid, SIGTERM);
- #endif
- 
-+	if (server_user && drop_root()) {
-+		dprintf("syslogd: failed to drop root\n");
-+		exit(1);
-+	}
-+
- 	/* Main loop begins here. */
- 	for (;;) {
- 		int nfds;
-@@ -1185,7 +1213,7 @@
- int usage()
- {
- 	fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
--		" [-s domainlist] [-f conffile] [-i IP address]\n");
-+		" [-s domainlist] [-f conffile] [-i IP address] [-u username]\n");
- 	exit(1);
- }
- 
diff --git a/extra/sysklogd/sysklogd-1.5-syslog-func-collision.patch b/extra/sysklogd/sysklogd-1.5-syslog-func-collision.patch
deleted file mode 100644
index 76912a265..000000000
--- a/extra/sysklogd/sysklogd-1.5-syslog-func-collision.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-http://bugs.gentoo.org/342601
-
-rename local "syslog" and "vsyslog" functions to avoid conflicts with glibc's
-
-patch by Dmitriy Matrosov
-
---- sysklogd-1.5/klogd.c
-+++ sysklogd-1.5/klogd.c
-@@ -258,7 +262,6 @@
- #if !defined(__GLIBC__)
- #include <linux/time.h>
- #endif /* __GLIBC__ */
--#include <stdarg.h>
- #include <paths.h>
- #include <stdlib.h>
- #include <pwd.h>
-@@ -637,7 +640,7 @@
- 			}
- 			argl += 3;
- 		}
--		syslog(priority, fmt, argl);
-+		syslog_own(priority, fmt, argl);
- 		va_end(ap);
- #ifdef TESTING
- 		putchar('\n');
-@@ -646,7 +649,7 @@
- 	}
- 
- 	va_start(ap, fmt);
--	vsyslog(priority, fmt, ap);
-+	vsyslog_own(priority, fmt, ap);
- 	va_end(ap);
- #ifdef TESTING
- 	printf ("\n");
-@@ -1205,7 +1208,7 @@
- 	}
- 
- 	if (server_user && drop_root()) {
--		syslog(LOG_ALERT, "klogd: failed to drop root");
-+		syslog_own(LOG_ALERT, "klogd: failed to drop root");
- 		Terminate();
- 	}
- 
---- sysklogd-1.5/klogd.h
-+++ sysklogd-1.5/klogd.h
-@@ -24,6 +24,7 @@
- #include <stdio.h>
- #include <syslog.h>
- #include <string.h>
-+#include <stdarg.h>
- 
- 
- /* Function prototypes. */
-@@ -38,3 +43,5 @@
- extern char * ExpandKadds(char *, char *);
- extern void SetParanoiaLevel(int);
- extern void Syslog(int priority, char *fmt, ...);
-+extern void syslog_own(int, const char *, ...);
-+extern void vsyslog_own(int, const char *, va_list);
---- sysklogd-1.5/ksym_mod.c
-+++ sysklogd-1.5/ksym_mod.c
-@@ -95,7 +98,6 @@
- #if !defined(__GLIBC__)
- #include <linux/time.h>
- #endif /* __GLIBC__ */
--#include <stdarg.h>
- #include <paths.h>
- #include <linux/version.h>
- 
---- sysklogd-1.5/syslog.c
-+++ sysklogd-1.5/syslog.c
-@@ -75,6 +79,10 @@
- 
- #define	_PATH_LOGNAME	"/dev/log"
- 
-+
-+void syslog_own(int, const char *, ...);
-+void vsyslog_own(int, const char *, va_list);
-+
- static int	LogFile = -1;		/* fd for log */
- static int	connected;		/* have done connect */
- static int	LogStat = 0;		/* status bits, set by openlog() */
-@@ -82,17 +90,17 @@
- static int	LogFacility = LOG_USER;	/* default facility code */
- 
- void
--syslog(int pri, const char *fmt, ...)
-+syslog_own(int pri, const char *fmt, ...)
- {
- 	va_list ap;
- 
- 	va_start(ap, fmt);
--	vsyslog(pri, fmt, ap);
-+	vsyslog_own(pri, fmt, ap);
- 	va_end(ap);
- }
- 
- void
--vsyslog(pri, fmt, ap)
-+vsyslog_own(pri, fmt, ap)
- 	int pri;
- 	const char *fmt;
- 	va_list ap;
diff --git a/extra/sysklogd/syslog.conf b/extra/sysklogd/syslog.conf
deleted file mode 100644
index 7b0eae2e2..000000000
--- a/extra/sysklogd/syslog.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# /etc/syslog.conf
-#
-
-*.emerg						*
-*.err						/var/log/errors
-kern.*						/var/log/kernel
-authpriv.*;auth.*				/var/log/auth
-mail.*						/var/log/mail
-*.info;*.!err;authpriv,auth,mail,kern.none	/var/log/messages
-
-# Log everything to vc12
-# *.*						/dev/vc/12
-
-# End of file
diff --git a/extra/sysklogd/syslog.logrotate b/extra/sysklogd/syslog.logrotate
deleted file mode 100644
index b3d8d8552..000000000
--- a/extra/sysklogd/syslog.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/messages /var/log/auth /var/log/mail /var/log/errors /var/log/kernel {
-    sharedscripts
-    postrotate
-	    /bin/kill -HUP `cat /var/run/syslogd.pid 2>/dev/null` 2> /dev/null || true
-    endscript
-}
diff --git a/extra/sysklogd/syslogd b/extra/sysklogd/syslogd
deleted file mode 100755
index 24c81ec8a..000000000
--- a/extra/sysklogd/syslogd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/syslogd`
-case "$1" in
-  start)
-    stat_busy "Starting System Logger"
-    [ -z "$PID" ] && /usr/sbin/syslogd -m 0
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon syslogd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping System Logger"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/syslogd.pid
-      rm_daemon syslogd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index 0c5bfaece..5b3649cce 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 169045 2012-10-17 10:21:29Z allan $
+# $Id: PKGBUILD 171248 2012-11-16 22:37:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=system-config-printer
 pkgname=('system-config-printer-common'
          'system-config-printer-gnome')
-pkgver=1.3.11
-pkgrel=2
+pkgver=1.3.12
+pkgrel=1
 pkgdesc="A CUPS printer configuration tool and status applet"
 url="http://cyberelk.net/tim/software/system-config-printer/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ license=('GPL')
 makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl'
              'libusb-compat' 'desktop-file-utils')
 source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig})
-md5sums=('081fde89686ee15a9433c0035f5faed0'
-         '470964eb627af31f2aff9967a4b9a5bb')
+md5sums=('0775647e1c34ef25364de3c178a4ed36'
+         '1aa2246047b424e2d23473749368b8c6')
 
 build() {
   cd "${srcdir}"/${pkgbase}-${pkgver}
@@ -65,6 +65,12 @@ package_system-config-printer-common() {
   install -m644 dbus/com.redhat.NewPrinterNotification.conf \
     dbus/com.redhat.PrinterDriversInstaller.conf \
     "${pkgdir}"/etc/dbus-1/system.d/
+
+  install -d "${pkgdir}"/usr/share/dbus-1/{services,interfaces}
+  install -m644 dbus/org.fedoraproject.Config.Printing.service \
+    "${pkgdir}"/usr/share/dbus-1/services/
+  install -m644 dbus/org.fedoraproject.Config.Printing.xml \
+    "${pkgdir}"/usr/share/dbus-1/interfaces/
   install -d "${pkgdir}"/etc/cupshelpers/
   install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/
 
@@ -104,5 +110,6 @@ package_system-config-printer-gnome() {
   rm -r "${pkgdir}"/etc/dbus-1/
   rm -r "${pkgdir}"/etc/cupshelpers/
   rm -r "${pkgdir}"/etc/udev/
+  rm -r "${pkgdir}"/usr/share/dbus-1/
   rm -r "${pkgdir}"/usr/lib/
 }
diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD
index 1016c4ba2..cd0325489 100644
--- a/extra/tcl/PKGBUILD
+++ b/extra/tcl/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 164387 2012-08-01 01:21:35Z allan $
+# $Id: PKGBUILD 170721 2012-11-10 04:48:01Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=tcl
-pkgver=8.5.12
+pkgver=8.5.13
 pkgrel=1
 pkgdesc="The Tcl scripting language"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tcl.sourceforge.net/"
 license=('custom')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
-md5sums=('174b2b4c619ba8f96875d8a051917703')
+md5sums=('fa3a9bf9b2d6ed2431f1baa46f4058b8')
 
 build() {
   cd ${srcdir}/tcl${pkgver}/unix
diff --git a/extra/tdb/PKGBUILD b/extra/tdb/PKGBUILD
index 32fbca389..4296640d6 100644
--- a/extra/tdb/PKGBUILD
+++ b/extra/tdb/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 149549 2012-02-08 14:00:43Z tpowa $
+# $Id: PKGBUILD 170223 2012-11-05 14:18:32Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=tdb
-pkgver=1.2.9
-pkgrel=2.1
-pkgdesc="A Trivia Database similar to GDBM but allows simultaneous commits"
+pkgver=1.2.10
+pkgrel=2
+pkgdesc="A Trivial Database similar to GDBM but allows simultaneous commits"
 arch=(i686 x86_64 'mips64el')
 license=('GPL3')
 url="http://tdb.samba.org/"
@@ -21,6 +21,7 @@ build() {
    # Use system docbook.xsl
    #_manstyle="/usr/share/xml/docbook/xsl-stylesheets-1.76.1/manpages/docbook.xsl"
    #sed -i "s#http.*xsl#$_manstyle#" tdb.mk
+   export PYTHON=/usr/bin/python2
    ./configure --prefix=/usr \
                --localstatedir=/var \
                --sysconfdir=/etc/samba
@@ -29,6 +30,7 @@ build() {
 
 package() {
    cd ${srcdir}/${pkgname}-${pkgver}
+   export PYTHON=/usr/bin/python2
    make DESTDIR=$pkgdir/ install
 }
-md5sums=('4d97d18bbe9040038d4e003495bb8cd1')
+md5sums=('cc28048309df19782b04359282e9f98b')
diff --git a/extra/telepathy-farstream/PKGBUILD b/extra/telepathy-farstream/PKGBUILD
index f0b269a09..1f0ac092c 100644
--- a/extra/telepathy-farstream/PKGBUILD
+++ b/extra/telepathy-farstream/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 156970 2012-04-23 09:10:17Z ibiru $
+# $Id: PKGBUILD 169977 2012-10-30 22:59:51Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=telepathy-farstream
-pkgver=0.4.0
+pkgver=0.6.0
 pkgrel=1
 pkgdesc="A telepathy-backend to use stream engine."
 arch=(i686 x86_64 mips64el)
 url="http://telepathy.freedesktop.org"
 license=('LGPL2.1')
 depends=('telepathy-glib' 'farstream')
-makedepends=('libxslt' 'gstreamer0.10-python' 'python2-gobject2')
+makedepends=('dbus-glib' 'gobject-introspection')
 conflicts=('telepathy-farsight')
 replaces=('telepathy-farsight')
 options=('!libtool')
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('52d110f8a9f27bce0a6c2c07e18aee56')
+md5sums=('d154350f9f1e3bdba87617c0668481a5')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD
index d871e6679..915f7c4c1 100644
--- a/extra/telepathy-gabble/PKGBUILD
+++ b/extra/telepathy-gabble/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165360 2012-08-16 12:35:13Z ibiru $
+# $Id: PKGBUILD 169978 2012-10-30 22:59:56Z heftig $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Daniel Balieiro <daniel@balieiro.com>
 # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org>
 pkgname=telepathy-gabble
-pkgver=0.16.2
+pkgver=0.17.1
 pkgrel=1
 pkgdesc="A Jabber/XMPP connection manager for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('libxslt' 'python2')
 options=('!libtool' '!emptydirs')
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
 install=telepathy-gabble.install
-md5sums=('d79fc12524e9b68e9a1a833960f97d01')
+md5sums=('42e01fdc4117255080883495411e7318')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD
index efbd46530..8dbc3192f 100644
--- a/extra/telepathy-glib/PKGBUILD
+++ b/extra/telepathy-glib/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165356 2012-08-16 11:08:48Z ibiru $
+# $Id: PKGBUILD 170731 2012-11-10 15:25:09Z ibiru $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 
 pkgname=telepathy-glib
-pkgver=0.18.2
+pkgver=0.20.1
 pkgrel=1
 pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 depends=('dbus-glib')
 makedepends=('libxslt' 'vala' 'gobject-introspection')
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('034ec8e4c3a60d4ba1da67952ef3ee2f')
+md5sums=('780034ff7433f33e6577b02fd7a2cb0a')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/extra/telepathy-idle/PKGBUILD b/extra/telepathy-idle/PKGBUILD
index b49458f7f..973bc8c69 100644
--- a/extra/telepathy-idle/PKGBUILD
+++ b/extra/telepathy-idle/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165358 2012-08-16 11:39:38Z ibiru $
+# $Id: PKGBUILD 171097 2012-11-16 17:07:10Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 # Contributor: Samuel Mendes <heka.lok@gmail.com>
 
 pkgname=telepathy-idle
-pkgver=0.1.12
+pkgver=0.1.14
 pkgrel=1
 pkgdesc="An IRC connection manager for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,9 +14,8 @@ license=('LGPL')
 depends=('telepathy-glib' 'openssl')
 makedepends=('libxslt' 'python2')
 install=telepathy-idle.install
-options=(!makeflags)
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('e77e5b84cc8f77cf12d15727c30df366')
+md5sums=('c292c54aa08f61544ab53fda880d861c')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD
index 5e21916af..93de23287 100644
--- a/extra/telepathy-kde-auth-handler/PKGBUILD
+++ b/extra/telepathy-kde-auth-handler/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 168038 2012-10-05 14:00:52Z andrea $
+# $Id: PKGBUILD 171961 2012-11-25 14:29:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-auth-handler
 _pkgname=ktp-auth-handler
 pkgver=0.5.1
-pkgrel=1
+pkgrel=2
 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"
diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD
index 1b8f6c055..105c44f09 100644
--- a/extra/telepathy-kde-text-ui/PKGBUILD
+++ b/extra/telepathy-kde-text-ui/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 168059 2012-10-05 14:07:08Z andrea $
+# $Id: PKGBUILD 170066 2012-10-31 13:33:12Z ibiru $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-text-ui
 _pkgname=ktp-text-ui
 pkgver=0.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Telepathy handler for Text Chats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
diff --git a/extra/telepathy-logger/PKGBUILD b/extra/telepathy-logger/PKGBUILD
index e7645f939..bd4516383 100644
--- a/extra/telepathy-logger/PKGBUILD
+++ b/extra/telepathy-logger/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 156978 2012-04-23 09:10:28Z ibiru $
+# $Id: PKGBUILD 170064 2012-10-31 13:30:17Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=telepathy-logger
-pkgver=0.4.0
+pkgver=0.6.0
 pkgrel=1
 pkgdesc="Telepathy framework logging daemon"
 arch=(i686 x86_64 'mips64el')
 url="http://telepathy.freedesktop.org/wiki/Logger"
 license=('LGPL2.1')
-depends=('telepathy-glib' 'sqlite3' 'libxml2' 'dconf')
+depends=('telepathy-glib' 'sqlite' 'libxml2' 'dconf')
 makedepends=('intltool' 'gnome-doc-utils' 'gobject-introspection')
 options=('!libtool')
 install=telepathy-logger.install
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('0b891b860c7f3a01926f5cc22fd26120')
+md5sums=('f453c49e53898c64bc423f0fdf117290')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD
index f9557b0ba..ccf3a5f7f 100644
--- a/extra/telepathy-mission-control/PKGBUILD
+++ b/extra/telepathy-mission-control/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 163824 2012-07-20 23:07:42Z ibiru $
+# $Id: PKGBUILD 169980 2012-10-30 23:00:04Z heftig $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Ju Liu <liuju86 at gmail dot com>
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 # Contributor: Andreas Zwinkau <beza1e1@web.de>
 
 pkgname=telepathy-mission-control
-pkgver=5.12.1
+pkgver=5.14.0
 pkgrel=1
 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org/wiki/Mission Control"
 license=('LGPL2.1')
-depends=('telepathy-glib' 'libgnome-keyring' 'dconf')
+depends=('telepathy-glib' 'libgnome-keyring' 'dconf' 'upower' 'networkmanager')
 makedepends=('libxslt' 'python2')
 install=telepathy-mission-control.install
 options=('!libtool')
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('79449fd2e1b02fc6cb5c6adc447e2bb6')
+md5sums=('483fa8860891815a540ecf1bb9155122')
 
 build() {
     cd "$pkgname-$pkgver"
diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD
index b94a42764..e411312a5 100644
--- a/extra/telepathy-qt/PKGBUILD
+++ b/extra/telepathy-qt/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 163541 2012-07-15 10:41:34Z andrea $
+# $Id: PKGBUILD 171095 2012-11-16 16:58:51Z andrea $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-qt
 pkgver=0.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for Qt-based Telepathy clients"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org/wiki/"
 license=('LGPL')
 options=('!libtool')
-depends=('qt' 'telepathy-farstream')
+depends=('qt' 'telepathy-glib')
+#depends=('qt' 'telepathy-farstream')
 makedepends=('libxslt' 'python2' 'cmake' 'doxygen')
 conflicts=('telepathy-qt4')
 replaces=('telepathy-qt4')
diff --git a/extra/telepathy-salut/PKGBUILD b/extra/telepathy-salut/PKGBUILD
index c3309d05d..bf536dc01 100644
--- a/extra/telepathy-salut/PKGBUILD
+++ b/extra/telepathy-salut/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 156984 2012-04-23 09:10:36Z ibiru $
+# $Id: PKGBUILD 171114 2012-11-16 17:14:40Z ibiru $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Daniel Balieiro <daniel@balieiro.com>
 
 pkgname=telepathy-salut
-pkgver=0.8.0
+pkgver=0.8.1
 pkgrel=1
 pkgdesc="A link-local XMPP connection manager for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org"
 groups=('telepathy')
 license=('LGPL')
-depends=('telepathy-glib' 'avahi' 'libsoup' 'sqlite3')
+depends=('telepathy-glib' 'avahi' 'libsoup' 'sqlite3' 'util-linux')
 makedepends=('libxslt' 'python2' 'xmldiff')
 install=telepathy-salut.install
 options=(!libtool)
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('43639c23de33e8466540de02816d23bf')
+md5sums=('7516e6f6fa56a61054413a03642b938d')
 
 build() {
     cd "$pkgname-$pkgver"
diff --git a/extra/testdisk/PKGBUILD b/extra/testdisk/PKGBUILD
index aa8ab9acc..ab41368ca 100644
--- a/extra/testdisk/PKGBUILD
+++ b/extra/testdisk/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 149731 2012-02-09 19:52:20Z ibiru $
+# $Id: PKGBUILD 170219 2012-11-05 14:04:00Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Michal Krenek <mikos@sg1.cz>
 
 pkgname=testdisk
 pkgver=6.13
-pkgrel=2
+pkgrel=3
 pkgdesc="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cgsecurity.org/index.html?testdisk.html"
diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD
index faf0bcdf1..a85383f60 100644
--- a/extra/texmacs/PKGBUILD
+++ b/extra/texmacs/PKGBUILD
@@ -1,32 +1,42 @@
-# $Id: PKGBUILD 154990 2012-04-01 08:33:19Z ronald $
+# $Id: PKGBUILD 171430 2012-11-17 14:28:35Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+# Contributor: Christopher Reimer <c.reimer1993@gmail.com>
 
 pkgname=texmacs
-pkgver=1.0.7.15
-pkgrel=1.1
+pkgver=1.0.7.16
+pkgrel=1
 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor TeX-fonts and CAS-interface (Giac, GTybalt, Macaulay 2, Maxima, Octave, Pari, Qcl, R and Yacas) in one."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.texmacs.org/"
 license=('GPL')
-depends=('perl' 'guile' 'texlive-core' 'python2' 'libxext' 'freetype2' 'shared-mime-info' 'desktop-file-utils')
+depends=('perl' 'guile' 'texlive-core' 'python2' 'libxext' 'freetype2' 'shared-mime-info'
+         'desktop-file-utils' 'qt')
 # do not remove texlive-core dependency, as it is needed!
-optdepends=('transfig: convert images using fig2ps' 'awk: conversion of some files')
+optdepends=('transfig: convert images using fig2ps'
+            'gawk: conversion of some files')
 #source=(ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-${pkgver}-src.tar.gz)
 source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${pkgver}-src.tar.gz)
 install=texmacs.install
-sha1sums=('d75d55fcf0c06bf7fd5d9afd1031b9cf8413cbd3')
+options=('!emptydirs')
+sha1sums=('bd73a8ff1c5361161cc65c57dfe8e706a1859231')
 
 build() {
   cd ${srcdir}/TeXmacs-${pkgver}-src
   sed -i 's/env python/env python2/' \
-    plugins/{mathematica/bin/realpath.py,python/bin/tm_python,sage/bin/tm_sage}
+    plugins/{mathematica/bin/realpath.py,python/bin/tm_python,sage/bin/tm_sage} \
+    TeXmacs/misc/inkscape_plugin/texmacs_reedit.py
   sed -i 's/"python"/"python2"/' plugins/python/progs/init-python.scm
   sed -i '/^LDPATH/d' src/makefile.in
+
+ # Don't generate icon-cache and mime-database (namcap tells that they should not be in a package)
+  sed -i '/update-mime-database/d' Makefile.in
+  sed -i '/gtk-update-icon-cache/d' Makefile.in
+  sed -i '\/icons\/gnome 2>\/dev\/null/d' Makefile.in
+
   ./configure --prefix=/usr \
               --mandir=/usr/share/man \
-              --libexecdir=/usr/lib \
-	      --disable-qt
+              --libexecdir=/usr/lib
   make
 }
 
diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD
index c91706a49..f7ac04f41 100644
--- a/extra/thunar/PKGBUILD
+++ b/extra/thunar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 159694 2012-05-26 04:30:08Z foutrelis $
+# $Id: PKGBUILD 172467 2012-12-03 11:50:24Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
 pkgname=thunar
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.6.0
+pkgrel=1
 pkgdesc="Modern file manager for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://thunar.xfce.org"
@@ -22,19 +22,12 @@ optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems
             'thunar-media-tags-plugin: view/edit id3/ogg tags')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/1.4/Thunar-$pkgver.tar.bz2
-        thunar-1.4.0-show-loop-devices-hack.patch)
-sha256sums=('2c11a19e64cef708a264fb4d5d933389899c3d132fe7b1e313dd6e37bfe4c8ba'
-            '185c44db9bdf578d22cb69b81dce7fcc3e2ee6031b1547de6453ff0752dbc97e')
+source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2)
+sha256sums=('354897fbde4d3f089c06c38b57816f455c2907806725906426440e1084c1d63a')
 
 build() {
   cd "$srcdir/Thunar-$pkgver"
 
-  # Fix: Loop devices not appearing in Thunar side pane
-  # https://bugs.archlinux.org/task/29894
-  # https://bugzilla.xfce.org/show_bug.cgi?id=8947
-  patch -Np1 -i "$srcdir/thunar-1.4.0-show-loop-devices-hack.patch"
-
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/extra/thunar/thunar-1.4.0-dont-add-duplicates-of-devices.patch b/extra/thunar/thunar-1.4.0-dont-add-duplicates-of-devices.patch
new file mode 100644
index 000000000..ee8636392
--- /dev/null
+++ b/extra/thunar/thunar-1.4.0-dont-add-duplicates-of-devices.patch
@@ -0,0 +1,59 @@
+diff -uprb Thunar-1.4.0.orig/thunar/thunar-shortcuts-model.c Thunar-1.4.0/thunar/thunar-shortcuts-model.c
+--- Thunar-1.4.0.orig/thunar/thunar-shortcuts-model.c	2012-11-03 07:42:39.000000000 +0200
++++ Thunar-1.4.0/thunar/thunar-shortcuts-model.c	2012-11-03 08:13:25.000000000 +0200
+@@ -1221,11 +1221,25 @@ thunar_shortcuts_model_volume_added (GVo
+                                      GVolume              *volume,
+                                      ThunarShortcutsModel *model)
+ {
++  GList *lp;
++  gint  idx;
++
+   _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor));
+   _thunar_return_if_fail (model->volume_monitor == volume_monitor);
+   _thunar_return_if_fail (G_IS_VOLUME (volume));
+   _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
+ 
++  /* check that the volume is not in the internal list already */
++  if (g_list_find (model->hidden_volumes, volume) != NULL)
++    return;
++
++  /* nor in the list of visible volumes */
++  for (idx = 0, lp = model->shortcuts; lp != NULL; ++idx, lp = lp->next)
++    {
++      if (THUNAR_SHORTCUT (lp->data)->volume == volume)
++        return;
++    }
++
+   /* place the volume on the hidden list */
+   model->hidden_volumes = g_list_prepend (model->hidden_volumes, g_object_ref (volume));
+ 
+diff -uprb Thunar-1.4.0.orig/thunar/thunar-tree-model.c Thunar-1.4.0/thunar/thunar-tree-model.c
+--- Thunar-1.4.0.orig/thunar/thunar-tree-model.c	2012-11-03 07:42:39.000000000 +0200
++++ Thunar-1.4.0/thunar/thunar-tree-model.c	2012-11-03 08:09:36.000000000 +0200
+@@ -1127,11 +1127,26 @@ thunar_tree_model_volume_added (GVolumeM
+                                 GVolume                *volume,
+                                 ThunarTreeModel        *model)
+ {
++  ThunarTreeModelItem *item = NULL;
++  GNode               *node;
++
+   _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor));
+   _thunar_return_if_fail (model->volume_monitor == volume_monitor);
+   _thunar_return_if_fail (G_IS_VOLUME (volume));
+   _thunar_return_if_fail (THUNAR_IS_TREE_MODEL (model));
+ 
++  /* check that the volume is not in the internal list already */
++  if (g_list_find (model->hidden_volumes, volume) != NULL)
++    return;
++
++  /* nor in the list of visible volumes */
++  for (node = model->root->children; node != NULL; node = node->next)
++    {
++      item = THUNAR_TREE_MODEL_ITEM (node->data);
++      if (item->volume == volume)
++        return;
++    }
++
+   /* place the volume on the hidden list */
+   model->hidden_volumes = g_list_prepend (model->hidden_volumes, g_object_ref (volume));
+ 
diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD
index 1f13b1b6a..1dce45686 100644
--- a/extra/tk/PKGBUILD
+++ b/extra/tk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164388 2012-08-01 01:21:39Z allan $
+# $Id: PKGBUILD 170723 2012-11-10 04:52:11Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=tk
-pkgver=8.5.12
+pkgver=8.5.13
 pkgrel=1
 pkgdesc="A windowing toolkit for use with tcl"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url="http://tcl.sourceforge.net/"
 license=('custom')
 depends=("tcl=${pkgver}" 'libxss' 'libxft')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz)
-md5sums=('a01640176845c1f654a412cfc9bab13b')
+md5sums=('1fc7dbb7495160756dbc805224afa360')
 
 build() {
   cd ${srcdir}/tk${pkgver}/unix
diff --git a/extra/tomboy/PKGBUILD b/extra/tomboy/PKGBUILD
index 7382964c3..ffda1b338 100644
--- a/extra/tomboy/PKGBUILD
+++ b/extra/tomboy/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 159073 2012-05-15 11:45:24Z heftig $
+# $Id: PKGBUILD 170922 2012-11-13 02:13:42Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=tomboy
-pkgver=1.10.2
+pkgver=1.12.2
 pkgrel=1
 pkgdesc="Desktop note-taking application for Linux and Unix"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org/projects/tomboy/"
 depends=('gtk2' 'gtkspell' 'gconf' 'gconf-sharp' 'dbus-sharp' 'dbus-sharp-glib' 'mono-addins' 'hicolor-icon-theme')
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs' '!makeflags')
 groups=('gnome-extra')
 install=tomboy.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b118ad9fbbd6134e00a56f0c251586464afbbd6b9e12265c7de979ed8ef78213')
+sha256sums=('ebcb23efb8eedc949eb84d4b5c9919ddaacc97198384f79ed08e97092c46e55e')
 
 build() {
   export MONO_SHARED_DIR="$srcdir/.wabi"
diff --git a/extra/tomcat/PKGBUILD b/extra/tomcat/PKGBUILD
deleted file mode 100644
index a1bba1b67..000000000
--- a/extra/tomcat/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 138508 2011-09-26 12:20:21Z guillaume $
-# Maintainer: Guillaume ALAUX <guillaume at archlinux dot org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-pkgname=tomcat
-pkgver=5.5.34
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-pkgdesc="Servlet-2.4/JSP-2.0 Container"
-url="http://tomcat.apache.org/"
-license=('APACHE')
-depends=('java-environment')
-makedepends=('openjdk6')
-backup=('opt/tomcat/conf/server.xml' 'opt/tomcat/conf/tomcat-users.xml' 'etc/conf.d/tomcat')
-install=tomcat.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-	'tomcat'
-	'tomcat.conf.d')
-md5sums=('d09a09bc84409510574a673d35939f16'
-         '20e6a8e89a148e2b0ac81ca03ceea6b1'
-         '368322d8a51ce20cc5dbdb505706a16a')
-
-build() {
-  unset LDFLAGS
-  # build jsvc
-  cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
-  tar xzf commons-daemon-native.tar.gz
-  cd commons-daemon-1.0.7-native-src/unix
-  sh configure --with-java=/usr/lib/jvm/java-6-openjdk
-  make clean
-  make
-  cp jsvc ../..
-}
-
-package() {
-  cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
-  # get rid of some cruft
-  cd ${srcdir}/apache-${pkgname}-${pkgver}
-  rm -f LICENSE NOTICE RELEASE-NOTES RUNNING.txt
-  rm -fr bin/*.exe bin/*.bat bin/*.tar.gz bin/jsvc-src
-
-  # install everything
-  mkdir -p ${pkgdir}/opt/tomcat
-  cp -R * ${pkgdir}/opt/tomcat
-  install -D -m755 ${srcdir}/tomcat ${pkgdir}/etc/rc.d/tomcat
-  install -D -m644 ${srcdir}/tomcat.conf.d ${pkgdir}/etc/conf.d/tomcat
-  chgrp -R 66 ${pkgdir}/opt/tomcat/{conf,work,webapps,logs}
-  chmod 0660 ${pkgdir}/opt/tomcat/conf/{*.xml,*.policy,*.properties,/Catalina/localhost/*.xml}
-  chmod 775 ${pkgdir}/opt/tomcat/{conf,work,webapps,logs}
-}
diff --git a/extra/tomcat/tomcat b/extra/tomcat/tomcat
deleted file mode 100755
index 43116783d..000000000
--- a/extra/tomcat/tomcat
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-[ -f /etc/conf.d/tomcat ] && . /etc/conf.d/tomcat
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting Tomcat"
-    /opt/tomcat/bin/jsvc \
-      -user tomcat \
-      -home $TOMCAT_JAVA_HOME \
-      -Dcatalina.home=/opt/tomcat \
-      -Dcatalina.base=/opt/tomcat \
-      -Djava.io.tmpdir=/opt/tomcat/temp \
-      -wait 10 \
-      -pidfile /var/run/tomcat.pid \
-      -errfile /opt/tomcat/logs/catalina.log \
-      $CATALINA_OPTS \
-      -cp $TOMCAT_JAVA_HOME/lib/tools.jar:/opt/tomcat/bin/commons-daemon.jar:/opt/tomcat/bin/bootstrap.jar \
-      org.apache.catalina.startup.Bootstrap
-
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon tomcat
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Tomcat"
-    /opt/tomcat/bin/jsvc \
-      -stop \
-      -pidfile /var/run/tomcat.pid \
-      org.apache.catalina.startup.Bootstrap
-
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon tomcat
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/tomcat/tomcat.conf.d b/extra/tomcat/tomcat.conf.d
deleted file mode 100644
index aed805cd3..000000000
--- a/extra/tomcat/tomcat.conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-# The JAVA_HOME of the JVM for Tomcat to use
-TOMCAT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
-
-# Tomcat additional commandline options
-CATALINA_OPTS=
diff --git a/extra/tomcat/tomcat.install b/extra/tomcat/tomcat.install
deleted file mode 100644
index 9f7c21d38..000000000
--- a/extra/tomcat/tomcat.install
+++ /dev/null
@@ -1,36 +0,0 @@
-post_install() {
-  getent group tomcat >/dev/null 2>&1 || groupadd -g 66 tomcat
-  getent passwd tomcat >/dev/null 2>&1 || useradd -u 66 -g tomcat -d /opt/tomcat -s /bin/false tomcat
-
-  if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then
-    echo ">>> It appears that your current kernel has linux security"
-    echo ">>> capabilities built as a module. Tomcat requires this"
-    echo ">>> functionality to operate."
-    echo ">>>"
-    echo ">>> To activate the module, please load it now (modprobe capability)."
-    echo ">>> Also, you should add it to your MODULES array in rc.conf, so"
-    echo ">>> it will be activated automatically at boot-up."
-  fi
-
-  echo ""
-  echo "== End of life for Apache Tomcat 5.5.x =="
-  echo "The Apache Tomcat team announces that support for Apache Tomcat 5.5.x"
-  echo "will end on 30 September 2012."
-  echo ""
-  echo "You are thus strongly encouraged to migrate to tomcat6 or tomcat7"
-  echo ""
-  echo "See the Arch Linux wiki page for tomcat for more information."
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  if getent passwd tomcat >/dev/null 2>&1; then
-      userdel tomcat
-  fi
-  if getent group tomcat >/dev/null 2>&1; then
-      groupdel tomcat
-  fi
-}
diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD
index 48ca94a6f..d4fe27edd 100644
--- a/extra/totem-plparser/PKGBUILD
+++ b/extra/totem-plparser/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 159096 2012-05-15 14:38:49Z ibiru $
+# $Id: PKGBUILD 169976 2012-10-30 22:59:47Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=totem-plparser
-pkgver=3.4.2
+pkgver=3.4.3
 pkgrel=1
 url="http://www.gnome.org"
 pkgdesc="Totem playlist parser library"
@@ -13,7 +13,7 @@ depends=('gmime' 'libsoup-gnome' 'libarchive' 'libquvi')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/${pkgver%.*}/totem-pl-parser-$pkgver.tar.xz)
-sha256sums=('7b336f599610898beca8238408c9c8e1f1f264602cefb2d1f5601acf9a261ecd')
+sha256sums=('ab8beed4dd5d3a5d7ed5dc8b357e94dc03a8553fef6e33c2e7fb63a76e44c42b')
 
 build() {
   cd totem-pl-parser-$pkgver
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index c0f6c0c7a..4cd12d4ee 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,26 +1,24 @@
-# $Id: PKGBUILD 162987 2012-07-04 17:04:09Z ibiru $
+# $Id: PKGBUILD 170538 2012-11-08 11:31:05Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
-pkgver=3.4.3
+pkgver=3.6.3
 pkgrel=1
-pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
+pkgdesc="GNOME3 movie player based on GStreamer"
 url="http://www.gnome.org"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2' 'custom')
-depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm'
-         'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme'
-         'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas' 'dconf' 'clutter-gst'
-         'clutter-gtk' 'mx' 'python2-gobject')
-makedepends=('intltool' 'gtk-doc' 'nautilus' 'libgdata'
-             'libepc' 'bluez' 'vala' 'grilo' 'pylint')
+license=(GPL2 custom)
+depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas
+         hicolor-icon-theme gnome-icon-theme-symbolic gsettings-desktop-schemas dconf clutter-gst
+         clutter-gtk mx python2-gobject gst-plugins-bad)
+makedepends=(intltool gnome-doc-utils nautilus vala grilo pylint)
 [ "$CARCH" != "mips64el" ] && makedepends+=('lirc-utils')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
         browser-plugins.ini)
-sha256sums=('fce76e3c924d0ffd3d4eef2e69af4c44b3537b26c2df86745e900b4c829b38db'
+sha256sums=('ad9f2ff207c8a965975670e262394953b37b2dc25cff7ee59f138f961f88ce60'
             'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e')
 
 build() {
@@ -36,17 +34,13 @@ build() {
 }
 
 package_totem() {
-  groups=('gnome-extra')
+  groups=(gnome-extra)
   install=totem.install
-  optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
-              'gstreamer0.10-bad-plugins: Extra media codecs'
-              'gstreamer0.10-ffmpeg: Extra media codecs')
-  [ "$CARCH" != "mips64el" ] && optdepends+=('lirc-utils: Infrared Remote Control plugin')
-  optdepends+=('libepc: Publish Playlist plugin'
-              'libgdata: YouTube Browser plugin'
-              'bluez: Bemused plugin'
+  optdepends=('gst-plugins-ugly: Extra media codecs'
+              'gst-ffmpeg: Extra media codecs'
               'grilo-plugins: Browse sidebar (remote media)'
               'pyxdg: opensubtitles plugin')
+  [ "$CARCH" != "mips64el" ] && optdepends+=('lirc-utils: Infrared Remote Control plugin')
 
   cd "$pkgbase-$pkgver"
   make DESTDIR="${pkgdir}" install
@@ -55,7 +49,7 @@ package_totem() {
   rm "$pkgdir/usr/lib/totem/totem-plugin-viewer"
 
   sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \
-    $pkgdir/usr/lib/totem/{totem/totem-bugreport.py,plugins/iplayer/iplayer2.py}
+    $pkgdir/usr/lib/totem/totem/totem-bugreport.py
 
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem/COPYING"
 }
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index bc0270816..4060fa97c 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 163766 2012-07-19 08:34:09Z heftig $
+# $Id: PKGBUILD 171520 2012-11-18 10:28:08Z andyrtr $
 # 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=0.14.2
+pkgver=0.14.4
 _tver=${pkgver%.*}
-pkgrel=1
+pkgrel=2
 pkgdesc="All-in-one indexer, search tool and metadata database"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -15,11 +15,12 @@ makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
              'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3'
              'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection'
              'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser'
-             'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala')
+             'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala'
+             'libgxps')
 url="http://www.gnome.org"
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1')
+sha256sums=('b818ee42b9007a94b2f8046edc4706bb2036187d5fd304e7ae23e5d2fcf85918')
 
 build() {
   cd $pkgbase-$pkgver
@@ -49,7 +50,8 @@ package_tracker() {
               'libvorbis: Vorbis metadata extractor'
               'flac: FLAC metadata extractor'
               'taglib: writeback for audio files'
-              'gnome-panel: tracker-search-bar')
+              'gnome-panel: tracker-search-bar'
+              'libgxps: XPS extractor')
   groups=('gnome-extra')
   install=tracker.install
 
diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD
index d78814635..56f7909b1 100644
--- a/extra/transcode/PKGBUILD
+++ b/extra/transcode/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163161 2012-07-08 09:32:37Z ibiru $
+# $Id: PKGBUILD 169759 2012-10-27 23:42:25Z eric $
 # Maintainer:
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: roberto <roberto@archlinux.org>
@@ -6,7 +6,7 @@
 pkgname=transcode
 _sripver=0.3-4
 pkgver=1.1.7
-pkgrel=5
+pkgrel=6
 pkgdesc="A video/DVD ripper and encoder for the terminal/console"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tcforge.berlios.de/"
@@ -23,7 +23,7 @@ sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
           'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
           'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
           '591943a33235342a66c3df0625a164a1479c09ae'
-          '765dacce5ee463adf5c124556d68bb873ef436c6')
+          '3d2dcdc23f14938e87d14cfc03000bb3b649b85e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/transcode/ffmpeg-0.11.patch b/extra/transcode/ffmpeg-0.11.patch
index 24beb1069..b5601fe2f 100644
--- a/extra/transcode/ffmpeg-0.11.patch
+++ b/extra/transcode/ffmpeg-0.11.patch
@@ -128,3 +128,14 @@ diff -Naur transcode-1.1.7/libtc/tcavcodec.h fixed-tc/libtc/tcavcodec.h
      avcodec_register_all(); \
      TC_UNLOCK_LIBAVCODEC; \
  } while (0)
+--- transcode-1.1.7/export/export_ffmpeg.c.orig	2012-10-19 23:25:16.442303175 -0400
++++ transcode-1.1.7/export/export_ffmpeg.c	2012-10-19 23:26:23.904268733 -0400
+@@ -1249,7 +1249,7 @@
+       return TC_EXPORT_ERROR;
+     }
+ 
+-    if (lavc_venc_context->codec->encode == NULL) {
++    if (lavc_venc_context->codec->encode2 == NULL) {
+       tc_log_warn(MOD_NAME, "could not open FFMPEG codec "
+               "(lavc_venc_context->codec->encode == NULL)");
+       return TC_EXPORT_ERROR;
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index e0c6f5bdf..64f106019 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169450 2012-10-21 11:25:20Z ibiru $
+# $Id: PKGBUILD 170069 2012-10-31 13:47:37Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
 pkgver=2.73
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.transmissionbt.com/"
 license=('MIT')
@@ -14,7 +14,7 @@ source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
         transmission.tmpfiles)
 
 build() {
-  cd "$pkgbase-2.72"
+  cd $pkgbase-$pkgver
 
   ./configure --prefix=/usr
   make
@@ -28,7 +28,7 @@ package_transmission-cli() {
   backup=('etc/conf.d/transmissiond')
   install=transmission-cli.install
 
-  cd "$pkgbase-2.72"
+  cd $pkgbase-$pkgver
 
   for dir in daemon cli web utils
   do
@@ -50,7 +50,7 @@ package_transmission-gtk() {
   	      'transmission-cli: daemon and web support')
   install=transmission-gtk.install
 
-  cd "$pkgbase-2.72"
+  cd $pkgbase-$pkgver
 
   make -C gtk DESTDIR="$pkgdir" install
   make -C po DESTDIR="$pkgdir" install
@@ -63,7 +63,7 @@ package_transmission-qt() {
   optdepends=('transmission-cli: daemon and web support')
   install=transmission-qt.install
 
-  cd "$pkgbase-2.72"
+  cd $pkgbase-$pkgver
 
   make -C qt INSTALL_ROOT="$pkgdir"/usr install
 
@@ -71,7 +71,7 @@ package_transmission-qt() {
   install -D -m644 qt/icons/transmission.png "$pkgdir/usr/share/pixmaps/transmission-qt.png"
   install -D -m644 qt/transmission-qt.desktop "$pkgdir/usr/share/applications/transmission-qt.desktop"
 }
-md5sums=('86479f9bb378b793ce7a8a71f5b15904'
+md5sums=('fae00b13a7b18f9dc16edef020edea85'
          '7d6186ee2a852ae3d44980f05063e194'
          'db72b02fee139e8ab416324e6c044d76'
          '5c289c8901221a94be74665368ab5c2c'
diff --git a/extra/truecrypt/PKGBUILD b/extra/truecrypt/PKGBUILD
index 0f249622e..0adeccb65 100644
--- a/extra/truecrypt/PKGBUILD
+++ b/extra/truecrypt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 153964 2012-03-21 06:20:49Z remy $
+# $Id: PKGBUILD 171369 2012-11-17 11:36:42Z eric $
 # Maintainer: Paul Mattal <paul.archlinux.org>
 
 pkgname=truecrypt
@@ -33,7 +33,7 @@ build() {
   patch -Np1 -i ../${pkgname}-arch-detection.patch
   
   # Build
-  make PKCS11_INC="${srcdir}/pkcs-2.20"
+  make PKCS11_INC="${srcdir}/pkcs-2.20" LFLAGS+="-ldl"
 }
 
 package() {
diff --git a/extra/ucommon/PKGBUILD b/extra/ucommon/PKGBUILD
index 918428a6e..e204462db 100644
--- a/extra/ucommon/PKGBUILD
+++ b/extra/ucommon/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ucommon
 pkgver=5.5.0
 pkgrel=1
 pkgdesc="A light-weight C++ library to facilitate using C++ design patterns"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnutelephony.org/index.php/GNU_uCommon_C++"
 license=('GPL3' 'LGPL3')
 depends=('openssl')
diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD
index 201c4edce..0d52af9fc 100644
--- a/extra/udisks/PKGBUILD
+++ b/extra/udisks/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 165623 2012-08-27 12:26:06Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 172088 2012-11-27 19:16:47Z dreisner $
+# Maintainer: Tom Gundersen <teg@jklm.no>
 
 pkgname=udisks
 pkgver=1.0.4
-pkgrel=5.1
+pkgrel=6
 pkgdesc="Disk Management Service"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/udisks"
 license=('GPL')
-depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject')
+depends=('systemd' 'util-linux' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof')
 makedepends=('intltool' 'docbook-xsl')
 options=(!libtool)
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz udisks.service)
-sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5'
-            '0b9cbf41935feed3e4e2430fd4e06eb29864554dbb9f330c9d2a5fa2ef185131')
+source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz udisks.service drop-pci-db.patch)
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/udisks --disable-static
+
+  patch -p1 < ../drop-pci-db.patch
+
   make
 }
 
@@ -34,4 +35,10 @@ package() {
   install -Dm644 "$srcdir/udisks.service" "$pkgdir/usr/lib/systemd/system/udisks.service"
   echo "SystemdService=udisks.service" \
     >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service"
+
+  # install the /media folder
+  install -d -m 755 $pkgdir/media
 }
+md5sums=('86c63b2b5484f2060499a052b5b6256b'
+         '5d80832b4d4da72beeb45c15b63a1481'
+         '773cccd70afd18ace4332037feff67ec')
diff --git a/extra/udisks/drop-pci-db.patch b/extra/udisks/drop-pci-db.patch
new file mode 100644
index 000000000..6de6f5653
--- /dev/null
+++ b/extra/udisks/drop-pci-db.patch
@@ -0,0 +1,28 @@
+commit c73b5ab54378ec6d7df9948c46ce87f98587af9a
+Author: Tom Gundersen <teg@jklm.no>
+Date:   2 days ago
+
+    udev: remove redundant call to deprecated pci-db
+    
+    The binary is no longer shipped with systemd/udev. The functionality
+    is taken over by a builtin, which is ran for all devices, rendering
+    this rule superfluous.
+    
+    Cc: Jan de Groot <jgc@archlinux.org>
+    Signed-off-by: Tom Gundersen <teg@jklm.no>
+
+diff --git a/data/80-udisks.rules b/data/80-udisks.rules
+index d1c8c5d..4bf2b37 100644
+--- a/data/80-udisks.rules
++++ b/data/80-udisks.rules
+@@ -1,10 +1,6 @@
+ # Do not edit this file, it will be overwritten on updates
+ #
+ 
+-# import names for PCI storage controllers
+-#
+-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p"
+-
+ # Set eSATA port type for known eSATA CardBus adapters - first we want to ensure
+ # the device is on a cardbus controller (upper PCI device) - then we check
+ # vid/pid (lower PCI device)
diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD
index 3cd350c3e..c6c126fd2 100644
--- a/extra/udisks2/PKGBUILD
+++ b/extra/udisks2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161616 2012-06-12 13:51:10Z heftig $
+# $Id: PKGBUILD 169974 2012-10-30 22:59:38Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=udisks2
-pkgver=1.94.0
-pkgrel=2
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="Disk Management Service, version 2"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/udisks"
@@ -14,7 +14,7 @@ optdepends=('parted: partition management'
             'gptfdisk: GUID partition table support')
 options=(!libtool)
 source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2)
-sha256sums=('e58193c2f2f4fba030b6dd684708352b1eccf6826843e42899a26fef4249b0bc')
+sha256sums=('aa026a5a865688a2e9e430a389c7636c1a556d980539e4bd4a3f31dc5d4fe1eb')
 
 build() {
   cd "udisks-$pkgver"
diff --git a/extra/umfpack/PKGBUILD b/extra/umfpack/PKGBUILD
deleted file mode 100644
index ad7bfd249..000000000
--- a/extra/umfpack/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 16363 2010-04-29 09:59:57Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: iKevin <kellwood at ameritech dot net>
-
-pkgname=umfpack
-pkgver=5.5.2
-_ufcfgver=3.7.0
-_amdver=2.2.3
-_cholmodver=1.7.4
-_colamdver=2.7.4
-_ccolamdver=2.7.4
-pkgrel=1
-pkgdesc="A multifrontal direct solver for unsymmetric linear systems (AMD/${_amdver}, UFConfig/${_ufcgfgver})"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.cise.ufl.edu/research/sparse/umfpack"
-license=('LGPL')
-makedepends=('lapack' 'blas')
-noextract=(CHOLMOD-${_cholmodver}.tar.gz
-	COLAMD-${_colamdver}.tar.gz
-	CCOLAMD-${_ccolamdver}.tar.gz)
-source=(http://www.cise.ufl.edu/research/sparse/umfpack/UMFPACK-$pkgver.tar.gz
-	http://www.cise.ufl.edu/research/sparse/UFconfig/UFconfig-${_ufcfgver}.tar.gz
-	http://www.cise.ufl.edu/research/sparse/amd/AMD-${_amdver}.tar.gz
-	http://www.cise.ufl.edu/research/sparse/cholmod/CHOLMOD-${_cholmodver}.tar.gz
-	http://www.cise.ufl.edu/research/sparse/colamd/COLAMD-${_colamdver}.tar.gz
-	http://www.cise.ufl.edu/research/sparse/ccolamd/CCOLAMD-${_ccolamdver}.tar.gz)
-md5sums=('07eaa6ae3de176e5b3681032c10c76be'
-         'ab8c355d683e8c5597a0824b32704c70'
-         '4d2a7db82406f880e7686fbd2df5a3bf'
-         'c2088078a86ca1a88e64037f80ae6540'
-         '186d692ab7211e79f9b727d8192635f7'
-         'bb55f6b4b9358160eaba1a57f863c65e')
-
-build() {
-  CFLAGS+=" -DNCHOLMOD"
-  cd "$srcdir"
-  cp -rf UFconfig/xerbla UMFPACK
-  make -C UMFPACK library
-  make -C AMD library  
-}
-
-package() {
-  cd "$srcdir"
-  
-  install -dm755 "$pkgdir"/usr/{include,lib}
-
-  install -m644 $srcdir/UMFPACK/Lib/libumfpack.a "$pkgdir/usr/lib/"
-  install -m644 $srcdir/UMFPACK/Include/*.h $pkgdir/usr/include
-
-  install -m644 "$srcdir/AMD/Lib/libamd.a" "$pkgdir/usr/lib/"
-  install -m644 $srcdir/AMD/Include/*.h $pkgdir/usr/include
-
-  install -m644 "$srcdir/UFconfig/UFconfig.h" "$pkgdir/usr/include"
-}
diff --git a/extra/unison/PKGBUILD b/extra/unison/PKGBUILD
index 88a6d04d8..f5d0bf067 100644
--- a/extra/unison/PKGBUILD
+++ b/extra/unison/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166409 2012-09-07 16:52:52Z tpowa $
+# $Id: PKGBUILD 172029 2012-11-26 16:23:15Z tpowa $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=unison
-pkgver=2.40.65
+pkgver=2.40.102
 pkgrel=1
 pkgdesc="Unison is a file-synchronization tool"
 arch=(i686 x86_64 'mips64el')
@@ -50,5 +50,5 @@ package() {
  # make versioned symlink #29827
   ln -s unison unison-2.40
 }
-md5sums=('ade42565aa0f94834664040108119f5e'
+md5sums=('42caf869f40440ed0e75eef07a605b2e'
          '2daecba7705455a8e4b769e48b059872')
diff --git a/extra/usbview/PKGBUILD b/extra/usbview/PKGBUILD
index b8ed604a7..dcbe9e51f 100644
--- a/extra/usbview/PKGBUILD
+++ b/extra/usbview/PKGBUILD
@@ -1,23 +1,19 @@
-# $Id: PKGBUILD 169432 2012-10-21 07:40:08Z giovanni $
+# $Id: PKGBUILD 169543 2012-10-23 11:13:44Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=usbview
-pkgver=1.1
-pkgrel=4
+pkgver=2.0
+pkgrel=2
 pkgdesc="Display the topology of devices on the USB bus"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.kroah.com/linux-usb/"
+url="http://www.kroah.com/linux/usb/"
 license=('GPL')
 depends=('gtk3' 'desktop-file-utils')
 makedepends=('pkg-config' 'gendesk')
 install=${pkgname}.install
-source=("http://www.kroah.com/linux-usb/${pkgname}-${pkgver}.tar.gz"
-        'usbview-1.1-gtk3-port.patch'
-        'usbview-1.1-missing-usbfs.patch')
-md5sums=('8bf5e66351156356f3ad07454123affa'
-         '578ed1099228f205b728ee2d46ed6f56'
-         '02e4313887423d0057a7f4f15b7f37d4')
+source=("http://www.kroah.com/linux/usb/${pkgname}-${pkgver}.tar.gz")
+md5sums=('565f2e79f3924d14ab5b4d8aced557e5')
 
 build() {
   cd "${srcdir}"
@@ -26,10 +22,6 @@ build() {
 
   cd "${pkgname}-${pkgver}"
 
-  patch -Np1 -i "${srcdir}/usbview-1.1-gtk3-port.patch"
-  patch -Np1 -i "${srcdir}/usbview-1.1-missing-usbfs.patch"
-
-  autoreconf
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --localstatedir=/var
diff --git a/extra/usbview/usbview.install b/extra/usbview/usbview.install
index e111ef946..b7f7e849b 100644
--- a/extra/usbview/usbview.install
+++ b/extra/usbview/usbview.install
@@ -1,5 +1,10 @@
 post_install() {
   update-desktop-database -q
+  echo ">>> Debugfs must be mounted in order to use usbview."
+  echo ">>> As root execute:"
+  echo ">>> \"mount -t debugfs none /sys/kernel/debug\" or add"
+  echo ">>> \"none /sys/kernel/debug debugfs defaults 0 0\""
+  echo ">>> to /etc/fstab"
 }
 
 post_upgrade() {
@@ -7,5 +12,5 @@ post_upgrade() {
 }
 
 post_remove() {
-  post_install
+  update-desktop-database -q
 }
diff --git a/extra/usermin/PKGBUILD b/extra/usermin/PKGBUILD
index 33e1931ab..cad1c6239 100644
--- a/extra/usermin/PKGBUILD
+++ b/extra/usermin/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 167307 2012-09-30 20:46:00Z tpowa $
+# $Id: PKGBUILD 172026 2012-11-26 16:13:58Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=usermin
-pkgver=1.520
+pkgver=1.530
 pkgrel=1
 pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding"
 arch=(i686 x86_64 'mips64el')
@@ -45,6 +45,7 @@ backup=('etc/usermin/miniserv.conf' 'etc/usermin/miniserv.users' 'etc/usermin/co
 install=usermin.install
 source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz 
 	usermin.rc 
+	usermin.service
 	ftp://ftp.archlinux.org/other/usermin/usermin-config.tar.bz2) 
 
 build() {
@@ -116,7 +117,10 @@ build() {
   # enable user and password login
   sed -i -e '/localauth/d' $startdir/pkg/etc/usermin/miniserv.conf
 
-  #install rc file
+  #install systemd service file
+  install -D -m 644 $startdir/src/usermin.service $startdir/pkg/usr/lib/systemd/system/usermin.service
+ 
+ #install rc file
   install -D -m 755 $startdir/src/usermin.rc $startdir/pkg/etc/rc.d/usermin
 
   # delete temp dir
@@ -124,6 +128,7 @@ build() {
   #install license
   install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/usermin/LICENCE
 }
-md5sums=('5819ba87796d9373a92116e90d1a35d4'
+md5sums=('5a00ec2d294935676efc12f607446fb4'
          'cfef4490cd1ef9517c0b39a7bd75c968'
+         'a5bd5e5ee779f8a3cf3d776ca77ee36e'
          'ec37a79f948f778224550930d2a7ca07')
diff --git a/extra/usermin/usermin.service b/extra/usermin/usermin.service
new file mode 100644
index 000000000..e91164c63
--- /dev/null
+++ b/extra/usermin/usermin.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Usermin
+
+[Service]
+Type=forking
+ExecStart=/opt/usermin/miniserv.pl /etc/usermin/miniserv.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD
index f7c85513a..efb043b62 100644
--- a/extra/v4l-utils/PKGBUILD
+++ b/extra/v4l-utils/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 158613 2012-05-05 03:14:18Z allan $
+# $Id: PKGBUILD 172061 2012-11-27 13:18:13Z tomegun $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=v4l-utils
-pkgver=0.8.8
+pkgver=0.8.9
 pkgrel=1
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 arch=('i686' 'x86_64' 'mips64el')
@@ -31,5 +31,5 @@ package() {
   mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
   rm -rf "${pkgdir}/lib"
 }
-md5sums=('40fdda3f4055ed818012d7a7b5ef5be5'
-         'cceb1325f35789c95f875b705b3eb373')
+md5sums=('cc4f34a1494275ed70f76f2a806dca6a'
+         'ae8f4ed2ca0c1e006cb8c69b5a2982f7')
diff --git a/extra/vala/PKGBUILD b/extra/vala/PKGBUILD
index 358439051..6ef383e3e 100644
--- a/extra/vala/PKGBUILD
+++ b/extra/vala/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 162223 2012-06-23 20:04:12Z ibiru $
+# $Id: PKGBUILD 170948 2012-11-14 00:15:27Z heftig $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Timm Preetz <timm@preetz.us>
 
 pkgname=vala
-pkgver=0.16.1
+pkgver=0.18.1
 pkgrel=1
 pkgdesc="Compiler for the GObject type system"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('glib2')
 makedepends=('libxslt')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8be28ff6347feecb391220ceb4e2209d32b697278e87ed7fc6c9fb1e9345e0d8')
+sha256sums=('7f5e2e8ca03f9fa2cf13acaf93bfdc3a7ad0a10b000a337ba9c6bdc021bdca32')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/extra/vdpau-video/PKGBUILD b/extra/vdpau-video/PKGBUILD
deleted file mode 100644
index e1003f451..000000000
--- a/extra/vdpau-video/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 149310 2012-02-06 18:56:13Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=vdpau-video
-pkgver=0.7.3
-pkgrel=3
-pkgdesc="VDPAU backend for VA API"
-arch=('i686' 'x86_64')
-url="http://cgit.freedesktop.org/vaapi/vdpau-driver/"
-license=('GPL')
-depends=('libva' 'libvdpau')
-makedepends=('mesa')
-options=('!libtool')
-source=(http://www.splitted-desktop.com/~gbeauchesne/vdpau-video/$pkgname-$pkgver.tar.gz)
-md5sums=('18870e007ecdc50a528861fa55556364')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
-
-
diff --git a/extra/vice/PKGBUILD b/extra/vice/PKGBUILD
index b2a1167a1..909423b60 100644
--- a/extra/vice/PKGBUILD
+++ b/extra/vice/PKGBUILD
@@ -1,42 +1,44 @@
-# $Id: PKGBUILD 164816 2012-08-06 17:52:50Z giovanni $
+# $Id: PKGBUILD 170377 2012-11-06 19:33:54Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=vice
-pkgver=2.3
-pkgrel=6
+pkgver=2.4
+pkgrel=2
 pkgdesc="The Versatile Commodore 8-bit Emulator"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.viceteam.org/"
-depends=('alsa-lib' 'giflib' 'libxxf86vm' 'gtk2')
+depends=('alsa-lib' 'giflib' 'libxxf86vm' 'vte' 'libnet' 'libpcap')
 makedepends=('xorg-font-utils')
 options=('!makeflags')
 install=vice.install
 source=("http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-${pkgver}.tar.gz"
-        'vice-2.3-x11video.patch'
-        'vice-2.3-no-fc-cache.patch'
-        'vice-2.3-notexi-notxt.patch'
-        'vice-2.3-zlib-1.2.7.patch')
-md5sums=('b48d137874daad50c087a0686cbdde34'
-         '088292ce9efe785edfb2b0c7c670785e'
-         '873042d07f3768819b589a4c8fe24607'
-         '05159b6ef78e3b7dd5d362f766da4cd4'
-         '6d8736974a21c3862a4bf0fe0ee6e266')
+        'vice-2.4-x11video.patch'
+        'vice-2.4-no-fc-cache-no-lib64.patch'
+        'vice-2.4-notexi-notxt.patch'
+        'vice-2.4-zlib-1.2.7.patch')
+md5sums=('b017647a0c159bbe43cdb81762d1c577'
+         '99931efcb779734c9df069e94f0b38a5'
+         'b0d1392664decd3169740baf90661710'
+         '877f93db1550ea81386aae7c3b578442'
+         '9d9f62f05a967a5926df496e86404148')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -Np1 -i "${srcdir}/vice-2.3-x11video.patch"
-  patch -Np1 -i "${srcdir}/vice-2.3-no-fc-cache.patch"
-  patch -Np1 -i "${srcdir}/vice-2.3-notexi-notxt.patch"
-  patch -Np1 -i "${srcdir}/vice-2.3-zlib-1.2.7.patch"
+  patch -Np1 -i "${srcdir}/vice-2.4-x11video.patch"
+  patch -Np1 -i "${srcdir}/vice-2.4-no-fc-cache-no-lib64.patch"
+  patch -Np1 -i "${srcdir}/vice-2.4-notexi-notxt.patch"
+  patch -Np1 -i "${srcdir}/vice-2.4-zlib-1.2.7.patch"
 
   autoreconf
   ./configure --prefix=/usr \
+              --enable-ethernet \
               --with-alsa \
               --enable-fullscreen \
-              --enable-gnomeui
+              --enable-gnomeui \
+              --disable-ffmpeg
   make
 }
 
diff --git a/extra/vice/vice-2.4-no-fc-cache-no-lib64.patch b/extra/vice/vice-2.4-no-fc-cache-no-lib64.patch
new file mode 100644
index 000000000..bb27aa3e7
--- /dev/null
+++ b/extra/vice/vice-2.4-no-fc-cache-no-lib64.patch
@@ -0,0 +1,25 @@
+--- a/configure.in	2012-11-01 16:37:51.000000000 +0100
++++ b/configure.in	2012-11-03 18:07:35.000000000 +0100
+@@ -2090,12 +2090,7 @@
+ 
+ fi
+ 
+-AC_PATH_PROGS(FCCACHE, fc-cache, false)
+-if test x"$FCCACHE" = "xfalse"; then
+-  AM_CONDITIONAL(HAVE_FC_CACHE, false)
+-else
+-  AM_CONDITIONAL(HAVE_FC_CACHE, true)
+-fi
++AM_CONDITIONAL(HAVE_FC_CACHE, false)
+ 
+ if test x"$is_amigaos4" = "xyes"; then
+   if test x"$enable_sdlui" != "xyes"; then
+@@ -3424,7 +3419,7 @@
+     ;;
+   linux*)
+     if test x"$host_cpu" = "xx86_64"; then
+-      VICEDIR="$PREFIX/lib64/vice"
++      VICEDIR="$PREFIX/lib/vice"
+       AM_CONDITIONAL(ALTERNATE_DOCDIR, false)
+     else
+       VICEDIR="$PREFIX/lib/vice"
diff --git a/extra/vice/vice-2.4-notexi-notxt.patch b/extra/vice/vice-2.4-notexi-notxt.patch
new file mode 100644
index 000000000..58121b702
--- /dev/null
+++ b/extra/vice/vice-2.4-notexi-notxt.patch
@@ -0,0 +1,28 @@
+--- a/doc/Makefile.am	2012-10-20 01:32:30.000000000 +0200
++++ b/doc/Makefile.am	2012-11-03 18:29:03.000000000 +0100
+@@ -79,19 +79,6 @@
+ 	$(srcdir)/fixdox.sh txt <vicetmp.txt | sed 's/ \+$$//' >$(builddir)/vice.txt
+ 	rm -f vicetmp.txt
+ 
+-$(builddir)/vice.pdf:	$(srcdir)/vice.texi
+-if BUILD_PDF
+-	sed 's/@heading NO WARRANTY/@center NO WARRANTY/g' <$(srcdir)/vice.texi >vicepdf.texi
+-	$(TEXI2DVI) -q --clean --pdf -o $(builddir)/vice.pdf vicepdf.texi
+-	rm -f vicepdf.texi
+-
+-PDF_DEPS=$(builddir)/vice.pdf
+-else
+-	touch $(builddir)/vice.pdf
+-
+-PDF_DEPS=
+-endif
+-
+ $(builddir)/vice.guide:	$(srcdir)/vice.texi
+ if BUILD_AMIGAGUIDE
+ 	$(srcdir)/texi2guide.sh $(MAKEGUIDE) $(builddir)/vice.guide $(srcdir)/vice.texi
+@@ -148,4 +135,4 @@
+ 	touch $(builddir)/vice.info
+ 	$(MAKEINFO) -o $(builddir)/vice.info --no-split $(srcdir)/vice.texi
+ 
+-INFO_DEPS = $(builddir)/vice.txt $(builddir)/vice.info $(PDF_DEPS) $(GUIDE_DEPS) $(HLP_DEPS) $(CHM_DEPS) $(IPF_DEPS)
++INFO_DEPS = $(builddir)/vice.info $(PDF_DEPS) $(GUIDE_DEPS) $(HLP_DEPS) $(CHM_DEPS) $(IPF_DEPS)
diff --git a/extra/vice/vice-2.4-x11video.patch b/extra/vice/vice-2.4-x11video.patch
new file mode 100644
index 000000000..423688ba9
--- /dev/null
+++ b/extra/vice/vice-2.4-x11video.patch
@@ -0,0 +1,11 @@
+--- a/src/arch/unix/x11/xaw/x11video.c	2012-10-28 22:26:24.000000000 +0100
++++ b/src/arch/unix/x11/xaw/x11video.c	2012-11-03 18:54:08.000000000 +0100
+@@ -60,6 +60,8 @@
+ #include <X11/Xutil.h>
+ #include <X11/Intrinsic.h>
+ #include <X11/cursorfont.h>
++#include <X11/Xmd.h>
++#include <X11/extensions/shmproto.h>
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/extra/vice/vice-2.4-zlib-1.2.7.patch b/extra/vice/vice-2.4-zlib-1.2.7.patch
new file mode 100644
index 000000000..f41c8afc5
--- /dev/null
+++ b/extra/vice/vice-2.4-zlib-1.2.7.patch
@@ -0,0 +1,37 @@
+--- a/src/zfile.c	2012-10-13 14:53:16.000000000 +0200
++++ b/src/zfile.c	2012-11-03 18:47:40.000000000 +0100
+@@ -198,10 +198,10 @@
+     do {
+         char buf[256];
+ 
+-        len = gzread(fdsrc, (void *)buf, 256);
++        len = gzread((gzFile)fdsrc, (void *)buf, 256);
+         if (len > 0) {
+             if (fwrite((void *)buf, 1, (size_t)len, fddest) < len) {
+-                gzclose(fdsrc);
++                gzclose((gzFile)fdsrc);
+                 fclose(fddest);
+                 ioutil_remove(tmp_name);
+                 lib_free(tmp_name);
+@@ -210,7 +210,7 @@
+         }
+     } while (len > 0);
+ 
+-    gzclose(fdsrc);
++    gzclose((gzFile)fdsrc);
+     fclose(fddest);
+ 
+     return tmp_name;
+@@ -779,10 +779,10 @@
+         char buf[256];
+         len = fread((void *)buf, 256, 1, fdsrc);
+         if (len > 0)
+-            gzwrite(fddest, (void *)buf, (unsigned int)len);
++            gzwrite((gzFile)fddest, (void *)buf, (unsigned int)len);
+     } while (len > 0);
+ 
+-    gzclose(fddest);
++    gzclose((gzFile)fddest);
+     fclose(fdsrc);
+ 
+     archdep_file_set_gzip(dest);
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 25e015e13..95d3391de 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169487 2012-10-22 02:10:39Z tdziedzic $
+# $Id: PKGBUILD 169591 2012-10-24 01:48:33Z tdziedzic $
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: tobias [ tobias at archlinux org ]
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,8 +6,8 @@
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=709
-__hgrev=06e088d016ad
+_patchlevel=712
+__hgrev=57e8b75298d6
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
 pkgrel=1
@@ -21,10 +21,10 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
         'vimrc'
         'archlinux.vim'
         'gvim.desktop')
-md5sums=('7a42c72b07e8bfe6795197a303b21d53'
-         '5c5723f3c39aaa716bd868d7edf9f563'
+md5sums=('368435a6494a2559565ce4d668c4513c'
+         '1613bbbd2a794cd321db09c6cfe2d35f'
          '6e7adfbd5d26c1d161030ec203a7f243'
-         'e57777374891063b9ca48a1fe392ac05'
+         '20fceda56badf201695c57999b0bc609'
          '10353a61aadc3f276692d0e17db1478e'
          'd90413bd21f400313a785bb4010120cd')
 
diff --git a/extra/vim/vimrc b/extra/vim/vimrc
index 92d3ff980..fc18d2d5b 100644
--- a/extra/vim/vimrc
+++ b/extra/vim/vimrc
@@ -11,6 +11,6 @@
 runtime! archlinux.vim
 
 " If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim'
-" Or better yet, read /usr/share/vim/vim72/vimrc_example.vim or the vim manual
+" Or better yet, read /usr/share/vim/vim73/vimrc_example.vim or the vim manual
 " and configure vim to your own liking!
 
diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD
index e70a1d06e..995f8de14 100644
--- a/extra/vinagre/PKGBUILD
+++ b/extra/vinagre/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 159052 2012-05-15 11:08:33Z heftig $
+# $Id: PKGBUILD 170889 2012-11-12 22:10:03Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: lp76 <l.peduto@gmail.com>
 
 pkgname=vinagre
-pkgver=3.4.2
+pkgver=3.6.2
 pkgrel=1
 pkgdesc="A VNC Client for the GNOME Desktop"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/vinagre/"
 install=vinagre.install
-depends=('libgnome-keyring' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme')
+depends=('libsecret' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme')
 optdepends=('openssh: SSH plugin'
             'rdesktop: RDP plugin')
-makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh' 'itstool')
+makedepends=('docbook-xsl' 'intltool' 'rdesktop' 'openssh' 'itstool')
 groups=('gnome-extra')
 options=('!emptydirs' '!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('31dfc98fef91cf692a90880377f8abf95dcf6a7d3512441655bc66b969f50d85')
+sha256sums=('dec4b24de9c372cef3efc0d3e80514c85250e01ce01325d07a4e4e956b4a8f3c')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD
index cf39b8d98..a028a4a22 100644
--- a/extra/vino/PKGBUILD
+++ b/extra/vino/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 159053 2012-05-15 11:09:08Z heftig $
+# $Id: PKGBUILD 170890 2012-11-12 22:11:14Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=vino
-pkgver=3.4.2
+pkgver=3.6.2
 pkgrel=1
 pkgdesc="a VNC server for the GNOME desktop"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libgnome-keyring' 'avahi' 'desktop-file-utils')
-makedepends=('intltool' 'networkmanager')
+depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libsecret' 'avahi' 'desktop-file-utils')
+makedepends=('intltool' 'networkmanager' 'gnome-common')
 groups=('gnome-extra')
 url="http://www.gnome.org"
 options=(!emptydirs)
 install=vino.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b58f7f7e1ce207246dfe98ff777c665cbcbc52abab0cbafc0a1b4f5fc5b3e0c8')
+sha256sums=('c24907542c5ea086293dc852edfeb6b6d02d63e210a3ff715c18d04e130857e4')
 
 build() {
   cd $pkgname-$pkgver
+  sed -i -e '/AC_PATH_XTRA/d' configure.ac
+  autoreconf --force
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/vino \
       --localstatedir=/var \
-      --enable-gnome-keyring \
-      --enable-avahi \
-      --disable-http-server
+      --disable-http-server --with-secret
   make
 }
 
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 6f64a9ca8..0a3ceae07 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 169442 2012-10-21 09:07:49Z giovanni $
+# $Id: PKGBUILD 171268 2012-11-16 23:35:53Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=2.0.4
-pkgrel=2
+pkgrel=4
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.videolan.org/vlc/"
@@ -19,7 +19,7 @@ makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
              'fluidsynth' 'libdc1394' 'libavc1394'
              'libcaca' 'librsvg' 'portaudio' 'libgme' 'xosd'
              'twolame' 'aalib' 'libmtp' 'libdvdcss'
-             'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus')
+             'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2')
 [ "$CARCH" = "mips64el" ] || makedepends+=('lirc-utils' 'oss' 'projectm')
 optdepends=('avahi: for service discovery using bonjour protocol'
             'libnotify: for notification plugin'
@@ -29,7 +29,8 @@ optdepends=('avahi: for service discovery using bonjour protocol'
 optdepends+=('libavc1394: for devices using the 1394ta AV/C'
             'libdc1394: for IEEE 1394 plugin'
             'kdelibs: KDE Solid hardware integration')
-[ "$CARCH" = "mips64el" ] || optdepends+=('libva-driver-intel: back-end for intel cards')
+[ "$CARCH" = "mips64el" ] || optdepends+=('libva-vdpau-driver: vdpau back-end for nvidia'
+            'libva-driver-intel: back-end for intel cards')
 optdepends+=('libbluray: for Blu-Ray support'
             'flac: for Free Lossless Audio Codec plugin')
 [ "$CARCH" = "mips64el" ] || optdepends+=('oss: for OSS audio support')
@@ -50,7 +51,8 @@ optdepends+=('libcaca: for colored ASCII art video output'
             'libcdio: for audio CD playback support'
             'ttf-freefont: for subtitle font '
             'ttf-dejavu: for subtitle font'
-            'opus: for opus support')
+            'opus: for opus support'
+            'libssh2: for sftp support')
 conflicts=('vlc-plugin')
 replaces=('vlc-plugin')
 backup=('usr/share/vlc/lua/http/.hosts'
@@ -82,6 +84,7 @@ build() {
               --enable-vcdx \
               --enable-upnp \
               --enable-opus \
+              --enable-sftp \
               $extraconf
   make
 }
diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD
index 80454fbd6..2c680778b 100644
--- a/extra/vte3/PKGBUILD
+++ b/extra/vte3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160601 2012-06-02 20:33:51Z ibiru $
+# $Id: PKGBUILD 170907 2012-11-12 22:41:40Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=vte3
 pkgname=(vte3 vte-common)
-pkgver=0.32.2
+pkgver=0.34.2
 pkgrel=1
 pkgdesc="Virtual Terminal Emulator widget for use with GTK3"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,8 +11,8 @@ license=('LGPL')
 options=('!libtool' '!emptydirs')
 makedepends=('intltool' 'gobject-introspection' 'gtk3')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/GNOME/sources/vte/${pkgver%.*}/vte-$pkgver.tar.xz)
-sha256sums=('d69ec071f7a380d8b8b981b35a9a0b891f37c4b6b17d08407f66ac98d619486a')
+source=(http://download.gnome.org/sources/vte/${pkgver::4}/vte-$pkgver.tar.xz)
+sha256sums=('f40f9fe0bcc6d65bc44b2fab5469b56a9f0631132c6b90e06053e421711159cf')
 
 build() {
   cd "vte-$pkgver"
@@ -33,6 +33,7 @@ package_vte3(){
 
 package_vte-common() {
   pkgdesc="Common files used by vte and vte3"
+  depends=('glibc')
   cd "vte-$pkgver"
 
   make -C gnome-pty-helper DESTDIR="$pkgdir" install
diff --git a/extra/wcslib/PKGBUILD b/extra/wcslib/PKGBUILD
new file mode 100644
index 000000000..bf9c85b74
--- /dev/null
+++ b/extra/wcslib/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 171525 2012-11-18 11:23:12Z andrea $
+# Maintainer: Your Name <youremail@domain.com>
+
+pkgname=wcslib
+pkgver=4.16
+pkgrel=1
+pkgdesc="A C library that implements the 'World Coordinate System' (WCS) standard in FITS"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.atnf.csiro.au/people/Mark.Calabretta/WCS/"
+license=('GPL3')
+depends=('cfitsio')
+makedepends=('gcc-fortran')
+source=("ftp://ftp.atnf.csiro.au/pub/software/${pkgname}/${pkgname}.tar.bz2")
+md5sums=('30439a0bb730ef936646d646c9f07518')
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./configure --prefix=/usr \
+    --without-pgplot
+  make
+}
+
+#check() {
+#  cd $pkgname-$pkgver
+#  make -k check
+#}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir/" install
+  
+  # Fix wrong permissions
+
+  chmod g=rx,-s "${pkgdir}"/usr/{bin/,/lib/{,pkgconfig},share/man/man1/}
+  chmod -s "${pkgdir}"/usr/{include/wcslib-${pkgver}/,share/doc/wcslib-${pkgver}/{,html/}}
+}
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD
new file mode 100644
index 000000000..32f5c73a3
--- /dev/null
+++ b/extra/webkitgtk/PKGBUILD
@@ -0,0 +1,75 @@
+# $Id: PKGBUILD 171521 2012-11-18 10:28:10Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgbase=webkitgtk
+pkgname=('webkitgtk2' 'webkitgtk3')
+pkgver=1.10.1
+pkgrel=3
+arch=('i686' 'x86_64' 'mips64el')
+url="http://webkitgtk.org/"
+license=('custom')
+makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gstreamer0.10-base' 'gperf' 'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc')
+options=('!libtool' '!emptydirs')
+source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz)
+sha1sums=('3a2df2eb42ffdd7f3b39873d5461c347a6330493')
+
+build() {
+  cd "$srcdir/webkitgtk-$pkgver"
+  mkdir -p build-gtk2 build-gtk3
+
+  if [ "$CARCH" = "mips64el" ]; then
+     # Fix MIPS N32 support.
+      sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
+          Source/WTF/wtf/Platform.h
+     # Don't enable JIT even if configure finds that it's not supported.
+      sed -i 's/#define ENABLE_JIT 1/#define ENABLE_JIT 0/' \
+          Source/WTF/wtf/Platform.h
+
+# --disable-optimizations will add -O0
+      export CFLAGS="${CFLAGS/-O[0-9]}"
+
+      extra="--disable-fast-malloc --disable-optimizations"
+  fi
+
+  cd build-gtk2
+  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
+    --enable-introspection \
+    --disable-silent-rules \
+    --libexecdir=/usr/lib/webkitgtk2 \
+    --with-gstreamer=0.10 \
+    --with-gtk=2.0 \
+    --disable-webkit2 $extra
+  make all stamp-po
+  
+  cd ../build-gtk3
+  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
+    --enable-introspection \
+    --disable-silent-rules \
+    --libexecdir=/usr/lib/webkitgtk3 \
+    --with-gstreamer=1.0 $extra
+  make all stamp-po
+}
+
+package_webkitgtk3() {
+  pkgdesc="GTK+ Web content engine library for GTK+ 3.0"
+  depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs')
+  conflicts=('libwebkit3')
+  provides=("libwebkit3=${pkgver}")
+  replaces=('libwebkit3')
+  
+  cd "$srcdir/webkitgtk-$pkgver/build-gtk3"
+  make -j1 DESTDIR="$pkgdir" install
+  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_webkitgtk2() {
+  pkgdesc="GTK+ Web content engine library for GTK+ 2.0"
+  depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gstreamer0.10-base')
+  conflicts=('libwebkit')
+  provides=("libwebkit=${pkgver}")
+  replaces=('libwebkit')
+  
+  cd "$srcdir/webkitgtk-$pkgver/build-gtk2"
+  make -j1 DESTDIR="$pkgdir" install
+  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD
index 94fbb3a7e..4da1c2979 100644
--- a/extra/webmin/PKGBUILD
+++ b/extra/webmin/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 167305 2012-09-30 19:42:57Z tpowa $
+# $Id: PKGBUILD 172025 2012-11-26 16:13:54Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=webmin
-pkgver=1.600
+pkgver=1.610
 pkgrel=1
 pkgdesc="a web-based interface for system administration"
 arch=(i686 x86_64 'mips64el')
@@ -214,8 +214,8 @@ build() {
   # install license
   install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE
 }
-md5sums=('8a9124bdd180aeec13fc16fa75fb1419'
-         '43a77243acd519c4efe9577090b59912'
+md5sums=('e5f51402c09558ee688efea3d03a3d83'
+         'b0b3e3fb231a12e60165b6b4d604dcfa'
          'bfebb75bb94029b48c46b7f1ba1aa811'
          'c77dfcd621b417a7826d25f56a1e60ae'
          'fc29ecb6a5cd8c278abe054e60381095')
diff --git a/extra/webmin/webmin-config.tar.bz2 b/extra/webmin/webmin-config.tar.bz2
index fa343772c..c7869eebf 100644
--- a/extra/webmin/webmin-config.tar.bz2
+++ b/extra/webmin/webmin-config.tar.bz2
diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD
index 3dff9dc7a..f647530b6 100644
--- a/extra/weechat/PKGBUILD
+++ b/extra/weechat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 167283 2012-09-30 00:48:04Z giovanni $
+# $Id: PKGBUILD 171536 2012-11-18 15:48:02Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: lucke <lucke at o2 dot pl>
 
 pkgname=weechat
-pkgver=0.3.9
+pkgver=0.3.9.2
 pkgrel=1
 pkgdesc="Fast, light and extensible IRC client (curses UI)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell')
 optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell')
 options=('!libtool')
 source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('e981a357378e6ea97c91d8cb6a023da6')
+md5sums=('636e96a62e60155f3b9769905d9912b9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/wget/PKGBUILD b/extra/wget/PKGBUILD
index 349e0bd0c..1f57247ec 100644
--- a/extra/wget/PKGBUILD
+++ b/extra/wget/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 165091 2012-08-10 09:03:30Z allan $
+# $Id: PKGBUILD 169712 2012-10-27 01:52:51Z stephane $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=wget
 pkgver=1.14
-pkgrel=1
+pkgrel=2
 pkgdesc="A network utility to retrieve files from the Web"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/wget/wget.html"
 license=('GPL3')
-depends=('glibc' 'openssl')
+depends=('openssl' 'libidn' 'pcre' 'util-linux')
 optdepends=('ca-certificates: HTTPS downloads')
 backup=('etc/wgetrc')
 install=wget.install
@@ -20,12 +20,7 @@ md5sums=('316f6f59292c9098ad81fd54f658c579'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # Note : We do not build with --enable-nls, because there is a bug in wget causing
-  # international domain names to be not properly converted to punycode if
-  # the current locale is a UTF-8 one
-  # See : http://lists.gnu.org/archive/html/bug-wget/2011-02/msg00026.html
-
-  ./configure -with-ssl=openssl --prefix=/usr --sysconfdir=/etc
+  ./configure -with-ssl=openssl --prefix=/usr --sysconfdir=/etc --enable-nls
   make
 }
 
@@ -38,8 +33,4 @@ package() {
 # default root certs location
 ca_certificate=/etc/ssl/certs/ca-certificates.crt
 EOF
-
-  # remove IRI option from wgetrc as it does not work (see above)
-  sed -i '118,120d' $pkgdir/etc/wgetrc
-
 }
diff --git a/extra/wv2/PKGBUILD b/extra/wv2/PKGBUILD
deleted file mode 100644
index 73b733286..000000000
--- a/extra/wv2/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 142173 2011-11-05 11:56:53Z pierre $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=wv2
-pkgver=0.4.2
-pkgrel=2
-pkgdesc="MSWord 9,8,7,6 formats parser"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://sourceforge.net/projects/wvware/"
-depends=('libgsf')
-makedepends=('cmake')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.bz2")
-license=('GPL2')
-md5sums=('850ed8e44a84e7bf0610747827018cbc')
-
-build() {
-  cd ${srcdir}
-  mkdir build
-  cd build
-
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-
-  make
-}
-
-package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
-}
diff --git a/extra/wxgtk/PKGBUILD b/extra/wxgtk/PKGBUILD
index 8075dad4f..611111a0b 100644
--- a/extra/wxgtk/PKGBUILD
+++ b/extra/wxgtk/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 148966 2012-02-05 11:58:12Z ibiru $
+# $Id: PKGBUILD 171304 2012-11-17 03:08:29Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=wxgtk
 pkgver=2.8.12.1
-pkgrel=3.1
+pkgrel=4
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wxwidgets.org"
 license=('custom:wxWindows')
-depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm')
-makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa')
+depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm' 'sdl')
+makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa' 'glu' 'libxt')
 #source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
 source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
 sha1sums=('05688dc03d61631750f5904273122bb40a2115f5')
@@ -20,7 +20,7 @@ build() {
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
     --enable-graphics_ctx  --disable-optimize --enable-mediactrl --with-regex=builtin \
     --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
-    --disable-precomp-headers
+    --with-sdl --disable-precomp-headers
   make
   make -C locale allmo
   cd contrib/src
diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD
index 5564ee1de..ca63edef8 100644
--- a/extra/wxmaxima/PKGBUILD
+++ b/extra/wxmaxima/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Vinay S Shastry <vinayshastry@gmail.com>
 
 pkgname=wxmaxima
-pkgver=12.04.0
+pkgver=12.09.0
 pkgrel=1
 pkgdesc="A wxWidgets GUI for the computer algebra system Maxima"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL2')
 depends=('maxima' 'libxml2' 'wxgtk' 'shared-mime-info' 'desktop-file-utils')
 source=(http://downloads.sourceforge.net/$pkgname/wxMaxima-$pkgver.tar.gz)
 install=wxmaxima.install
-sha1sums=('f29134a212db77e3087321bc944e346e6976cb40')
+sha1sums=('9b56f674392eabb75183b228757df8834b45b2a6')
 
 build() {
   cd "${srcdir}/wxMaxima-${pkgver}"
diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD
index 742ca7d6d..a7188e716 100644
--- a/extra/x264/PKGBUILD
+++ b/extra/x264/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163164 2012-07-08 09:35:20Z ibiru $
+# $Id: PKGBUILD 171269 2012-11-16 23:35:55Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=x264
-pkgver=20120705
+pkgver=20121113
 pkgrel=1
 pkgdesc="free library for encoding H264/AVC video streams"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('glibc')
 makedepends=('yasm')
 source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2)
-md5sums=('81e5bec5d5774a4a3f567f14bd94289c')
+md5sums=('c37851c8534ef5d7b1935145f8f5a725')
 
 build() {
     cd "$pkgname-snapshot-$pkgver-2245-stable"
diff --git a/extra/x2x/LICENSE b/extra/x2x/LICENSE
deleted file mode 100644
index 99ff948f8..000000000
--- a/extra/x2x/LICENSE
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * x2x: Uses the XTEST extension to forward keystrokes from a window on
- *      one display to another display.  Useful for desks
- *      with multiple keyboards.
- *
- * Copyright (c) 1997
- * Digital Equipment Corporation.  All rights reserved.
- * 
- * By downloading, installing, using, modifying or distributing this
- * software, you agree to the following:
- * 
- * 1. CONDITIONS. Subject to the following conditions, you may download,
- * install, use, modify and distribute this software in source and binary
- * forms:
- * 
- * a) Any source code, binary code and associated documentation
- * (including the online manual) used, modified or distributed must
- * reproduce and retain the above copyright notice, this list of
- * conditions and the following disclaimer.
- * 
- * b) No right is granted to use any trade name, trademark or logo of
- * Digital Equipment Corporation.  Neither the "Digital Equipment
- * Corporation" name nor any trademark or logo of Digital Equipment
- * Corporation may be used to endorse or promote products derived from
- * this software without the prior written permission of Digital
- * Equipment Corporation.
- * 
- * 2.  DISCLAIMER.  THIS SOFTWARE IS PROVIDED BY DIGITAL "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
diff --git a/extra/x2x/PKGBUILD b/extra/x2x/PKGBUILD
deleted file mode 100644
index 01bc0520f..000000000
--- a/extra/x2x/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 128494 2011-06-24 05:31:20Z eric $
-# Maintainer: dorphell <dorphell@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=x2x
-pkgver=1.27
-pkgrel=6.1
-pkgdesc="Control one X display from another"
-arch=(i686 x86_64 'mips64el')
-url="https://github.com/dottedmag/x2x"
-license=('custom')
-depends=('libxtst')
-makedepends=('imake')
-source=(https://github.com/downloads/dottedmag/x2x/$pkgname-$pkgver.tar.gz LICENSE)
-md5sums=('3d1bc863f3209ec37caf7f57bde7e8f0'
-         '7ebc35f66a8ded9b8d8d7ca4131c7ae8')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  mv x2x.1 x2x.man 
-  xmkmf 
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" MANPATH=/usr/share/man install install.man
-  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/xdg-user-dirs-gtk/PKGBUILD b/extra/xdg-user-dirs-gtk/PKGBUILD
index dca09edbf..df275e4b3 100644
--- a/extra/xdg-user-dirs-gtk/PKGBUILD
+++ b/extra/xdg-user-dirs-gtk/PKGBUILD
@@ -1,25 +1,22 @@
-#  $Id: PKGBUILD 157004 2012-04-23 09:11:01Z ibiru $
+#  $Id: PKGBUILD 170124 2012-11-03 07:24:35Z eric $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=xdg-user-dirs-gtk
-pkgver=0.8
-pkgrel=1.1
+pkgver=0.9
+pkgrel=1
 pkgdesc="Creates user dirs and asks to relocalize them"
 arch=(i686 x86_64 mips64el)
 license=('GPL')
-depends=('gtk2' 'xdg-user-dirs')
+depends=('gtk3' 'xdg-user-dirs')
 makedepends=('intltool')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.bz2
-        lxde.patch)
-sha256sums=('971e5cd121606c437c2b07e189c8f34791ae0c4d81e155266d71acc7b263ad32'
-            '5db6a2fd5bb293deff0322e9f20a383130e05df2d35d64568a47b5fe63d6ebf4')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('4b908252515eb95b27427ef7c6b0e096febde716c0c89e8f03a79d23882b79c8')
 
 build() {
   cd $pkgname-$pkgver
-  patch -p1 -i ../lxde.patch
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD
index 1d6f6c3a7..25356c231 100644
--- a/extra/xf86-input-wacom/PKGBUILD
+++ b/extra/xf86-input-wacom/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 168563 2012-10-13 11:44:03Z andyrtr $
+# $Id: PKGBUILD 169807 2012-10-29 20:42:25Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: M Rawash <mrawash@gmail.com>
 
 pkgname=xf86-input-wacom
-pkgver=0.17.0
-pkgrel=2
+pkgver=0.18.0
+pkgrel=1
 pkgdesc="X.Org Wacom tablet driver"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linuxwacom.sourceforge.net/"
@@ -17,7 +17,7 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2
         70-wacom.rules)
-md5sums=('92dffefc3bc30523463f2fa4bc753448'
+md5sums=('cca2c9ed7a5d3b09689bfc2c204726fb'
          '10db4f8272286690255c1bcc18bfdd92')
 
 build() {
diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD
index 16003d403..40f66e595 100644
--- a/extra/xf86-video-ati/PKGBUILD
+++ b/extra/xf86-video-ati/PKGBUILD
@@ -1,30 +1,25 @@
-# $Id: PKGBUILD 168567 2012-10-13 11:44:18Z andyrtr $
+# $Id: PKGBUILD 170785 2012-11-11 10:23:19Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-video-ati
-pkgver=6.14.6
+pkgver=7.0.0
 epoch=1
-pkgrel=2
+pkgrel=1
 pkgdesc="X.org ati video driver"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('libdrm>=2.4.37' 'systemd-tools' 'ati-dri')
+depends=('libdrm>=2.4.40' 'systemd-tools' 'ati-dri')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36')
+sha256sums=('c0acc81386425651aae5dfe02d89f935bb63b2a62104da0d88deac3c773ea10e')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  
-  # fix build now that XAA isn't available in new Xorg - http://bugs.gentoo.org/show_bug.cgi?id=428094
-  sed -i '/USE_XAA, 1/d' configure.ac
-  autoreconf -vfi
-  
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index 239d5a1b0..cc3134130 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169469 2012-10-21 18:59:02Z andyrtr $
+# $Id: PKGBUILD 172167 2012-11-30 14:16:54Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.20.12
+pkgver=2.20.14
 pkgrel=1
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -19,7 +19,7 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('39e02b7f90a2665efe5483075f93b1c87d24f48070d5de783dd41e20d9eb0c7c')
+sha256sums=('f85019afd5ddead6606bf89855d209d5369823a6e96b779fa956e0cc78d3b09b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-neomagic/PKGBUILD b/extra/xf86-video-neomagic/PKGBUILD
index 3a2915274..cb909513b 100644
--- a/extra/xf86-video-neomagic/PKGBUILD
+++ b/extra/xf86-video-neomagic/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 168579 2012-10-13 11:45:15Z andyrtr $
+# $Id: PKGBUILD 169532 2012-10-23 10:08:56Z jgc $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.7
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org neomagic video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        git-fixes.patch)
+sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76'
+            '38b67ce2b0ff94f68c8e1f221759fd7e2059383f4dac716356b5ef2ad695507e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/git-fixes.patch"
+  autoreconf
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-neomagic/git-fixes.patch b/extra/xf86-video-neomagic/git-fixes.patch
new file mode 100644
index 000000000..5ae5c7c1e
--- /dev/null
+++ b/extra/xf86-video-neomagic/git-fixes.patch
@@ -0,0 +1,167 @@
+diff --git a/configure.ac b/configure.ac
+index 29cf772..a6eafa3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,7 +24,7 @@
+ AC_PREREQ([2.60])
+ AC_INIT([xf86-video-neomagic],
+         [1.2.7],
+-        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
++        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/Neomagic],
+         [xf86-video-neomagic])
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AC_CONFIG_HEADERS([config.h])
+@@ -53,14 +53,6 @@ AC_ARG_WITH(xorg-module-dir,
+             [moduledir="$withval"],
+             [moduledir="$libdir/xorg/modules"])
+ 
+-
+-# Store the list of server defined optional extensions in REQUIRED_MODULES
+-XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+-XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+-XORG_DRIVER_CHECK_EXT(XV, videoproto)
+-XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+-XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
+-
+ # Obtain compiler/linker options for the driver dependencies
+ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
+ 
+diff --git a/src/neo.h b/src/neo.h
+index 6aecc33..6812e7a 100644
+--- a/src/neo.h
++++ b/src/neo.h
+@@ -320,3 +320,14 @@ typedef struct {
+ #define PROBED_NM2097	0x83
+ #define PROBED_NM2160	0x44
+ #define PROBED_NM2200	0x45
++
++#define PCI_VENDOR_NEOMAGIC		0x10C8
++#define PCI_CHIP_NM2070			0x0001
++#define PCI_CHIP_NM2090			0x0002
++#define PCI_CHIP_NM2093			0x0003
++#define PCI_CHIP_NM2097			0x0083
++#define PCI_CHIP_NM2160			0x0004
++#define PCI_CHIP_NM2200			0x0005
++#define PCI_CHIP_NM2230			0x0025
++#define PCI_CHIP_NM2360			0x0006
++#define PCI_CHIP_NM2380			0x0016
+diff --git a/src/neo_2090.c b/src/neo_2090.c
+index 5049ab4..2f1efc8 100644
+--- a/src/neo_2090.c
++++ b/src/neo_2090.c
+@@ -42,7 +42,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+ #include "compiler.h"
+-#include "xf86PciInfo.h"
+ 
+ /* Drivers that use XAA need this */
+ #include "xf86fbman.h"
+diff --git a/src/neo_dga.c b/src/neo_dga.c
+index b6346c5..c5d60d5 100644
+--- a/src/neo_dga.c
++++ b/src/neo_dga.c
+@@ -29,7 +29,6 @@
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+ #include "xf86Pci.h"
+-#include "xf86PciInfo.h"
+ #include "neo.h"
+ #include "neo_reg.h"
+ #include "dgaproc.h"
+@@ -38,10 +37,10 @@
+ static Bool NEO_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, 
+ 					int *, int *, int *);
+ static Bool NEO_SetMode(ScrnInfoPtr, DGAModePtr);
+-static void NEO_Sync(ScrnInfoPtr);
+ static int  NEO_GetViewport(ScrnInfoPtr);
+ static void NEO_SetViewport(ScrnInfoPtr, int, int, int);
+ #ifdef HAVE_XAA_H
++static void NEO_Sync(ScrnInfoPtr);
+ static void NEO_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
+ static void NEO_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
+ #if 0
+@@ -57,8 +56,8 @@ DGAFunctionRec NEODGAFuncs = {
+    NEO_SetMode,
+    NEO_SetViewport,
+    NEO_GetViewport,
+-   NEO_Sync,
+ #ifdef HAVE_XAA_H
++   NEO_Sync,
+    NEO_FillRect,
+    NEO_BlitRect,
+ #if 0
+@@ -219,17 +218,14 @@ NEO_FillRect (
+     }
+ }
+ 
+-
+ static void 
+ NEO_Sync(
+    ScrnInfoPtr pScrn
+ ){
+     NEOPtr pNEO = NEOPTR(pScrn);
+-#ifdef HAVE_XAA_H
+     if(pNEO->AccelInfoRec) {
+ 	(*pNEO->AccelInfoRec->Sync)(pScrn);
+     }
+-#endif
+ }
+ 
+ static void 
+diff --git a/src/neo_driver.c b/src/neo_driver.c
+index d7369e2..a17b925 100644
+--- a/src/neo_driver.c
++++ b/src/neo_driver.c
+@@ -60,9 +60,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #include "xf86RAC.h"
+ #endif
+ 
+-/* Drivers for PCI hardware need this */
+-#include "xf86PciInfo.h"
+-
+ /* Drivers that need to access the PCI config space directly need this */
+ #include "xf86Pci.h"
+ 
+@@ -72,9 +69,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* All drivers using the mi colormap manipulation need this */
+ #include "micmap.h"
+ 
+@@ -1621,7 +1615,6 @@ NEOScreenInit(SCREEN_INIT_ARGS_DECL)
+                    "Acceleration %s Initialized\n",ret ? "" : "not");
+     } 
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/neo_i2c.c b/src/neo_i2c.c
+index 82d1f2a..5bbb3fb 100644
+--- a/src/neo_i2c.c
++++ b/src/neo_i2c.c
+@@ -44,7 +44,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #include "compiler.h"
+ 
+ #include "xf86Pci.h"
+-#include "xf86PciInfo.h"
+ 
+ #include "vgaHW.h"
+ 
+diff --git a/src/neo_shadow.c b/src/neo_shadow.c
+index 2df7657..04efe4f 100644
+--- a/src/neo_shadow.c
++++ b/src/neo_shadow.c
+@@ -10,7 +10,6 @@
+ 
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+ #include "shadowfb.h"
+ #include "servermd.h"
diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD
index 7d947570c..a7b1c5475 100644
--- a/extra/xf86-video-nouveau/PKGBUILD
+++ b/extra/xf86-video-nouveau/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 168580 2012-10-13 11:45:21Z andyrtr $
+# $Id: PKGBUILD 170688 2012-11-09 17:02:04Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: buddabrod <buddabrod@gmail.com>
 
 pkgname=xf86-video-nouveau
-pkgver=1.0.2
-pkgrel=2
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="Open Source 2D acceleration driver for nVidia cards"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/"
@@ -12,10 +12,11 @@ license=('GPL')
 depends=('libdrm' 'udev' 'nouveau-dri')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 install=$pkgname.install
-source=($url/release/$pkgname-$pkgver.tar.bz2)
-sha256sums=('765731c2a91d434d4360517a128d18af70b158f727e49813f1a42e26cccbc45d')
+source=(http://xorg.freedesktop.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2)
+sha256sums=('1a8290489cf4f48d2094a541ec9a6b68beb80299741d047e322e650c30ceb7c1')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/xf86-video-sis/0001-Disable-UploadToScreen-and-DownloadFromScreen.patch b/extra/xf86-video-sis/0001-Disable-UploadToScreen-and-DownloadFromScreen.patch
new file mode 100644
index 000000000..90e93b403
--- /dev/null
+++ b/extra/xf86-video-sis/0001-Disable-UploadToScreen-and-DownloadFromScreen.patch
@@ -0,0 +1,66 @@
+From c0ff117d3e19e14829a21d89673e03f9d6389043 Mon Sep 17 00:00:00 2001
+From: Jan de Groot <jgc@archlinux.org>
+Date: Thu, 22 Nov 2012 15:04:42 +0100
+Subject: [PATCH] Disable UploadToScreen and DownloadFromScreen. These
+ functions use invalid pointers, causing crashes. As the
+ driver is technically unmaintained, it's better to rely on
+ software fallback than trying to fix the driver
+ implementation.
+
+---
+ src/sis300_accel.c | 2 ++
+ src/sis310_accel.c | 2 ++
+ src/sis_accel.c    | 2 ++
+ 3 files changed, 6 insertions(+)
+
+diff --git a/src/sis300_accel.c b/src/sis300_accel.c
+index af0527d..2162d76 100644
+--- a/src/sis300_accel.c
++++ b/src/sis300_accel.c
+@@ -1273,9 +1273,11 @@ SiS300AccelInit(ScreenPtr pScreen)
+ 
+ 		 /* Composite not supported */
+ 
++#if 0
+ 		 /* Upload, download to/from Screen */
+ 		 pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen;
+ 		 pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen;
++#endif
+ 
+ 	      } else {
+ 
+diff --git a/src/sis310_accel.c b/src/sis310_accel.c
+index 1a6f639..20106ce 100644
+--- a/src/sis310_accel.c
++++ b/src/sis310_accel.c
+@@ -2303,9 +2303,11 @@ SiS315AccelInit(ScreenPtr pScreen)
+ 	      }
+ #endif
+ 
++#if 0
+ 	      /* Upload, download to/from Screen */
+ 	      pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen;
+ 	      pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen;
++#endif
+ 
+ 	   }
+ #endif
+diff --git a/src/sis_accel.c b/src/sis_accel.c
+index c2c24c7..bb08296 100644
+--- a/src/sis_accel.c
++++ b/src/sis_accel.c
+@@ -801,9 +801,11 @@ SiSAccelInit(ScreenPtr pScreen)
+ 
+ 	  /* Composite not supported */
+ 
++#if 0
+ 	  /* Upload, download to/from Screen */
+ 	  pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen;
+ 	  pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen;
++#endif
+ 
+        }
+ #endif /* EXA */
+-- 
+1.8.0
+
diff --git a/extra/xf86-video-sis/PKGBUILD b/extra/xf86-video-sis/PKGBUILD
index 651e9f082..2e23ccce8 100644
--- a/extra/xf86-video-sis/PKGBUILD
+++ b/extra/xf86-video-sis/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168588 2012-10-13 11:45:51Z andyrtr $
+# $Id: PKGBUILD 171889 2012-11-22 14:24:06Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-sis
 pkgver=0.10.7
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org SiS video driver"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -14,11 +14,14 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS
 optdepends=('sis-dri: DRI1 support from community repo')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+	0001-Disable-UploadToScreen-and-DownloadFromScreen.patch)
+sha256sums=('be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0'
+            '3108c60b3030c894fbdb1426b05d7a8281e5fa4f385e1a80e22c8813a3fb6f5b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/0001-Disable-UploadToScreen-and-DownloadFromScreen.patch"
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-sisimedia/PKGBUILD b/extra/xf86-video-sisimedia/PKGBUILD
index d008b2df0..cc18267a8 100644
--- a/extra/xf86-video-sisimedia/PKGBUILD
+++ b/extra/xf86-video-sisimedia/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 162836 2012-07-01 08:04:55Z andyrtr $
+# $Id: PKGBUILD 170686 2012-11-09 14:38:32Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-sisimedia
 pkgver=0.9.1
-pkgrel=4
+pkgrel=5
 pkgdesc="X.org SiS 671 video driver"
 arch=(i686 x86_64)
 url="http://www.linuxconsulting.ro/xorg-drivers/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel>=1.12.0' 'libdrm' 'xf86driproto' 'mesa' 'xf86dgaproto')
-optdepends=('sis-dri: DRI1 support from community repo')
-conflicts=('xorg-server<1.12.0')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto')
+conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
 options=('!libtool')
 source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-0.9.1_20091203.tar.bz2
         xf86-video-sis-0.9.1-20102701.patch
@@ -36,6 +35,9 @@ source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-
         xf86MapDomainMemory-pci_device_map_legacy.patch
         sync-with-freedesktop.patch
         fix-xv-crash.patch
+        sisimedia-no-xaa.patch
+        sisimedia-xorg-1.13.patch
+        deprecated-sym2.patch
         COPYING)
 sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430'
           '61715bb86180decde55a56fad9a12d841c89fbb2'
@@ -60,6 +62,9 @@ sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430'
           '4ea8d76b3e74172109e7013a2931e571d3a2f4e1'
           '1d29504466840d2fbe1fc355d78666c1a9cd9b76'
           '1fdd74a2aef9455ac5c37d1fe0146d81aa905d2d'
+          '370af234867df98206a98c8cd0a6c89323593f6b'
+          '4ea333d659abe2b78f07511467c5356f39bf8695'
+          '9bef0b61c0505cc64464073d73684e6933d3f84c'
           'a64e244f274bcb155f892d0488a1a4b1b2f7d70d')
 
 build() {
@@ -86,6 +91,10 @@ build() {
   patch -Np1 -i "${srcdir}/xf86MapDomainMemory-pci_device_map_legacy.patch"
   patch -Np1 -i "${srcdir}/sync-with-freedesktop.patch"
   patch -Np0 -i "${srcdir}/fix-xv-crash.patch"
+  patch -Np1 -i "${srcdir}/sisimedia-no-xaa.patch"
+  patch -Np1 -i "${srcdir}/sisimedia-xorg-1.13.patch"
+
+  patch -Np1 -i "${srcdir}/deprecated-sym2.patch"
 
   sed -i -e 's,sis_drv,sisimedia_drv,g' src/Makefile.am
   sed -i -e 's,\"sis\",\"sisimedia\",g' src/sis.h
@@ -93,7 +102,7 @@ build() {
 
   autoreconf -fi
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-dri
   make
 }
 
diff --git a/extra/xf86-video-sisimedia/deprecated-sym2.patch b/extra/xf86-video-sisimedia/deprecated-sym2.patch
new file mode 100644
index 000000000..f02682333
--- /dev/null
+++ b/extra/xf86-video-sisimedia/deprecated-sym2.patch
@@ -0,0 +1,1068 @@
+This patch for remove all depreceated / obselete symbol on compiling
+Contributor saa7_go < saa7.go@gmail.com > 
+
+diff -u xf86-video-sismedia-0.9.1/src/initextx.c xf86-video-sismedia-0.9.1-dep-clean/src/initextx.c
+--- xf86-video-sismedia-0.9.1/src/initextx.c	2011-03-06 11:27:56.368767584 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/initextx.c	2011-03-06 11:34:50.298266877 +0700
+@@ -284,10 +284,10 @@
+ 	}
+       }
+ 
+-      if(!(new = xalloc(sizeof(DisplayModeRec)))) return first;
++      if(!(new = malloc(sizeof(DisplayModeRec)))) return first;
+       memset(new, 0, sizeof(DisplayModeRec));
+-      if(!(new->name = xalloc(10))) {
+-	 xfree(new);
++      if(!(new->name = malloc(10))) {
++	 free(new);
+ 	 return first;
+       }
+       if(!first) first = new;
+@@ -436,11 +436,11 @@
+ 		     }
+ 		  }
+ 
+-		  if(!(new = xalloc(sizeof(DisplayModeRec)))) return first;
++		  if(!(new = malloc(sizeof(DisplayModeRec)))) return first;
+ 
+ 		  memset(new, 0, sizeof(DisplayModeRec));
+-		  if(!(new->name = xalloc(12))) {
+-		     xfree(new);
++		  if(!(new->name = malloc(12))) {
++		     free(new);
+ 		     return first;
+ 		  }
+ 		  if(!first) first = new;
+@@ -521,11 +521,11 @@
+ 
+ 	 if(pSiS->SiS_Pr->CP_DataValid[i]) {
+ 
+-	    if(!(new = xalloc(sizeof(DisplayModeRec)))) return first;
++	    if(!(new = malloc(sizeof(DisplayModeRec)))) return first;
+ 
+ 	    memset(new, 0, sizeof(DisplayModeRec));
+-	    if(!(new->name = xalloc(10))) {
+-	       xfree(new);
++	    if(!(new->name = malloc(10))) {
++	       free(new);
+ 	       return first;
+ 	    }
+ 	    if(!first) first = new;
+diff -u xf86-video-sismedia-0.9.1/src/sis6326_video.c xf86-video-sismedia-0.9.1-dep-clean/src/sis6326_video.c
+--- xf86-video-sismedia-0.9.1/src/sis6326_video.c	2011-03-06 11:27:56.376768671 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis6326_video.c	2011-03-06 12:24:06.324251591 +0700
+@@ -171,7 +171,7 @@
+ 		adaptors = &newAdaptor;
+ 	} else {
+ 		/* need to free this someplace */
+-		newAdaptors = xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
++		newAdaptors = malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
+ 		if(newAdaptors) {
+ 			memcpy(newAdaptors, adaptors, num_adaptors *
+ 				sizeof(XF86VideoAdaptorPtr));
+@@ -186,7 +186,7 @@
+ 	xf86XVScreenInit(pScreen, adaptors, num_adaptors);
+ 
+     if(newAdaptors)
+-	xfree(newAdaptors);
++	free(newAdaptors);
+ }
+ 
+ /* client libraries expect an encoding */
+@@ -532,7 +532,7 @@
+        return NULL;
+ #endif
+ 
+-    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
++    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
+                             sizeof(SISPortPrivRec) +
+                             sizeof(DevUnion))))
+        return NULL;
+diff -u xf86-video-sismedia-0.9.1/src/sis_cursor.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_cursor.c
+--- xf86-video-sismedia-0.9.1/src/sis_cursor.c	2011-03-06 11:27:56.376768671 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_cursor.c	2011-03-06 12:24:06.400262694 +0700
+@@ -1253,11 +1253,11 @@
+     SISPtr pSiS = SISPTR(pScrn);
+     xf86CursorInfoPtr infoPtr;
+ 
+-    if(!(pSiS->CursorScratch = xcalloc(1, max(2048, pSiS->CursorSize))))
++    if(!(pSiS->CursorScratch = calloc(1, max(2048, pSiS->CursorSize))))
+        return FALSE;
+ 
+     if(!(infoPtr = xf86CreateCursorInfoRec())) {
+-       xfree(pSiS->CursorScratch);
++       free(pSiS->CursorScratch);
+        pSiS->CursorScratch = NULL;
+        return FALSE;
+     }
+diff -u xf86-video-sismedia-0.9.1/src/sis_dga.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_dga.c
+--- xf86-video-sismedia-0.9.1/src/sis_dga.c	2011-03-06 11:27:56.380769214 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_dga.c	2011-03-06 11:34:50.458289501 +0700
+@@ -156,18 +156,18 @@
+ 
+ 	if(pMode->HDisplay != otherPitch) {
+ 
+-	    newmodes = xrealloc(modes, (*num + 2) * sizeof(DGAModeRec));
++	    newmodes = realloc(modes, (*num + 2) * sizeof(DGAModeRec));
+ 	    oneMore  = TRUE;
+ 
+ 	} else {
+ 
+-	    newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec));
++	    newmodes = realloc(modes, (*num + 1) * sizeof(DGAModeRec));
+ 	    oneMore  = FALSE;
+ 
+ 	}
+ 
+ 	if(!newmodes) {
+-	    xfree(modes);
++	    free(modes);
+ 	    return NULL;
+ 	}
+ 	modes = newmodes;
+@@ -353,12 +353,12 @@
+     newdgamodes = SISDGAMakeModes(pScrn, &newdgamodenum, TRUE);
+ 
+     if(DGAReInitModes(screenInfo.screens[pScrn->scrnIndex], newdgamodes, newdgamodenum)) {
+-       xfree(pSiS->DGAModes);
++       free(pSiS->DGAModes);
+        pSiS->DGAModes = newdgamodes;
+        pSiS->numDGAModes = newdgamodenum;
+        return TRUE;
+     } else {
+-       xfree(newdgamodes);
++       free(newdgamodes);
+        return FALSE;
+     }
+ #else
+diff -u xf86-video-sismedia-0.9.1/src/sis_dri.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_dri.c
+--- xf86-video-sismedia-0.9.1/src/sis_dri.c	2011-03-06 11:27:56.380769214 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_dri.c	2011-03-06 12:24:06.456270873 +0700
+@@ -156,19 +156,19 @@
+   case 32:
+     numConfigs = (useZ16) ? 8 : 16;
+ 
+-    if(!(pConfigs = (__GLXvisualConfig*)xcalloc(sizeof(__GLXvisualConfig),
++    if(!(pConfigs = (__GLXvisualConfig*)calloc(sizeof(__GLXvisualConfig),
+ 						   numConfigs))) {
+        return FALSE;
+     }
+-    if(!(pSISConfigs = (SISConfigPrivPtr)xcalloc(sizeof(SISConfigPrivRec),
++    if(!(pSISConfigs = (SISConfigPrivPtr)calloc(sizeof(SISConfigPrivRec),
+ 						    numConfigs))) {
+-       xfree(pConfigs);
++       free(pConfigs);
+        return FALSE;
+     }
+-    if(!(pSISConfigPtrs = (SISConfigPrivPtr*)xcalloc(sizeof(SISConfigPrivPtr),
++    if(!(pSISConfigPtrs = (SISConfigPrivPtr*)calloc(sizeof(SISConfigPrivPtr),
+ 							  numConfigs))) {
+-       xfree(pConfigs);
+-       xfree(pSISConfigs);
++       free(pConfigs);
++       free(pSISConfigs);
+        return FALSE;
+     }
+     for(i=0; i<numConfigs; i++) pSISConfigPtrs[i] = &pSISConfigs[i];
+@@ -330,7 +330,7 @@
+      pDRIInfo->busIdString = DRICreatePCIBusID(pSIS->PciInfo);
+   } else {
+ #endif
+-     pDRIInfo->busIdString = xalloc(64);
++     pDRIInfo->busIdString = malloc(64);
+      sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
+ 	     pSIS->PciBus, pSIS->PciDevice, pSIS->PciFunc);
+ #ifdef SISHAVECREATEBUSID
+@@ -389,7 +389,7 @@
+   pDRIInfo->SAREASize = SAREA_MAX;
+ #endif
+ 
+-  if(!(pSISDRI = (SISDRIPtr)xcalloc(sizeof(SISDRIRec), 1))) {
++  if(!(pSISDRI = (SISDRIPtr)calloc(sizeof(SISDRIRec), 1))) {
+      DRIDestroyInfoRec(pSIS->pDRIInfo);
+      pSIS->pDRIInfo = 0;
+      return FALSE;
+@@ -407,7 +407,7 @@
+ 
+   if(!DRIScreenInit(pScreen, pDRIInfo, &pSIS->drmSubFD)) {
+      xf86DrvMsg(pScreen->myNum, X_ERROR, "[dri] DRIScreenInit failed. Disabling the DRI.\n");
+-     xfree(pDRIInfo->devPrivate);
++     free(pDRIInfo->devPrivate);
+      pDRIInfo->devPrivate = 0;
+      DRIDestroyInfoRec(pSIS->pDRIInfo);
+      pSIS->pDRIInfo = 0;
+@@ -867,7 +867,7 @@
+ 
+   if(pSIS->pDRIInfo) {
+      if(pSIS->pDRIInfo->devPrivate) {
+-	xfree(pSIS->pDRIInfo->devPrivate);
++	free(pSIS->pDRIInfo->devPrivate);
+ 	pSIS->pDRIInfo->devPrivate = NULL;
+      }
+      DRIDestroyInfoRec(pSIS->pDRIInfo);
+@@ -875,12 +875,12 @@
+   }
+ 
+   if(pSIS->pVisualConfigs) {
+-     xfree(pSIS->pVisualConfigs);
++     free(pSIS->pVisualConfigs);
+      pSIS->pVisualConfigs = NULL;
+   }
+ 
+   if(pSIS->pVisualConfigsPriv) {
+-     xfree(pSIS->pVisualConfigsPriv);
++     free(pSIS->pVisualConfigsPriv);
+      pSIS->pVisualConfigsPriv = NULL;
+   }
+ 
+diff -u xf86-video-sismedia-0.9.1/src/sis_driver.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_driver.c
+--- xf86-video-sismedia-0.9.1/src/sis_driver.c	2011-03-06 11:27:56.384769757 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_driver.c	2011-03-06 12:24:06.512279052 +0700
+@@ -497,7 +497,7 @@
+ 			numDevSections, drv, &usedChipsXGI);
+ 
+     /* Free it since we don't need that list after this */
+-    xfree(devSections);
++    free(devSections);
+ 
+     numUsed = numUsedSiS + numUsedXGI;
+ xf86DrvMsg(0, X_INFO, "SISPRobe - test1\n");
+@@ -595,8 +595,8 @@
+ 
+     }
+ 
+-    if(usedChipsSiS) xfree(usedChipsSiS);
+-    if(usedChipsXGI) xfree(usedChipsXGI);
++    if(usedChipsSiS) free(usedChipsSiS);
++    if(usedChipsXGI) free(usedChipsXGI);
+ xf86DrvMsg(0, X_INFO, "SISProbe end\n");
+     return foundScreen;
+ }
+@@ -642,12 +642,12 @@
+ #endif
+ 
+     if(pSiS->pstate) {
+-       xfree(pSiS->pstate);
++       free(pSiS->pstate);
+        pSiS->pstate = NULL;
+     }
+ 
+     if(pSiS->fonts) {
+-       xfree(pSiS->fonts);
++       free(pSiS->fonts);
+        pSiS->fonts = NULL;
+     }
+ 
+@@ -660,15 +660,15 @@
+ 	   * head.
+ 	   */
+ 	  if(pSiSEnt->BIOS)
+-	     xfree(pSiSEnt->BIOS);
++	     free(pSiSEnt->BIOS);
+ 	  pSiSEnt->BIOS = pSiS->BIOS = NULL;
+ 
+ 	  if(pSiSEnt->SiS_Pr)
+-	     xfree(pSiSEnt->SiS_Pr);
++	     free(pSiSEnt->SiS_Pr);
+ 	  pSiSEnt->SiS_Pr = pSiS->SiS_Pr = NULL;
+ 
+ 	  if(pSiSEnt->RenderAccelArray)
+-	     xfree(pSiSEnt->RenderAccelArray);
++	     free(pSiSEnt->RenderAccelArray);
+ 	  pSiSEnt->RenderAccelArray = pSiS->RenderAccelArray = NULL;
+ 
+ 	  pSiSEnt->pScrn_1 = NULL;
+@@ -681,17 +681,17 @@
+     } else {
+ #endif
+        if(pSiS->BIOS) {
+-          xfree(pSiS->BIOS);
++          free(pSiS->BIOS);
+           pSiS->BIOS = NULL;
+        }
+ 
+        if(pSiS->SiS_Pr) {
+-          xfree(pSiS->SiS_Pr);
++          free(pSiS->SiS_Pr);
+           pSiS->SiS_Pr = NULL;
+        }
+ 
+        if(pSiS->RenderAccelArray) {
+-          xfree(pSiS->RenderAccelArray);
++          free(pSiS->RenderAccelArray);
+           pSiS->RenderAccelArray = NULL;
+        }
+ #ifdef SISDUALHEAD
+@@ -699,17 +699,17 @@
+ #endif
+ #ifdef SISMERGED
+     if(pSiS->CRT2HSync) {
+-       xfree(pSiS->CRT2HSync);
++       free(pSiS->CRT2HSync);
+        pSiS->CRT2HSync = NULL;
+     }
+ 
+     if(pSiS->CRT2VRefresh) {
+-       xfree(pSiS->CRT2VRefresh);
++       free(pSiS->CRT2VRefresh);
+        pSiS->CRT2VRefresh = NULL;
+     }
+ 
+     if(pSiS->MetaModes) {
+-       xfree(pSiS->MetaModes);
++       free(pSiS->MetaModes);
+        pSiS->MetaModes = NULL;
+     }
+ 
+@@ -721,9 +721,9 @@
+ 	  while(pSiS->CRT2pScrn->monitor->Modes) {
+ 	     xf86DeleteMode(&pSiS->CRT2pScrn->monitor->Modes, pSiS->CRT2pScrn->monitor->Modes);
+ 	  }
+-	  xfree(pSiS->CRT2pScrn->monitor);
++	  free(pSiS->CRT2pScrn->monitor);
+        }
+-       xfree(pSiS->CRT2pScrn);
++       free(pSiS->CRT2pScrn);
+        pSiS->CRT2pScrn = NULL;
+     }
+ 
+@@ -735,10 +735,10 @@
+ 	     do {
+ 	        DisplayModePtr p = pScrn->currentMode->next;
+ 	        if(pScrn->currentMode->Private)
+-	 	   xfree(pScrn->currentMode->Private);
++	 	   free(pScrn->currentMode->Private);
+ 	 	if(pScrn->currentMode->name)
+-	 	   xfree(pScrn->currentMode->name);
+-	        xfree(pScrn->currentMode);
++	 	   free(pScrn->currentMode->name);
++	        free(pScrn->currentMode);
+ 	        pScrn->currentMode = p;
+ 	     } while(pScrn->currentMode != pScrn->modes);
+ 	  }
+@@ -758,22 +758,22 @@
+     }
+ 
+     if(pSiS->currcrt1analogedid) {
+-       xfree(pSiS->currcrt1analogedid);
++       free(pSiS->currcrt1analogedid);
+        pSiS->currcrt1analogedid = NULL;
+     }
+ 
+     if(pSiS->currcrt1digitaledid) {
+-       xfree(pSiS->currcrt1digitaledid);
++       free(pSiS->currcrt1digitaledid);
+        pSiS->currcrt1digitaledid = NULL;
+     }
+ 
+     if(pSiS->currcrt2analogedid) {
+-       xfree(pSiS->currcrt2analogedid);
++       free(pSiS->currcrt2analogedid);
+        pSiS->currcrt2analogedid = NULL;
+     }
+ 
+     if(pSiS->currcrt2digitaledid) {
+-       xfree(pSiS->currcrt2digitaledid);
++       free(pSiS->currcrt2digitaledid);
+        pSiS->currcrt2digitaledid = NULL;
+     }
+ 
+@@ -784,7 +784,7 @@
+ 
+     while(pSiS->SISVESAModeList) {
+        sisModeInfoPtr mp = pSiS->SISVESAModeList->next;
+-       xfree(pSiS->SISVESAModeList);
++       free(pSiS->SISVESAModeList);
+        pSiS->SISVESAModeList = mp;
+     }
+ 
+@@ -801,7 +801,7 @@
+     if(pScrn->driverPrivate == NULL)
+         return;
+ 
+-    xfree(pScrn->driverPrivate);
++    free(pScrn->driverPrivate);
+     pScrn->driverPrivate = NULL;
+ }
+ 
+@@ -1017,22 +1017,22 @@
+ 	     Bool gotit = FALSE;
+ 
+  	     if(!ioctl(fd, SISFB_GET_INFO_SIZE, &sisfbinfosize)) {
+- 		if((mysisfbinfo = xalloc(sisfbinfosize))) {
++ 		if((mysisfbinfo = malloc(sisfbinfosize))) {
+  		   if(!ioctl(fd, (SISFB_GET_INFO | (sisfbinfosize << 16)), mysisfbinfo)) {
+  		      gotit = TRUE;
+  		   } else {
+- 		      xfree(mysisfbinfo);
++ 		      free(mysisfbinfo);
+  		      mysisfbinfo = NULL;
+  		   }
+  		}
+  	     } else {
+- 		if((mysisfbinfo = xalloc(sizeof(*mysisfbinfo) + 16))) {
++ 		if((mysisfbinfo = malloc(sizeof(*mysisfbinfo) + 16))) {
+  		   if(!ioctl(fd, SISFB_GET_INFO_OLD, mysisfbinfo)) {
+  		      gotit = TRUE;
+ 		      xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ 				"Possibly old version of sisfb detected. Please update.\n");
+ 		   } else {
+-		      xfree(mysisfbinfo);
++		      free(mysisfbinfo);
+ 		      mysisfbinfo = NULL;
+ 		   }
+ 		}
+@@ -1171,7 +1171,7 @@
+ 		      }
+ 		   }
+ 	        }
+-		xfree(mysisfbinfo);
++		free(mysisfbinfo);
+ 		mysisfbinfo = NULL;
+ 	     }
+ 	     close (fd);
+@@ -1250,7 +1250,7 @@
+        }
+ #endif
+        if(!pSiS->BIOS) {
+-	  if(!(pSiS->BIOS = xcalloc(1, BIOS_SIZE))) {
++	  if(!(pSiS->BIOS = calloc(1, BIOS_SIZE))) {
+ 	     xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ 		"Could not allocate memory for video BIOS image\n");
+ 	  } else {
+@@ -1352,7 +1352,7 @@
+ 	     } else {
+ 	        xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ 			 "Could not find/read video BIOS\n");
+-		xfree(pSiS->BIOS);
++		free(pSiS->BIOS);
+ 		pSiS->BIOS = NULL;
+ 	     }
+           }
+@@ -1851,7 +1851,7 @@
+ {
+    if((*ptr)) {
+       memcpy((*ptr), pMonitor, sizeof(xf86Monitor));
+-      xfree(pMonitor);
++      free(pMonitor);
+    } else {
+       (*ptr) = pMonitor;
+    }
+@@ -1882,7 +1882,7 @@
+       }
+ #endif
+ 
+-      xfree((*ptr));
++      free((*ptr));
+       *ptr = NULL;
+ 
+    }
+@@ -2158,7 +2158,7 @@
+ 		xf86PrintEDID(pMonitor);
+ 		if(pMonitor->rawData) {
+ 		   /* Get rid of raw data */
+-		   xfree(pMonitor->rawData);
++		   free(pMonitor->rawData);
+ 		   pMonitor->rawData = NULL;
+ 		}
+ 		pScrn->monitor->DDC = pMonitor = SiSSetEDIDPtr(&pSiS->currcrt1analogedid, pMonitor);
+@@ -2821,12 +2821,12 @@
+     DisplayModePtr dest = NULL;
+ 
+     if(source) {
+-       if((dest = xalloc(sizeof(DisplayModeRec)))) {
++       if((dest = malloc(sizeof(DisplayModeRec)))) {
+ 	  memcpy(dest, source, sizeof(DisplayModeRec));
+ 	  dest->name = NULL;
+ 	  dest->next = dest->prev = NULL;
+-	  if(!(dest->name = xalloc(strlen(source->name) + 1))) {
+-	     xfree(dest);
++	  if(!(dest->name = malloc(strlen(source->name) + 1))) {
++	     free(dest);
+ 	     dest = NULL;
+ 	  } else {
+ 	     strcpy(dest->name, source->name);
+@@ -5256,7 +5256,7 @@
+     /* MergedFB: Create CRT2 pScrn and make it a copy of pScrn */
+ #ifdef SISMERGED
+     if(pSiS->MergedFB) {
+-       pSiS->CRT2pScrn = xalloc(sizeof(ScrnInfoRec));
++       pSiS->CRT2pScrn = malloc(sizeof(ScrnInfoRec));
+        if(!pSiS->CRT2pScrn) {
+           SISErrorLog(pScrn, "Failed to allocate memory for 2nd pScrn, %s\n", mergeddisstr);
+ 	  pSiS->MergedFB = FALSE;
+@@ -5292,7 +5292,7 @@
+ 	     } else {
+ 		SISErrorLog(pScrn, mergednocrt1, mergeddisstr);
+ 	     }
+-	     if(pSiS->CRT2pScrn) xfree(pSiS->CRT2pScrn);
++	     if(pSiS->CRT2pScrn) free(pSiS->CRT2pScrn);
+ 	     pSiS->CRT2pScrn = NULL;
+ 	     pSiS->MergedFB = FALSE;
+ 	  }
+@@ -5341,7 +5341,7 @@
+ 	   } else {
+ 	      SISErrorLog(pScrn, mergednocrt2, mergeddisstr);
+ 	   }
+-	   if(pSiS->CRT2pScrn) xfree(pSiS->CRT2pScrn);
++	   if(pSiS->CRT2pScrn) free(pSiS->CRT2pScrn);
+ 	   pSiS->CRT2pScrn = NULL;
+ 	   pSiS->MergedFB = FALSE;
+ 	}
+@@ -5711,7 +5711,7 @@
+ #endif
+ 
+     /* Don't need the clock ranges from here on */
+-    xfree(clockRanges);
++    free(clockRanges);
+ 
+     /* Set display resolution */
+ #ifdef SISMERGED
+@@ -6719,7 +6719,7 @@
+ 	     (function == MODE_SAVE)) {
+ 	     /* don't rely on the memory not being touched */
+ 	     if(!pSiS->pstate) {
+-		pSiS->pstate = xalloc(pSiS->stateSize);
++		pSiS->pstate = malloc(pSiS->stateSize);
+ 	     }
+ 	     memcpy(pSiS->pstate, pSiS->state, pSiS->stateSize);
+ 	  }
+@@ -9086,10 +9086,10 @@
+    if(!(nramp = xf86GetGammaRampSize(pScreen))) return;
+ 
+    for(i=0; i<3; i++) {
+-      ramp[i] = (UShort *)xalloc(nramp * sizeof(UShort));
++      ramp[i] = (UShort *)malloc(nramp * sizeof(UShort));
+       if(!ramp[i]) {
+-	 if(ramp[0]) { xfree(ramp[0]); ramp[0] = NULL; }
+-	 if(ramp[1]) { xfree(ramp[1]); ramp[1] = NULL; }
++	 if(ramp[0]) { free(ramp[0]); ramp[0] = NULL; }
++	 if(ramp[1]) { free(ramp[1]); ramp[1] = NULL; }
+ 	 return;
+       }
+    }
+@@ -9149,9 +9149,9 @@
+ 
+    xf86ChangeGammaRamp(pScreen, nramp, ramp[0], ramp[1], ramp[2]);
+ 
+-   xfree(ramp[0]);
+-   xfree(ramp[1]);
+-   xfree(ramp[2]);
++   free(ramp[0]);
++   free(ramp[1]);
++   free(ramp[2]);
+    ramp[0] = ramp[1] = ramp[2] = NULL;
+ }
+ #endif
+@@ -9442,7 +9442,7 @@
+ 
+     if(pSiS->ShadowFB) {
+        pSiS->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
+-       pSiS->ShadowPtr = xalloc(pSiS->ShadowPitch * height);
++       pSiS->ShadowPtr = malloc(pSiS->ShadowPitch * height);
+        displayWidth = pSiS->ShadowPitch / (pScrn->bitsPerPixel >> 3);
+        FBStart = pSiS->ShadowPtr;
+     } else {
+@@ -9626,14 +9626,14 @@
+ 
+ 	  pSiS->CRT2ColNum = 1 << pScrn->rgbBits;
+ 
+-	  if((pSiS->crt2gcolortable = xalloc(pSiS->CRT2ColNum * 2 * sizeof(LOCO)))) {
++	  if((pSiS->crt2gcolortable = malloc(pSiS->CRT2ColNum * 2 * sizeof(LOCO)))) {
+ 	     pSiS->crt2colors = &pSiS->crt2gcolortable[pSiS->CRT2ColNum];
+-	     if((pSiS->crt2cindices = xalloc(256 * sizeof(int)))) {
++	     if((pSiS->crt2cindices = malloc(256 * sizeof(int)))) {
+ 		int i = pSiS->CRT2ColNum;
+ 		SISCalculateGammaRampCRT2(pScrn);
+ 		while(i--) pSiS->crt2cindices[i] = i;
+ 	     } else {
+-		xfree(pSiS->crt2gcolortable);
++		free(pSiS->crt2gcolortable);
+ 		pSiS->crt2gcolortable = NULL;
+ 		pSiS->CRT2SepGamma = FALSE;
+ 	     }
+@@ -10810,7 +10810,7 @@
+     if(pSiS->useEXA) {
+        if(pSiS->EXADriverPtr) {
+           exaDriverFini(pScreen);
+-          xfree(pSiS->EXADriverPtr);
++          free(pSiS->EXADriverPtr);
+           pSiS->EXADriverPtr = NULL;
+           pSiS->exa_scratch = NULL;
+        }
+@@ -10823,38 +10823,38 @@
+     }
+ 
+     if(pSiS->CursorScratch) {
+-       xfree(pSiS->CursorScratch);
++       free(pSiS->CursorScratch);
+        pSiS->CursorScratch = NULL;
+     }
+ 
+     if(pSiS->ShadowPtr) {
+-       xfree(pSiS->ShadowPtr);
++       free(pSiS->ShadowPtr);
+        pSiS->ShadowPtr = NULL;
+     }
+ 
+     if(pSiS->DGAModes) {
+-       xfree(pSiS->DGAModes);
++       free(pSiS->DGAModes);
+        pSiS->DGAModes = NULL;
+     }
+ 
+     if(pSiS->adaptor) {
+-       xfree(pSiS->adaptor);
++       free(pSiS->adaptor);
+        pSiS->adaptor = NULL;
+        pSiS->ResetXv = pSiS->ResetXvGamma = pSiS->ResetXvDisplay = NULL;
+     }
+ 
+     if(pSiS->blitadaptor) {
+-       xfree(pSiS->blitadaptor);
++       free(pSiS->blitadaptor);
+        pSiS->blitadaptor = NULL;
+     }
+ 
+     if(pSiS->crt2gcolortable) {
+-       xfree(pSiS->crt2gcolortable);
++       free(pSiS->crt2gcolortable);
+        pSiS->crt2gcolortable = NULL;
+     }
+ 
+     if(pSiS->crt2cindices) {
+-       xfree(pSiS->crt2cindices);
++       free(pSiS->crt2cindices);
+        pSiS->crt2cindices = NULL;
+     }
+ 
+diff -u xf86-video-sismedia-0.9.1/src/sis_hwmc.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_hwmc.c
+--- xf86-video-sismedia-0.9.1/src/sis_hwmc.c	2011-03-06 11:27:56.388770300 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_hwmc.c	2011-03-06 12:24:06.612293658 +0700
+@@ -274,7 +274,7 @@
+  *  Set *num_priv to the number of 32bit words that make up the size of
+  *  of the data that priv will point to.
+  *
+- *  *priv = (long *) xcalloc (elements, sizeof(element))
++ *  *priv = (long *) calloc (elements, sizeof(element))
+  *  *num_priv = (elements * sizeof(element)) >> 2;
+  *
+  **************************************************************************/
+@@ -310,7 +310,7 @@
+     return BadAlloc;
+   }
+ 
+-  *priv = xcalloc(1,sizeof(SiSXvMCCreateContextRec));
++  *priv = calloc(1,sizeof(SiSXvMCCreateContextRec));
+   contextRec = (SiSXvMCCreateContextRec *)*priv;
+ 
+   if(!*priv) {
+@@ -322,7 +322,7 @@
+   if(drmCreateContext(pSiS->drmSubFD, &(contextRec->drmcontext) ) < 0) {
+     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+         "[MC] SiSXvMCCreateContext: Unable to create DRMContext!\n");
+-    xfree(*priv);
++    free(*priv);
+     return BadAlloc;
+   }
+ 
+@@ -336,7 +336,7 @@
+   	DRM_FRAME_BUFFER, 0, &pSiS->fb_handle) < 0){
+   	
+ 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,"[MC] Frame buffer AddMap  failed!\n");
+-		xfree(*priv);
++		free(*priv);
+ 		*num_priv = 0;
+ 		return BadAlloc;
+   }
+@@ -357,7 +357,7 @@
+      break;
+   default:
+       xf86DrvMsg(pScrn->scrnIndex, X_ERROR," [MC] XvMC is not supposted on this chip! Stop.\n");
+-      xfree(*priv);
++      free(*priv);
+       *num_priv = 0;
+       return BadValue;
+   }
+@@ -408,7 +408,7 @@
+ #endif
+ 
+ 
+-  *priv = xcalloc(1,sizeof(SiSXvMCCreateSurfaceRec));
++  *priv = calloc(1,sizeof(SiSXvMCCreateSurfaceRec));
+   
+ 
+   if(!*priv) {
+@@ -435,7 +435,7 @@
+   }
+ 
+   
+-  xfree(*priv);
++  free(*priv);
+   return BadAlloc;
+ 
+ }
+@@ -454,7 +454,7 @@
+ 				  __FUNCTION__, __FILE__);
+ #endif
+ 
+-   *priv = (long *)xcalloc(1,sizeof(long));
++   *priv = (long *)calloc(1,sizeof(long));
+ 
+    if(!*priv) {
+       xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+diff -u xf86-video-sismedia-0.9.1/src/sis_memcpy.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_memcpy.c
+--- xf86-video-sismedia-0.9.1/src/sis_memcpy.c	2011-03-06 11:27:56.388770300 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_memcpy.c	2011-03-06 11:34:50.694322870 +0700
+@@ -637,13 +637,13 @@
+     (*buf1) = (UChar *)pSiS->FbBase + offset;
+     (*buf1) = (UChar *)(((ULong)(*buf1) + 31) & ~31);
+ 
+-    if(!((*buf2) = (UChar *)xalloc(BUFFERSIZE + 15))) {
++    if(!((*buf2) = (UChar *)malloc(BUFFERSIZE + 15))) {
+        SISFreeFBMemory(pScrn, &handle);
+        return NULL;
+     }
+ 
+-    if(!((*buf3) = (UChar *)xalloc(BUFFERSIZE + 15))) {
+-       xfree((*buf2));
++    if(!((*buf3) = (UChar *)malloc(BUFFERSIZE + 15))) {
++       free((*buf2));
+        SISFreeFBMemory(pScrn, &handle);
+        return NULL;
+     }
+@@ -1101,8 +1101,8 @@
+ 
+     /* Free buffers */
+     SISFreeFBMemory(pScrn, &fbhandle);
+-    xfree(buf2);
+-    xfree(buf3);
++    free(buf2);
++    free(buf3);
+ 
+     xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
+ 	       "Using %s method for aligned data transfers %s video RAM\n",
+diff -u xf86-video-sismedia-0.9.1/src/sis_mergedfb.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_mergedfb.c
+--- xf86-video-sismedia-0.9.1/src/sis_mergedfb.c	2011-03-06 11:27:56.388770300 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_mergedfb.c	2011-03-06 22:18:01.785310903 +0700
+@@ -170,13 +170,13 @@
+     char namebuffer[32], namebuf1[64], namebuf2[64];
+     char printbuffer[256];
+ 
+-    if(!((mode = xalloc(sizeof(DisplayModeRec)))))
++    if(!((mode = malloc(sizeof(DisplayModeRec)))))
+        return dest;
+ 
+     memcpy(mode, i, sizeof(DisplayModeRec));
+ 
+-    if(!((mode->Private = xalloc(sizeof(SiSMergedDisplayModeRec))))) {
+-       xfree(mode);
++    if(!((mode->Private = malloc(sizeof(SiSMergedDisplayModeRec))))) {
++       free(mode);
+        return dest;
+     }
+ 
+@@ -265,8 +265,8 @@
+ 		"Skipped \"%s\" (%dx%d), not enough video RAM or beyond hardware specs\n",
+ 		mode->name, mode->HDisplay, mode->VDisplay);
+        }
+-       xfree(mode->Private);
+-       xfree(mode);
++       free(mode->Private);
++       free(mode);
+ 
+        return dest;
+     }
+@@ -306,7 +306,7 @@
+ 
+     /* Generate a mode name */
+     sprintf(namebuffer, "%dx%d", mode->HDisplay, mode->VDisplay);
+-    if((mode->name = xalloc(strlen(namebuffer) + 1))) {
++    if((mode->name = malloc(strlen(namebuffer) + 1))) {
+        strcpy(mode->name, namebuffer);
+     }
+ 
+@@ -849,7 +849,7 @@
+ 
+     if(pSiS->MergedFB) {
+ 
+-       pSiS->CRT2pScrn->monitor = xalloc(sizeof(MonRec));
++       pSiS->CRT2pScrn->monitor = malloc(sizeof(MonRec));
+ 
+        if(pSiS->CRT2pScrn->monitor) {
+ 
+@@ -889,7 +889,7 @@
+        } else {
+ 
+ 	  SISErrorLog(pScrn, "Failed to allocate memory for CRT2 monitor, MergedFB mode disabled.\n");
+-	  if(pSiS->CRT2pScrn) xfree(pSiS->CRT2pScrn);
++	  if(pSiS->CRT2pScrn) free(pSiS->CRT2pScrn);
+ 	  pSiS->CRT2pScrn = NULL;
+ 	  pSiS->MergedFB = FALSE;
+ 
+@@ -911,9 +911,9 @@
+ 		xf86DeleteMode(&pSiS->CRT2pScrn->monitor->Modes, pSiS->CRT2pScrn->monitor->Modes);
+ 	  }
+ 	  pSiS->CRT2pScrn->monitor->DDC = NULL;
+-	  xfree(pSiS->CRT2pScrn->monitor);
++	  free(pSiS->CRT2pScrn->monitor);
+        }
+-       xfree(pSiS->CRT2pScrn);
++       free(pSiS->CRT2pScrn);
+        pSiS->CRT2pScrn = NULL;
+     }
+ }
+@@ -1917,7 +1917,7 @@
+     ClientPtr				client;
+     xXineramaLayoutChangeNotifyEvent	se;
+ 
+-    pHead = (SiSXineramaEventPtr *)LookupIDByType(pWin->drawable.id, EventType);
++    dixLookupResourceByType((pointer) &pHead, pWin->drawable.id, EventType, NullClient, DixUnknownAccess);
+     if(!pHead) {
+        return WT_WALKCHILDREN;
+     }
+@@ -2628,6 +2628,7 @@
+     WindowPtr pWin;
+     SiSXineramaEventPtr pXineramaEvent, pNewXineramaEvent, *pHead;
+     XID clientResource;
++    int lookup_ret;
+ 
+     REQUEST_SIZE_MATCH(xXineramaSelectInputReq);
+     /*IvansLee define NEW_XORG_VERSION.*/
+@@ -2640,9 +2641,10 @@
+     if(!pWin)
+        return BadWindow;
+     #if NEW_XORG_VERSION == 1 /*New Xorg Version >= 1.4 */
+-     pHead = (SiSXineramaEventPtr *)SecurityLookupIDByType(client,
+-						 pWin->drawable.id, EventType,
+-						 DixWriteAccess);
++	 lookup_ret = dixLookupResourceByType((pointer) &pHead, 
++						 pWin->drawable.id, EventType, 
++						 client, DixWriteAccess);
++	 pHead = (lookup_ret == Success ? pHead : NULL);
+     #else
+       pHead = (SiSXineramaEventPtr *)SecurityLookupIDByType(client,
+                                                  pWin->drawable.id, EventType,
+@@ -2661,7 +2663,7 @@
+        }
+ 
+        /* Build a new entry */
+-       if(!(pNewXineramaEvent = (SiSXineramaEventPtr)xalloc(sizeof(SiSXineramaEventRec)))) {
++       if(!(pNewXineramaEvent = (SiSXineramaEventPtr)malloc(sizeof(SiSXineramaEventRec)))) {
+ 	  return BadAlloc;
+        }
+        pNewXineramaEvent->next = 0;
+@@ -2686,7 +2688,7 @@
+ 	* done through the resource database.
+ 	*/
+        if(!pHead) {
+-	  pHead = (SiSXineramaEventPtr *)xalloc(sizeof(SiSXineramaEventPtr));
++	  pHead = (SiSXineramaEventPtr *)malloc(sizeof(SiSXineramaEventPtr));
+ 	  if(!pHead || !AddResource(pWin->drawable.id, EventType, (pointer)pHead)) {
+ 	     FreeResource(clientResource, RT_NONE);
+ 	     return BadAlloc;
+@@ -2715,7 +2717,7 @@
+ 	     } else {
+ 		*pHead = pXineramaEvent->next;
+ 	     }
+-	     xfree(pXineramaEvent);
++	     free(pXineramaEvent);
+ 	     SiSXineramaClientsListening--;
+ 	  }
+        }
+@@ -2854,7 +2856,7 @@
+ {
+     /* Called by CloseDownExtensions() */
+     if(SiSXineramadataPtr) {
+-       Xfree(SiSXineramadataPtr);
++       free(SiSXineramadataPtr);
+        SiSXineramadataPtr = NULL;
+     }
+ }
+@@ -2866,7 +2868,7 @@
+     SiSXineramaEventPtr *pHead, pCur, pPrev;
+     WindowPtr pWin = pXineramaEvent->window;
+ 
+-    pHead = (SiSXineramaEventPtr *)LookupIDByType(pWin->drawable.id, EventType);
++    dixLookupResourceByType((pointer) &pHead, pWin->drawable.id, EventType, NullClient, DixUnknownAccess);
+     if(pHead) {
+        pPrev = NULL;
+        for(pCur = *pHead; pCur && pCur != pXineramaEvent; pCur = pCur->next) {
+@@ -2877,7 +2879,7 @@
+ 	  else      *pHead = pXineramaEvent->next;
+        }
+     }
+-    xfree((pointer)pXineramaEvent);
++    free((pointer)pXineramaEvent);
+     return 1;
+ }
+ 
+@@ -2890,9 +2892,9 @@
+     for(pCur = *pHead; pCur; pCur = pNext) {
+        pNext = pCur->next;
+        FreeResource(pCur->clientResource, ClientType);
+-       xfree((pointer)pCur);
++       free((pointer)pCur);
+     }
+-    xfree((pointer)pHead);
++    free((pointer)pHead);
+     return 1;
+ }
+ 
+@@ -2965,7 +2967,7 @@
+ 	  if(!pSiS->XineramaExtEntry) break;
+ 
+ 	  if(!(SiSXineramadataPtr = (SiSXineramaData *)
+-	        xcalloc(SiSXineramaNumScreens, sizeof(SiSXineramaData)))) break;
++	        calloc(SiSXineramaNumScreens, sizeof(SiSXineramaData)))) break;
+ 
+ 	  SiSXineramaEventbase = pSiS->XineramaExtEntry->eventBase;
+ 	  EventSwapVector[SiSXineramaEventbase + XineramaLayoutChangeNotify] =
+diff -u xf86-video-sismedia-0.9.1/src/sis_opt.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_opt.c
+--- xf86-video-sismedia-0.9.1/src/sis_opt.c	2011-03-06 11:27:56.388770300 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_opt.c	2011-03-06 11:34:50.818340404 +0700
+@@ -459,7 +459,7 @@
+     xf86CollectOptions(pScrn, NULL);
+ 
+     /* Process the options */
+-    if(!(pSiS->Options = xalloc(sizeof(SISOptions)))) return;
++    if(!(pSiS->Options = malloc(sizeof(SISOptions)))) return;
+ 
+     memcpy(pSiS->Options, SISOptions, sizeof(SISOptions));
+ 
+@@ -920,7 +920,7 @@
+ 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_CRT2POS))) {
+ 	     int result;
+ 	     Bool valid = FALSE;
+-	     char *tempstr = xalloc(strlen(strptr) + 1);
++	     char *tempstr = malloc(strlen(strptr) + 1);
+ 	     result = sscanf(strptr, "%s %d", tempstr, &ival);
+ 	     if(result >= 1) {
+ 		if(!xf86NameCmp(tempstr,"LeftOf")) {
+@@ -978,18 +978,18 @@
+ 		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ 		    "Except for \"Clone\", the parameter may be followed by an integer.\n");
+ 	     }
+-	     xfree(tempstr);
++	     free(tempstr);
+ 	  }
+ 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_METAMODES))) {
+-	     pSiS->MetaModes = xalloc(strlen(strptr) + 1);
++	     pSiS->MetaModes = malloc(strlen(strptr) + 1);
+ 	     if(pSiS->MetaModes) memcpy(pSiS->MetaModes, strptr, strlen(strptr) + 1);
+ 	  }
+ 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_CRT2HSYNC))) {
+-	     pSiS->CRT2HSync = xalloc(strlen(strptr) + 1);
++	     pSiS->CRT2HSync = malloc(strlen(strptr) + 1);
+ 	     if(pSiS->CRT2HSync) memcpy(pSiS->CRT2HSync, strptr, strlen(strptr) + 1);
+ 	  }
+ 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_CRT2VREFRESH))) {
+-	     pSiS->CRT2VRefresh = xalloc(strlen(strptr) + 1);
++	     pSiS->CRT2VRefresh = malloc(strlen(strptr) + 1);
+ 	     if(pSiS->CRT2VRefresh) memcpy(pSiS->CRT2VRefresh, strptr, strlen(strptr) + 1);
+ 	  }
+ 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_MERGEDDPI))) {
+@@ -1009,8 +1009,8 @@
+ 	     }
+ 	     if(pSiS->UseSiSXinerama) {
+ 	        if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_SCR0))) {
+-	           char *tempstr1 = xalloc(strlen(strptr) + 1);
+-	           char *tempstr2 = xalloc(strlen(strptr) + 1);
++	           char *tempstr1 = malloc(strlen(strptr) + 1);
++	           char *tempstr2 = malloc(strlen(strptr) + 1);
+ 	           char *tempstr;
+ 		   int i, result;
+ 		   pSiS->MFBScr0LR = pSiS->MFBScr0TB = -1;
+@@ -1037,8 +1037,8 @@
+ 			"Bad or incomplete argument(s) for Option \"%s\"\n",
+ 			pSiS->Options[SiS_FIFT(pSiS->Options, OPTION_SCR0)].name);
+ 		   }
+-		   xfree(tempstr1);
+-		   xfree(tempstr2);
++		   free(tempstr1);
++		   free(tempstr2);
+ 	        } else if(xf86GetOptValBool(pSiS->Options, OPTION_CRT2ISSCRN0, &val)) {
+ 		   xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ 			"Option \"%s\" is deprecated, use \"%s\"\n",
+diff -u xf86-video-sismedia-0.9.1/src/sis_utility.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_utility.c
+--- xf86-video-sismedia-0.9.1/src/sis_utility.c	2011-03-06 11:27:56.392770842 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_utility.c	2011-03-06 12:24:06.740312353 +0700
+@@ -2185,7 +2185,7 @@
+      * in SiSCtrlExtUnregister())
+      */
+     if(extEntry->extPrivate) {
+-       xfree(extEntry->extPrivate);
++       free(extEntry->extPrivate);
+        extEntry->extPrivate = NULL;
+     }
+ }
+@@ -2206,7 +2206,7 @@
+ 
+    if(!(myext = CheckExtension(SISCTRL_PROTOCOL_NAME))) {
+ 
+-      if(!(myctrl = xcalloc(sizeof(xSiSCtrlScreenTable), 1)))
++      if(!(myctrl = calloc(sizeof(xSiSCtrlScreenTable), 1)))
+          return;
+ 
+       if(!(myext = AddExtension(SISCTRL_PROTOCOL_NAME, 0, 0,
+@@ -2216,7 +2216,7 @@
+ 				StandardMinorOpcode))) {
+          xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 	 		"Failed to add SISCTRL extension\n");
+-	 xfree(myctrl);
++	 free(myctrl);
+ 	 return;
+       }
+ 
+diff -u xf86-video-sismedia-0.9.1/src/sis_vga.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_vga.c
+--- xf86-video-sismedia-0.9.1/src/sis_vga.c	2011-03-06 11:27:56.396771384 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_vga.c	2011-03-06 11:34:51.038371506 +0700
+@@ -1450,7 +1450,7 @@
+     attr10 = SiS_ReadAttr(pSiS, 0x10);
+     if(attr10 & 0x01) return;
+ 
+-    if(!(pSiS->fonts = xalloc(SIS_FONTS_SIZE * 2))) {
++    if(!(pSiS->fonts = malloc(SIS_FONTS_SIZE * 2))) {
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 		"Could not save console fonts, mem allocation failed\n");
+        return;
+diff -u xf86-video-sismedia-0.9.1/src/sis_video.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_video.c
+--- xf86-video-sismedia-0.9.1/src/sis_video.c	2011-03-06 11:27:56.396771384 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_video.c	2011-03-06 12:24:06.824324624 +0700
+@@ -349,7 +349,7 @@
+        if(newAdaptor)     size++;
+        if(newBlitAdaptor) size++;
+ 
+-       newAdaptors = xalloc(size * sizeof(XF86VideoAdaptorPtr*));
++       newAdaptors = malloc(size * sizeof(XF86VideoAdaptorPtr*));
+        if(newAdaptors) {
+           if(num_adaptors) {
+              memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
+@@ -379,7 +379,7 @@
+     }
+ 
+     if(newAdaptors) {
+-       xfree(newAdaptors);
++       free(newAdaptors);
+     }
+ 
+ #ifdef ENABLEXvMC
+@@ -1049,7 +1049,7 @@
+     }
+ #endif
+ 
+-    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
++    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
+                             sizeof(SISPortPrivRec) +
+                             sizeof(DevUnion)))) {
+        return NULL;
+@@ -4543,7 +4543,7 @@
+    }
+ #endif
+ 
+-   if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
++   if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
+     			   (sizeof(DevUnion) * NUM_BLIT_PORTS) +
+                            sizeof(SISBPortPrivRec)))) {
+       return NULL;
+Common subdirectories: xf86-video-sismedia-0.9.1/src/xvmc and xf86-video-sismedia-0.9.1-dep-clean/src/xvmc
diff --git a/extra/xf86-video-sisimedia/sisimedia-no-xaa.patch b/extra/xf86-video-sisimedia/sisimedia-no-xaa.patch
new file mode 100644
index 000000000..d97ca5a2b
--- /dev/null
+++ b/extra/xf86-video-sisimedia/sisimedia-no-xaa.patch
@@ -0,0 +1,11 @@
+--- xf86-video-sis-0.9.1/src/Makefile.am.0202~	2007-05-30 04:12:02.000000000 +0200
++++ xf86-video-sis-0.9.1/src/Makefile.am	2012-10-19 23:24:31.954954666 +0200
+@@ -23,7 +23,7 @@
+ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
+ # _ladir passes a dummy rpath to libtool so the thing will actually link
+ # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
++AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DSIS_USE_EXA
+ sis_drv_la_LTLIBRARIES = sis_drv.la
+ sis_drv_la_LDFLAGS = -module -avoid-version
+ sis_drv_ladir = @moduledir@/drivers
diff --git a/extra/xf86-video-sisimedia/sisimedia-xorg-1.13.patch b/extra/xf86-video-sisimedia/sisimedia-xorg-1.13.patch
new file mode 100644
index 000000000..25cc94fb1
--- /dev/null
+++ b/extra/xf86-video-sisimedia/sisimedia-xorg-1.13.patch
@@ -0,0 +1,654 @@
+diff -ur xf86-video-sis-0.9.1/src/sis_config.h xf86-video-sis-0.9.1-bero/src/sis_config.h
+--- xf86-video-sis-0.9.1/src/sis_config.h	2007-05-30 04:12:02.000000000 +0200
++++ xf86-video-sis-0.9.1-bero/src/sis_config.h	2012-10-19 23:27:16.178901583 +0200
+@@ -67,7 +67,7 @@
+ #endif
+ 
+ #if 1
+-#define SIS_USE_XAA		/* Include support for XAA */
++#undef SIS_USE_XAA		/* Don't include support for XAA, current xorg servers don't support it */
+ #endif
+ 
+ #ifdef SISVRAMQ
+diff -ur xf86-video-sis-0.9.1/src/sis_dga.c xf86-video-sis-0.9.1-bero/src/sis_dga.c
+--- xf86-video-sis-0.9.1/src/sis_dga.c	2012-10-20 00:10:10.325720321 +0200
++++ xf86-video-sis-0.9.1-bero/src/sis_dga.c	2012-10-19 23:34:00.514846689 +0200
+@@ -421,8 +421,8 @@
+ 	pScrn->currentMode = pSiS->CurrentLayout.mode;
+ 	pSiS->DGAactive = FALSE;
+ 
+-	(*pScrn->SwitchMode)(index, pScrn->currentMode, 0);
+-	(*pScrn->AdjustFrame)(index, pScrn->frameX0, pScrn->frameY0, 0);
++	(*pScrn->SwitchMode)(pScrn, pScrn->currentMode);
++	(*pScrn->AdjustFrame)(pScrn, pScrn->frameX0, pScrn->frameY0);
+ 
+     } else {	/* set new mode */
+ 
+@@ -444,10 +444,10 @@
+ 	pSiS->CurrentLayout.displayWidth  = pMode->bytesPerScanline / (pMode->bitsPerPixel >> 3);
+ 	pSiS->CurrentLayout.displayHeight = pMode->imageHeight;
+ 
+-	(*pScrn->SwitchMode)(index, pMode->mode, 0);
++	(*pScrn->SwitchMode)(pScrn, pMode->mode);
+ 	/* Adjust viewport to 0/0 after mode switch */
+ 	/* This fixes the vmware-in-dualhead problems */
+-	(*pScrn->AdjustFrame)(index, 0, 0, 0);
++	(*pScrn->AdjustFrame)(pScrn, 0, 0);
+ 	pSiS->CurrentLayout.DGAViewportX = pSiS->CurrentLayout.DGAViewportY = 0;
+     }
+ 
+@@ -471,7 +471,7 @@
+ ){
+     SISPtr pSiS = SISPTR(pScrn);
+ 
+-    (*pScrn->AdjustFrame)(pScrn->pScreen->myNum, x, y, flags);
++    (*pScrn->AdjustFrame)(pScrn, x, y);
+     pSiS->DGAViewportStatus = 0;  /* There are never pending Adjusts */
+     pSiS->CurrentLayout.DGAViewportX = x;
+     pSiS->CurrentLayout.DGAViewportY = y;
+diff -ur xf86-video-sis-0.9.1/src/sis_driver.c xf86-video-sis-0.9.1-bero/src/sis_driver.c
+--- xf86-video-sis-0.9.1/src/sis_driver.c	2012-10-20 00:10:10.379719645 +0200
++++ xf86-video-sis-0.9.1-bero/src/sis_driver.c	2012-10-20 00:06:35.196409807 +0200
+@@ -8546,9 +8546,9 @@
+ 	        /* No need to go through pScrn->AdjustFrame; the coords
+ 	         * didn't change
+ 	         */
+-		SISAdjustFrame(pSiSEnt->pScrn_2->scrnIndex,
++		SISAdjustFrame(pSiSEnt->pScrn_2,
+ 			       pSiSEnt->pScrn_2->frameX0,
+-			       pSiSEnt->pScrn_2->frameY0, 0);
++			       pSiSEnt->pScrn_2->frameY0);
+ 	     }
+ 	  } else {
+ 	     /* Head 2 (slave) is always CRT1 */
+@@ -8565,9 +8565,9 @@
+ 	        /* No need to go through pScrn->AdjustFrame; the coords
+ 	         * didn't change
+ 	         */
+-		SISAdjustFrame(pSiSEnt->pScrn_1->scrnIndex,
++		SISAdjustFrame(pSiSEnt->pScrn_1,
+ 			       pSiSEnt->pScrn_1->frameX0,
+-			       pSiSEnt->pScrn_1->frameY0, 0);
++			       pSiSEnt->pScrn_1->frameY0);
+ 	     }
+ 	  }
+ 
+@@ -8613,7 +8613,7 @@
+ 
+ 		SiS_SiSLVDSBackLight(pSiS, TRUE);
+ 
+-		(*pScrn->AdjustFrame)(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
++		(*pScrn->AdjustFrame)(pScrn, pScrn->frameX0, pScrn->frameY0);
+ 
+ 	     } else {
+ #endif
+@@ -8723,14 +8723,13 @@
+ /*******************************************************/
+ 
+ static void
+-SISBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
++SISBlockHandler(ScreenPtr pScreen, pointer pTimeout, pointer pReadmask)
+ {
+-    ScreenPtr pScreen = screenInfo.screens[i];
+-    ScrnInfoPtr pScrn = xf86Screens[i];
++    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+     SISPtr pSiS = SISPTR(pScrn);
+ 
+     pScreen->BlockHandler = pSiS->BlockHandler;
+-    (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
++    (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
+     pScreen->BlockHandler = SISBlockHandler;
+ 
+ #ifdef SISDUALHEAD
+@@ -8747,7 +8746,7 @@
+ #endif
+ 
+     if(pSiS->AdjustFramePending && pSiS->AdjustFrame) {
+-       (*pSiS->AdjustFrame)(i, pSiS->AdjustFrameX, pSiS->AdjustFrameY, pSiS->AdjustFrameFlags);
++       (*pSiS->AdjustFrame)(pScrn, pSiS->AdjustFrameX, pSiS->AdjustFrameY);
+        /* Reset it since Xv insists on installing its own every time. */
+        pScrn->AdjustFrame = SISNewAdjustFrame;
+        pSiS->AdjustFramePending = FALSE;
+@@ -9230,7 +9229,7 @@
+  * depth, bitsPerPixel)
+  */
+ static Bool
+-SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
++SISScreenInit(ScreenPtr pScreen, int argc, char **argv)
+ {
+     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+     SISPtr pSiS = SISPTR(pScrn);
+@@ -9409,7 +9408,7 @@
+ 	  pScrn->frameY1 = pScrn->frameY0 + pScrn->currentMode->VDisplay - 1;
+        }
+     }
+-    SISAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
++    SISAdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0);
+ 
+     /* Reset visual list. */
+     miClearVisualTypes();
+@@ -9841,7 +9840,7 @@
+ 	     pSiS->SiS_SD_Flags |= SiS_SD_PSEUDOXINERAMA;
+ 	     if(pSiS->HaveNonRect) {
+ 		/* Reset the viewport (now eventually non-recangular) */
+-		SISAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
++		SISAdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0);
+ 	     }
+ 	  }
+        } else {
+@@ -10177,9 +10176,8 @@
+ }
+ 
+ static ModeStatus
+-SISValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
++SISValidMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool verbose, int flags)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+     SISPtr pSiS = SISPTR(pScrn);
+ 
+     if(pSiS->UseVESA) {
+@@ -10335,9 +10333,8 @@
+ #endif
+ 
+ Bool
+-SISSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
++SISSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+     SISPtr pSiS = SISPTR(pScrn);
+    /* This is part 2 of the ugly hack in sis_shadow.c:
+     * There we set pScrn->currentMode to something
+@@ -10353,7 +10350,7 @@
+     */
+ 
+     if(!pSiS->skipswitchcheck) {
+-       if(SISValidMode(scrnIndex, mode, TRUE, flags) != MODE_OK) {
++       if(SISValidMode(pScrn, mode, TRUE, 0) != MODE_OK) {
+           return FALSE;
+        }
+     }
+@@ -10368,7 +10365,7 @@
+ 
+     (*pSiS->SyncAccel)(pScrn);
+ 
+-    if(!(SISModeInit(xf86Screens[scrnIndex], mode)))
++    if(!(SISModeInit(pScrn, mode)))
+        return FALSE;
+ 
+     /* Since RandR (indirectly) uses SwitchMode(), we need to
+@@ -10485,21 +10482,18 @@
+ }
+ 
+ static void
+-SISNewAdjustFrame(int scrnIndex, int x, int y, int flags)
++SISNewAdjustFrame(ScrnInfoPtr pScrn, int x, int y)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+     SISPtr      pSiS = SISPTR(pScrn);
+ 
+     pSiS->AdjustFramePending = TRUE;
+     pSiS->AdjustFrameX = x;
+     pSiS->AdjustFrameY = y;
+-    pSiS->AdjustFrameFlags = flags;
+ }
+ 
+ void
+-SISAdjustFrame(int scrnIndex, int x, int y, int flags)
++SISAdjustFrame(ScrnInfoPtr pScrn, int x, int y)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+     SISPtr      pSiS = SISPTR(pScrn);
+     UChar       temp, cr11backup;
+     ULong       base;
+@@ -10511,7 +10505,7 @@
+ 
+ #ifdef SISMERGED
+     if(pSiS->MergedFB) {
+-	SISMFBAdjustFrame(scrnIndex, x, y, flags);
++	SISMFBAdjustFrame(pScrn, x, y);
+ 	return;
+     }
+ #endif
+@@ -10578,9 +10572,8 @@
+ 
+ 
+ static Bool
+-SISEnterVT(int scrnIndex, int flags)
++SISEnterVT(ScrnInfoPtr pScrn)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+     SISPtr pSiS = SISPTR(pScrn);
+     SiS_SiSFB_Lock(pScrn, TRUE);
+ 
+@@ -10596,7 +10589,7 @@
+     /* No need to go through pScrn->AdjustFrame; Xv's
+      * EnterVT handles the overlay(s) anyway.
+      */
+-    SISAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
++    SISAdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0);
+ 
+ 
+ /* Mark for 3D full-screen bug */
+@@ -10625,15 +10618,14 @@
+ 
+ 
+ static void
+-SISLeaveVT(int scrnIndex, int flags)
++SISLeaveVT(ScrnInfoPtr pScrn)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+     SISPtr pSiS = SISPTR(pScrn);
+ #ifdef SISDRI
+     ScreenPtr pScreen;
+ 
+     if(pSiS->directRenderingEnabled) {
+-       pScreen = screenInfo.screens[scrnIndex];
++       pScreen = xf86ScreenToScrn(pScrn);
+ /* Mark for 3D full-screen bug */
+ /*   DRILock(pScreen, 0); */
+     }
+@@ -10702,9 +10694,9 @@
+ 
+ 
+ static Bool
+-SISCloseScreen(int scrnIndex, ScreenPtr pScreen)
++SISCloseScreen(ScreenPtr pScreen)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+     SISPtr pSiS = SISPTR(pScrn);
+ #ifdef SISDUALHEAD
+     SISEntPtr pSiSEnt = pSiS->entityPrivate;
+@@ -10872,7 +10864,7 @@
+ 
+     pScreen->CloseScreen = pSiS->CloseScreen;
+ 
+-    return(*pScreen->CloseScreen)(scrnIndex, pScreen);
++    return(*pScreen->CloseScreen)(pScreen);
+ }
+ 
+ 
+@@ -10883,10 +10875,9 @@
+ /* Free up any per-generation data structures */
+ 
+ static void
+-SISFreeScreen(int scrnIndex, int flags)
++SISFreeScreen(ScrnInfoPtr pScrn)
+ {
+ #ifdef SIS_NEED_MAP_IOP
+-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+     SISPtr pSiS = SISPTR(pScrn);
+ 
+     if(pSiS) {
+@@ -10900,7 +10891,7 @@
+     }
+ #endif
+ 
+-    SISFreeRec(xf86Screens[scrnIndex]);
++    SISFreeRec(pScrn);
+ }
+ 
+ 
+@@ -11134,7 +11125,7 @@
+    pSiS->VBFlags3 = pSiS->VBFlags_backup3 = newvbflags3;  
+  
+    pSiS->skipswitchcheck = TRUE;
+-   if(!((*pScrn->SwitchMode)(pScrn->scrnIndex,pScrn->currentMode,0)))
++   if(!((*pScrn->SwitchMode)(pScrn,pScrn->currentMode)))
+    {
+           pSiS->skipswitchcheck = FALSE;
+ 	  return FALSE;
+@@ -11143,7 +11134,7 @@
+ 
+    /*xf86DrvMsg(0,X_INFO,"frameX0=%d, frameY0=%d.\n",pScrn->frameX0,pScrn->frameY0);*/
+ 
+-   SISAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0,0);
++   SISAdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0);
+ 
+    return TRUE;
+ 
+@@ -11204,14 +11195,14 @@
+  (*pSiS->SyncAccel)(pScrn); 
+   
+  pSiS->skipswitchcheck = TRUE;
+- if(!((*pScrn->SwitchMode)(pScrn->scrnIndex,pScrn->currentMode,0)))
++ if(!((*pScrn->SwitchMode)(pScrn,pScrn->currentMode)))
+  {
+        pSiS->skipswitchcheck = FALSE;
+        return FALSE;
+  }
+  pSiS->skipswitchcheck = FALSE;
+ 
+- SISAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0,0);
++ SISAdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0);
+  
+  return TRUE;
+ }
+@@ -11259,7 +11250,7 @@
+    
+                xf86ZoomViewport(pScreen,1);
+ 
+-	       SISAdjustFrame(pScrn->scrnIndex,0,0,0);
++	       SISAdjustFrame(pScrn,0,0);
+ 
+    
+    return TRUE;
+@@ -11268,9 +11259,8 @@
+ 
+ /**************************************************************************/
+ static Bool
+-SISPMEvent(int scrnIndex, pmEvent event, Bool undo)
++SISPMEvent(ScrnInfoPtr pScrn, pmEvent event, Bool undo)
+ {
+-  ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+   SISPtr pSiS = SISPTR(pScrn);
+   unsigned char hotkeyflag = 0;/*check BIOS flag.*/
+   unsigned char checkflag = 0;/*just for test using.*/
+@@ -11287,13 +11277,13 @@
+          {        
+               xf86DrvMsg(0,X_INFO,"PM_EVENT:event=%d,undo=%d.\n",event,undo);		 
+ 		 if (!undo && !pSiS->suspended) {
+-	               pScrn->LeaveVT(scrnIndex, 0);
++	               pScrn->LeaveVT(pScrn);
+ 	               pSiS->suspended = TRUE;
+ 	               sleep(0);
+                    } 
+ 		     else if (undo && pSiS->suspended) {
+ 	            sleep(0);
+-	            pScrn->EnterVT(scrnIndex, 0);
++	            pScrn->EnterVT(pScrn);
+ 	            pSiS->suspended = FALSE;
+                   }
+ 	   }
+@@ -11305,7 +11295,7 @@
+       {
+ 	  	  if (pSiS->suspended) {
+ 	        sleep(0);
+-	        pScrn->EnterVT(scrnIndex, 0);
++	        pScrn->EnterVT(pScrn);
+ 	        pSiS->suspended = FALSE;
+ 	        SaveScreens(SCREEN_SAVER_FORCER, ScreenSaverReset);
+                }
+diff -ur xf86-video-sis-0.9.1/src/sis_driver.h xf86-video-sis-0.9.1-bero/src/sis_driver.h
+--- xf86-video-sis-0.9.1/src/sis_driver.h	2012-10-20 00:10:10.296720683 +0200
++++ xf86-video-sis-0.9.1-bero/src/sis_driver.h	2012-10-20 00:04:47.586755113 +0200
+@@ -770,14 +770,14 @@
+ static void SISIdentify(int flags);
+ static Bool SISProbe(DriverPtr drv, int flags);
+ static Bool SISPreInit(ScrnInfoPtr pScrn, int flags);
+-static Bool SISScreenInit(int Index, ScreenPtr pScreen, int argc, char **argv);
+-static Bool SISEnterVT(int scrnIndex, int flags);
+-static void SISLeaveVT(int scrnIndex, int flags);
+-static Bool SISCloseScreen(int scrnIndex, ScreenPtr pScreen);
++static Bool SISScreenInit(ScreenPtr pScreen, int argc, char **argv);
++static Bool SISEnterVT(ScrnInfoPtr pScrn);
++static void SISLeaveVT(ScrnInfoPtr pScrn);
++static Bool SISCloseScreen(ScreenPtr pScreen);
+ static Bool SISSaveScreen(ScreenPtr pScreen, int mode);
+-static Bool SISSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
+-static void SISNewAdjustFrame(int scrnIndex, int x, int y, int flags);
+-static Bool SISPMEvent(int scrnIndex, pmEvent event, Bool undo);/*APM-ACPI, adding by Ivans.*/
++static Bool SISSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
++static void SISNewAdjustFrame(ScrnInfoPtr pScrn, int x, int y);
++static Bool SISPMEvent(ScrnInfoPtr pScrn, pmEvent event, Bool undo);/*APM-ACPI, adding by Ivans.*/
+ 
+ #if XSERVER_LIBPCIACCESS
+ static Bool SIS_pci_probe(DriverPtr driver, int entity_num, struct pci_device *device, intptr_t match_data);
+@@ -791,8 +791,8 @@
+ #ifdef SISDUALHEAD
+ static Bool	SISSaveScreenDH(ScreenPtr pScreen, int mode);
+ #endif
+-static void     SISFreeScreen(int scrnIndex, int flags);
+-static ModeStatus SISValidMode(int scrnIndex, DisplayModePtr mode,
++static void     SISFreeScreen(ScrnInfoPtr pScrn);
++static ModeStatus SISValidMode(ScrnInfoPtr pScrn, DisplayModePtr mode,
+ 				Bool verbose, int flags);
+ #ifdef SIS_HAVE_RR_FUNC
+ #ifdef SIS_HAVE_DRIVER_FUNC
+@@ -811,7 +811,7 @@
+ static Bool	SISMapIOPMem(ScrnInfoPtr pScrn);
+ static Bool	SISUnmapIOPMem(ScrnInfoPtr pScrn);
+ #endif
+-void		SISAdjustFrame(int scrnIndex, int x, int y, int flags);
++void		SISAdjustFrame(ScrnInfoPtr pScrn, int x, int y);
+ UChar		SISSearchCRT1Rate(ScrnInfoPtr pScrn, DisplayModePtr mode);
+ UShort		SiS_CheckModeCRT1(ScrnInfoPtr pScrn, DisplayModePtr mode,
+ 				 unsigned int VBFlags, unsigned int VBFlags3, Bool hcm);
+@@ -858,7 +858,7 @@
+ extern Bool 	SiSVGASaveScreen(ScreenPtr pScreen, int mode);
+ 
+ /* shadow, randr, randr-rotation */
+-extern void 	SISPointerMoved(int index, int x, int y);
++extern void 	SISPointerMoved(ScrnInfoPtr pScrn, int x, int y);
+ extern void 	SISRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
+ extern void 	SISRefreshAreaReflect(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
+ extern void 	SISRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
+@@ -922,8 +922,8 @@
+ extern Bool		SiSMFBRebuildModelist(ScrnInfoPtr pScrn, ClockRangePtr clockRanges);
+ extern Bool		SiSMFBRevalidateModelist(ScrnInfoPtr pScrn, ClockRangePtr clockRanges);
+ extern void		SiSMFBSetDpi(ScrnInfoPtr pScrn1, ScrnInfoPtr pScrn2, SiSScrn2Rel srel);
+-extern void		SISMFBPointerMoved(int scrnIndex, int x, int y);
+-extern void		SISMFBAdjustFrame(int scrnIndex, int x, int y, int flags);
++extern void		SISMFBPointerMoved(ScrnInfoPtr pScrn, int x, int y);
++extern void		SISMFBAdjustFrame(ScrnInfoPtr pScrn, int x, int y);
+ #ifdef SISXINERAMA
+ extern void		SiSXineramaExtensionInit(ScrnInfoPtr pScrn);
+ extern Bool 		SiSnoPanoramiXExtension;
+diff -ur xf86-video-sis-0.9.1/src/sis.h xf86-video-sis-0.9.1-bero/src/sis.h
+--- xf86-video-sis-0.9.1/src/sis.h	2012-10-20 00:10:10.361719870 +0200
++++ xf86-video-sis-0.9.1-bero/src/sis.h	2012-10-19 23:56:46.635767827 +0200
+@@ -73,6 +73,7 @@
+ #include "xf86Cursor.h"
+ #include "xf86cmap.h"
+ #include "vbe.h"
++#include "xf86fbman.h"
+ 
+ /*I.L. modified*/
+ #include "sispcirename.h" 
+@@ -241,7 +242,7 @@
+ #define SIS_MAX_SUBPICTURES 2
+ 
+ #if !defined(SIS_USE_XAA) && !defined(SIS_USE_EXA)
+-#define SIS_USE_XAA
++#define SIS_USE_EXA
+ #endif
+ 
+ #ifdef SIS_USE_XAA
+@@ -1319,8 +1320,8 @@
+ #ifdef SIS_USE_XAA
+     void		(*RenderCallback)(ScrnInfoPtr);
+     Time		RenderTime;
+-    FBLinearPtr		AccelLinearScratch;
+ #endif
++    FBLinearPtr		AccelLinearScratch;
+ #ifdef SIS_USE_EXA
+     void		(*ExaRenderCallback)(ScrnInfoPtr);
+     Time		ExaRenderTime;
+@@ -1342,7 +1343,7 @@
+     int			SiSDPIVX, SiSDPIVY;
+     int			virtualX, virtualY;
+     int			Rotate, Reflect;
+-    void		(*PointerMoved)(int index, int x, int y);
++    void		(*PointerMoved)(ScrnInfoPtr pScrn, int x, int y);
+ 
+     /* ShadowFB support */
+     Bool		ShadowFB;
+@@ -1420,7 +1421,6 @@
+     Bool		AdjustFramePending;
+     int			AdjustFrameX;
+     int			AdjustFrameY;
+-    int			AdjustFrameFlags;
+ 
+     /* DGA */
+     DGAModePtr		DGAModes;
+diff -ur xf86-video-sis-0.9.1/src/sis_hwmc.c xf86-video-sis-0.9.1-bero/src/sis_hwmc.c
+--- xf86-video-sis-0.9.1/src/sis_hwmc.c	2012-10-20 00:10:10.348720033 +0200
++++ xf86-video-sis-0.9.1-bero/src/sis_hwmc.c	2012-10-19 23:38:25.482534137 +0200
+@@ -58,8 +58,10 @@
+ #include "xf86xvmc.h"
+ #include <X11/extensions/Xv.h>
+ #include <X11/extensions/XvMC.h>
++#ifdef SIS_USE_XAA
+ #include "xaa.h"
+ #include "xaalocal.h"
++#endif
+ #include "dixstruct.h"
+ #include "fourcc.h"
+ #include "sis_common.h"
+diff -ur xf86-video-sis-0.9.1/src/sis_mergedfb.c xf86-video-sis-0.9.1-bero/src/sis_mergedfb.c
+--- xf86-video-sis-0.9.1/src/sis_mergedfb.c	2012-10-20 00:10:10.351719996 +0200
++++ xf86-video-sis-0.9.1-bero/src/sis_mergedfb.c	2012-10-20 00:07:08.475993754 +0200
+@@ -1706,7 +1706,7 @@
+        /* Need to go the official way to avoid hw access and
+         * to update Xv's overlays
+         */
+-       (pScrn1->AdjustFrame)(scrnIndex, pScrn1->frameX0, pScrn1->frameY0, 0);
++       (pScrn1->AdjustFrame)(pScrn1, pScrn1->frameX0, pScrn1->frameY0);
+     }
+ }
+ 
+diff -ur xf86-video-sis-0.9.1/src/sis_shadow.c xf86-video-sis-0.9.1-bero/src/sis_shadow.c
+--- xf86-video-sis-0.9.1/src/sis_shadow.c	2007-05-30 04:12:02.000000000 +0200
++++ xf86-video-sis-0.9.1-bero/src/sis_shadow.c	2012-10-20 00:08:12.018199367 +0200
+@@ -81,11 +81,11 @@
+        }
+ 
+        if(framechanged && pScrn->AdjustFrame)
+-	  pScrn->AdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
++	  pScrn->AdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0);
+ 
+     } else {
+ 
+-       (*pSiS->PointerMoved)(index, x, y);
++       (*pSiS->PointerMoved)(pScrn, x, y);
+ 
+     }
+ }
+diff -ur xf86-video-sis-0.9.1/src/sis_utility.c xf86-video-sis-0.9.1-bero/src/sis_utility.c
+--- xf86-video-sis-0.9.1/src/sis_utility.c	2012-10-20 00:10:10.352719983 +0200
++++ xf86-video-sis-0.9.1-bero/src/sis_utility.c	2012-10-20 00:09:45.884025883 +0200
+@@ -273,7 +273,7 @@
+ 				 unsigned int VBFlags, unsigned int VBFlags3, Bool hcm);
+ extern UShort	SiS_CheckModeCRT2(ScrnInfoPtr pScrn, DisplayModePtr mode,
+ 				 unsigned int VBFlags, unsigned int VBFlags3, Bool hcm);
+-extern void	SISAdjustFrame(int scrnIndex, int x, int y, int flags);
++extern void	SISAdjustFrame(ScrnInfoPtr pScrn, int x, int y);
+ extern float	SiSCalcVRate(DisplayModePtr mode);
+ extern void	SiS_UpdateGammaCRT2(ScrnInfoPtr pScrn);
+ #ifdef SISGAMMARAMP
+@@ -427,7 +427,7 @@
+     (*pSiS->SyncAccel)(pScrn);
+ 
+     pSiS->skipswitchcheck = TRUE;
+-    if(!((*pScrn->SwitchMode)(pScrn->scrnIndex, pScrn->currentMode, 0))) {
++    if(!((*pScrn->SwitchMode)(pScrn, pScrn->currentMode))) {
+        pSiS->skipswitchcheck = FALSE;
+        return FALSE;
+     }
+@@ -436,7 +436,7 @@
+     /* No need to go through pScrn->AdjustFrame; the coords
+      * didn't change
+      */
+-    SISAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
++    SISAdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0);
+ 
+     return TRUE;
+ }
+@@ -480,7 +480,7 @@
+        /* Sync the accelerators */
+        (*pSiS->SyncAccel)(pScrn);
+        pSiS->skipswitchcheck = TRUE;
+-       if(!((*pScrn->SwitchMode)(pScrn->scrnIndex, pScrn->currentMode, 0))) {
++       if(!((*pScrn->SwitchMode)(pScrn, pScrn->currentMode))) {
+           pSiS->skipswitchcheck = FALSE;
+           return FALSE;
+        }
+@@ -489,7 +489,7 @@
+        /* No need to go through pScrn->AdjustFrame; the coords
+ 	* didn't change
+ 	*/
+-       SISAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
++       SISAdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0);
+     }
+ 
+     return TRUE;
+@@ -624,7 +624,7 @@
+     pSiS->VBFlags3 = pSiS->VBFlags_backup3 = newvbflags3;
+ 
+     pSiS->skipswitchcheck = TRUE;
+-    if(!(pScrn->SwitchMode(pScrn->scrnIndex, pScrn->currentMode, 0))) {
++    if(!(pScrn->SwitchMode(pScrn, pScrn->currentMode))) {
+        pSiS->skipswitchcheck = FALSE;
+        return FALSE;
+     }
+@@ -633,7 +633,7 @@
+     /* No need to go through pScrn->AdjustFrame; the coords
+      * didn't change
+      */
+-    SISAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
++    SISAdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0);
+ 
+     return TRUE;
+ }
+--- xf86-video-sis-0.9.1/src/sis6326_video.c.bero	2012-10-20 00:13:59.712852587 +0200
++++ xf86-video-sis-0.9.1/src/sis6326_video.c	2012-10-20 00:15:51.035460862 +0200
+@@ -72,7 +72,7 @@ static void 	SIS6326QueryBestSize(ScrnIn
+ 			short, unsigned int *,unsigned int *, pointer);
+ static int 	SIS6326PutImage( ScrnInfoPtr,
+ 			short, short, short, short, short, short, short, short,
+-			int, unsigned char*, short, short, Bool, RegionPtr, pointer);
++			int, unsigned char*, short, short, Bool, RegionPtr, pointer, DrawablePtr);
+ static int 	SIS6326QueryImageAttributes(ScrnInfoPtr,
+ 			int, unsigned short *, unsigned short *, int *, int *);
+ static void 	SIS6326VideoTimerCallback(ScrnInfoPtr pScrn, Time now);
+@@ -1231,7 +1231,7 @@ SIS6326PutImage(
+   int id, unsigned char* buf,
+   short width, short height,
+   Bool sync,
+-  RegionPtr clipBoxes, pointer data
++  RegionPtr clipBoxes, pointer data, DrawablePtr pDraw
+ ){
+    SISPtr pSiS = SISPTR(pScrn);
+    SISPortPrivPtr pPriv = (SISPortPrivPtr)data;
+--- xf86-video-sis-0.9.1/src/sis_video.c.bero	2012-10-20 00:16:13.212183614 +0200
++++ xf86-video-sis-0.9.1/src/sis_video.c	2012-10-20 00:20:38.099872064 +0200
+@@ -3948,7 +3948,7 @@ SISPutImage(
+   int id, UChar *buf,
+   short width, short height,
+   Bool sync,
+-  RegionPtr clipBoxes, pointer data
++  RegionPtr clipBoxes, pointer data, DrawablePtr pDraw
+ ){
+    SISPtr pSiS = SISPTR(pScrn);
+    SISPortPrivPtr pPriv = (SISPortPrivPtr)data;
+@@ -4089,8 +4089,11 @@ SISPutImage(
+ static int
+ SISReputImage(
+   ScrnInfoPtr pScrn,
++  short src_x, short src_y,
+   short drw_x, short drw_y,
+-  RegionPtr clipBoxes, pointer data
++  short src_w, short src_h,
++  short drw_w, short drw_h,
++  RegionPtr clipBoxes, pointer data, DrawablePtr pDraw
+ ){
+    SISPtr pSiS = SISPTR(pScrn);
+    SISPortPrivPtr pPriv = (SISPortPrivPtr)data;
+--- xf86-video-sis-0.9.1/src/sis_video.h.bero	2012-10-20 00:16:58.076622733 +0200
++++ xf86-video-sis-0.9.1/src/sis_video.h	2012-10-20 00:20:18.443117807 +0200
+@@ -107,10 +107,13 @@ static void 	SISQueryBestSize(ScrnInfoPt
+ 			short, unsigned int *,unsigned int *, pointer);
+ static int 	SISPutImage(ScrnInfoPtr,
+ 			short, short, short, short, short, short, short, short,
+-			int, UChar *, short, short, Bool, RegionPtr, pointer);
++			int, UChar *, short, short, Bool, RegionPtr, pointer, DrawablePtr);
+ static int	SISReputImage(ScrnInfoPtr pScrn,
++			short src_x, short src_y,
+ 			short drw_x, short drw_y,
+-			RegionPtr clipBoxes, pointer data);
++			short src_w, short src_h,
++			short drw_w, short drw_h,
++			RegionPtr clipBoxes, pointer data, DrawablePtr pDraw);
+ static int 	SISQueryImageAttributes(ScrnInfoPtr,
+ 			int, UShort *, UShort *, int *, int *);
+ static void 	SISVideoTimerCallback(ScrnInfoPtr pScrn, Time now);
diff --git a/extra/xf86-video-unichrome/LICENSE b/extra/xf86-video-unichrome/LICENSE
deleted file mode 100644
index f4007667b..000000000
--- a/extra/xf86-video-unichrome/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2004-2007 Luc Verhaegen. All Rights Reserved.
-Copyright (c) 2004-2005 The Unichrome Project. All Rights Reserved.
-Copyright (c) 1998-2003 VIA Technologies, Inc. All Rights Reserved.
-Copyright (c) 2001-2003 S3 Graphics, Inc. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sub license,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/extra/xf86-video-unichrome/PKGBUILD b/extra/xf86-video-unichrome/PKGBUILD
deleted file mode 100644
index 1647f8cf1..000000000
--- a/extra/xf86-video-unichrome/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 153378 2012-03-12 20:54:55Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-unichrome
-pkgver=0.2.7
-pkgrel=7
-_gitversion=b917bee87db8a65b8e8da0ca12c24a176c9e9fb2
-pkgdesc="Unichrome video drivers for X.Org"
-arch=(i686 x86_64)
-url="http://unichrome.sf.net/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903' 'libx11' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc') # 'glproto')
-options=('!libtool')
-conflicts=('xf86-video-via' 'openchrome' 'xf86-video-openchrome' 'xorg-server<1.11.99.903')
-source=(http://cgit.freedesktop.org/~libv/${pkgname}/snapshot/${pkgname}-${_gitversion}.tar.bz2)
-md5sums=('f7adef052de08a01af86e245d1932239')
-
-build() {
-  cd "${srcdir}/${pkgname}-${_gitversion}"
-  ./autogen.sh --prefix=/usr #--enable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${_gitversion}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-}
diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD
index b689e85e3..2a95b22f5 100644
--- a/extra/xfce4-session/PKGBUILD
+++ b/extra/xfce4-session/PKGBUILD
@@ -1,20 +1,18 @@
-# $Id: PKGBUILD 157922 2012-04-30 05:50:06Z foutrelis $
+# $Id: PKGBUILD 169968 2012-10-30 22:59:13Z heftig $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-session
 pkgver=4.10.0
-pkgrel=3
+pkgrel=6
 pkgdesc="A session manager for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
-# keep xorg-server-utils for https://bugs.archlinux.org/task/21096
-# upower and consolekit for reboot/shutdown/hibernate/suspend
-depends=('libxfce4ui' 'libwnck' 'libsm' 'xorg-iceauth' 'upower' 'consolekit'
-         'xorg-xinit' 'hicolor-icon-theme')
-makedepends=('intltool')
+depends=('libxfce4ui' 'libwnck' 'libsm' 'xorg-iceauth' 'upower' 'xorg-xinit'
+          'hicolor-icon-theme')
+makedepends=('intltool' 'xfce4-dev-tools')
 optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enabled'
             'xscreensaver: for locking screen with xflock4'
             'gnome-screensaver: for locking screen with xflock4'
@@ -22,18 +20,25 @@ optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enab
 replaces=('xfce-utils')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
-sha256sums=('bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
+        xfce4-session-4.10.0-add-systemd-support.patch)
+sha256sums=('bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce'
+            'ffae61c48a4bd0cb51d422cb93f2de9567abaf29085370c455ef349b6a10234b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr \
+  # https://bugzilla.xfce.org/show_bug.cgi?id=8729
+  patch -Np1 -i "$srcdir/xfce4-session-4.10.0-add-systemd-support.patch"
+
+  xdt-autogen
+
+  ./configure \
+    --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib/xfce4 \
     --localstatedir=/var \
     --disable-static \
-    --enable-libgnome-keyring \
     --disable-debug
   make
 }
diff --git a/extra/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch b/extra/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch
new file mode 100644
index 000000000..7ab637b26
--- /dev/null
+++ b/extra/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch
@@ -0,0 +1,388 @@
+diff --git a/xfce4-session/xfsm-systemd.c b/xfce4-session/xfsm-systemd.c
+index 4076586..90e7873 100644
+--- /dev/null
++++ b/xfce4-session/xfsm-systemd.c
+@@ -0,0 +1,123 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2012 Christian Hesse
++ *
++ * Licensed under the GNU General Public License Version 2
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++ */
++
++#include <config.h>
++
++#include <gio/gio.h>
++#include <polkit/polkit.h>
++
++#include "xfsm-systemd.h"
++
++#define SYSTEMD_DBUS_NAME       "org.freedesktop.login1"
++#define SYSTEMD_DBUS_PATH       "/org/freedesktop/login1"
++#define SYSTEMD_DBUS_INTERFACE  "org.freedesktop.login1.Manager"
++#define SYSTEMD_REBOOT_ACTION   "org.freedesktop.login1.reboot"
++#define SYSTEMD_SHUTDOWN_ACTION "org.freedesktop.login1.power-off"
++
++struct _SystemdProxy {
++        PolkitAuthority *authority;
++        PolkitSubject *subject;
++};
++
++SystemdProxy *
++systemd_proxy_new (void)
++{
++        SystemdProxy *proxy;
++
++        proxy = g_new0 (SystemdProxy, 1);
++
++        proxy->authority = polkit_authority_get_sync (NULL, NULL);
++        proxy->subject = polkit_unix_process_new (getpid());
++
++        return proxy;
++}
++
++void
++systemd_proxy_free (SystemdProxy *proxy)
++{
++        g_object_unref (proxy->authority);
++        g_object_unref (proxy->subject);
++
++        g_free (proxy);
++}
++
++gboolean systemd_proxy_can_method (SystemdProxy *proxy, gboolean *can_method, const gchar *method, GError **error)
++{
++        PolkitAuthorizationResult *res;
++        GError *local_error = NULL;
++
++        *can_method = FALSE;
++        res = polkit_authority_check_authorization_sync (proxy->authority,
++                                                         proxy->subject,
++                                                         method,
++                                                         NULL,
++                                                         POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE,
++                                                         NULL,
++                                                         &local_error);
++        if (res == NULL) {
++                g_propagate_error (error, local_error);
++                return FALSE;
++        }
++
++        *can_method = polkit_authorization_result_get_is_authorized (res) ||
++                       polkit_authorization_result_get_is_challenge (res);
++
++        g_object_unref (res);
++
++        return TRUE;
++}
++
++gboolean systemd_proxy_can_restart (SystemdProxy *proxy, gboolean *can_restart, GError **error)
++{
++	return systemd_proxy_can_method(proxy, can_restart, SYSTEMD_REBOOT_ACTION, error);
++}
++
++gboolean systemd_proxy_can_shutdown (SystemdProxy *proxy, gboolean *can_shutdown, GError **error)
++{
++	return systemd_proxy_can_method(proxy, can_shutdown, SYSTEMD_SHUTDOWN_ACTION, error);
++}
++
++gboolean systemd_proxy_method (SystemdProxy *proxy, const gchar *method, GError **error)
++{
++        GDBusConnection *bus;
++
++        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
++        g_dbus_connection_call_sync (bus,
++                                     SYSTEMD_DBUS_NAME,
++                                     SYSTEMD_DBUS_PATH,
++                                     SYSTEMD_DBUS_INTERFACE,
++                                     method,
++                                     g_variant_new ("(b)", TRUE),
++                                     NULL, 0, G_MAXINT, NULL, NULL);
++        g_object_unref (bus);
++
++        return TRUE;
++}
++
++gboolean systemd_proxy_restart (SystemdProxy *proxy, GError **error)
++{
++	return systemd_proxy_method(proxy, "Reboot", error);
++}
++
++gboolean systemd_proxy_shutdown (SystemdProxy *proxy, GError **error)
++{
++	return systemd_proxy_method(proxy, "PowerOff", error);
++}
+diff --git a/xfce4-session/xfsm-systemd.h b/xfce4-session/xfsm-systemd.h
+index 3fa8317..2c4d868 100644
+--- /dev/null
++++ b/xfce4-session/xfsm-systemd.h
+@@ -0,0 +1,42 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2012 Christian Hesse
++ *
++ * Licensed under the GNU General Public License Version 2
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++ */
++
++#ifndef __SYSTEMD_PROXY_H__
++#define __SYSTEMD_PROXY_H__
++
++#include <glib.h>
++
++G_BEGIN_DECLS
++
++typedef struct _SystemdProxy SystemdProxy;
++
++SystemdProxy *systemd_proxy_new (void);
++void          systemd_proxy_free (SystemdProxy *proxy);
++gboolean      systemd_proxy_can_method (SystemdProxy *proxy, gboolean *can_method, const char *method, GError **error);
++gboolean      systemd_proxy_can_restart (SystemdProxy *proxy, gboolean *can_restart, GError **error);
++gboolean      systemd_proxy_can_shutdown (SystemdProxy *proxy, gboolean *can_shutdown, GError **error);
++gboolean      systemd_proxy_method (SystemdProxy *proxy, const char *method, GError **error);
++gboolean      systemd_proxy_restart (SystemdProxy *proxy, GError **error);
++gboolean      systemd_proxy_shutdown (SystemdProxy *proxy, GError **error);
++
++G_END_DECLS
++
++#endif  /* __SYSTEMD_PROXY_H__ */
+
+commit 518a28c23f110617aad36e64c02cdab6a36adf37
+Author: Christian Hesse <eworm@leda.eworm.de>
+Date:   Fri Jul 27 14:21:14 2012 +0200
+
+    ...
+
+diff --git a/configure.in.in b/configure.in.in
+index 9aa4f8f..aa0b8bb 100644
+--- a/configure.in
++++ b/configure.in
+@@ -96,6 +96,33 @@ XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.1.0])
+ XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84])
+ XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0])
+ 
++dnl systemd integration
++AC_ARG_ENABLE([systemd],
++              AS_HELP_STRING([--enable-systemd], [Use systemd]),
++              [with_systemd=$enableval],
++              [with_systemd=auto])
++PKG_CHECK_MODULES(SYSTEMD,
++                  [libsystemd-login polkit-gobject-1],
++                  [have_systemd=yes], [have_systemd=no])
++AC_MSG_CHECKING([whether to use systemd])
++if test x$with_systemd = xauto ; then
++        if test x$have_systemd = xno ; then
++                with_systemd=no
++        else
++                with_systemd=yes
++        fi
++fi
++AC_MSG_RESULT($with_systemd)
++if test x$with_systemd = xyes; then
++        if test x$have_systemd = xno; then
++                AC_MSG_ERROR([Systemd support explicitly required, but systemd not found])
++        fi
++        AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
++fi
++AC_SUBST(SYSTEMD_CFLAGS)
++AC_SUBST(SYSTEMD_LIBS)
++AM_CONDITIONAL(WITH_SYSTEMD, [test "$with_systemd" = "yes"], [Using systemd])
++
+ dnl Check for debugging support
+ XDT_FEATURE_DEBUG([xfsm_debug_default])
+ 
+
+commit f1279eba9452f027a2037be77388767437161d51
+Author: Christian Hesse <eworm@leda.eworm.de>
+Date:   Fri Jul 27 14:18:16 2012 +0200
+
+    ...
+
+diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
+index 1429abd..077cdf3 100644
+--- a/xfce4-session/xfsm-shutdown.c
++++ b/xfce4-session/xfsm-shutdown.c
+@@ -96,7 +96,11 @@ struct _XfsmShutdown
+ {
+   GObject __parent__;
+ 
++#ifdef HAVE_SYSTEMD
++  SystemdProxy   *systemd_proxy;
++#else
+   XfsmConsolekit *consolekit;
++#endif
+   XfsmUPower     *upower;
+ 
+   /* kiosk settings */
+@@ -134,7 +138,11 @@ xfsm_shutdown_init (XfsmShutdown *shutdown)
+ {
+   XfceKiosk *kiosk;
+ 
++#ifdef HAVE_SYSTEMD
++  shutdown->systemd_proxy = systemd_proxy_new ();
++#else
+   shutdown->consolekit = xfsm_consolekit_get ();
++#endif
+   shutdown->upower = xfsm_upower_get ();
+   shutdown->helper_state = SUDO_NOT_INITIAZED;
+   shutdown->helper_require_password = FALSE;
+@@ -153,7 +161,11 @@ xfsm_shutdown_finalize (GObject *object)
+ {
+   XfsmShutdown *shutdown = XFSM_SHUTDOWN (object);
+ 
++#ifdef HAVE_SYSTEMD
++  systemd_proxy_free (shutdown->systemd_proxy);
++#else
+   g_object_unref (G_OBJECT (shutdown->consolekit));
++#endif
+   g_object_unref (G_OBJECT (shutdown->upower));
+ 
+   /* close down helper */
+@@ -644,7 +656,11 @@ xfsm_shutdown_try_restart (XfsmShutdown  *shutdown,
+   if (shutdown->helper_state == SUDO_AVAILABLE)
+     return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_RESTART, error);
+   else
++#ifdef HAVE_SYSTEMD
++    return systemd_proxy_restart (shutdown->systemd_proxy, error);
++#else
+     return xfsm_consolekit_try_restart (shutdown->consolekit, error);
++#endif
+ }
+ 
+ 
+@@ -661,7 +677,11 @@ xfsm_shutdown_try_shutdown (XfsmShutdown  *shutdown,
+   if (shutdown->helper_state == SUDO_AVAILABLE)
+     return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_SHUTDOWN, error);
+   else
++#ifdef HAVE_SYSTEMD
++    return systemd_proxy_shutdown (shutdown->systemd_proxy, error);
++#else
+     return xfsm_consolekit_try_shutdown (shutdown->consolekit, error);
++#endif
+ }
+ 
+ 
+@@ -701,7 +721,11 @@ xfsm_shutdown_can_restart (XfsmShutdown  *shutdown,
+       return TRUE;
+     }
+ 
++#ifdef HAVE_SYSTEMD
++  if (systemd_proxy_can_restart (shutdown->systemd_proxy, can_restart, error))
++#else
+   if (xfsm_consolekit_can_restart (shutdown->consolekit, can_restart, error))
++#endif
+     return TRUE;
+ 
+   if (xfsm_shutdown_sudo_init (shutdown, error))
+@@ -728,7 +752,11 @@ xfsm_shutdown_can_shutdown (XfsmShutdown  *shutdown,
+       return TRUE;
+     }
+ 
++#ifdef HAVE_SYSTEMD
++  if (systemd_proxy_can_shutdown (shutdown->systemd_proxy, can_shutdown, error))
++#else
+   if (xfsm_consolekit_can_shutdown (shutdown->consolekit, can_shutdown, error))
++#endif
+     return TRUE;
+ 
+   if (xfsm_shutdown_sudo_init (shutdown, error))
+
+commit 5aea3fb853683246a537a67423cf5b32076b8dfb
+Author: Christian Hesse <eworm@leda.eworm.de>
+Date:   Fri Jul 27 14:03:27 2012 +0200
+
+    ...
+
+diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
+index c015154..7e3b311 100644
+--- a/xfce4-session/Makefile.am
++++ b/xfce4-session/Makefile.am
+@@ -38,8 +38,6 @@ xfce4_session_SOURCES =							\
+ 	xfsm-compat-gnome.h						\
+ 	xfsm-compat-kde.c						\
+ 	xfsm-compat-kde.h						\
+-	xfsm-consolekit.c						\
+-	xfsm-consolekit.h						\
+ 	xfsm-dns.c							\
+ 	xfsm-dns.h							\
+ 	xfsm-error.c							\
+@@ -65,6 +63,16 @@ xfce4_session_SOURCES =							\
+ 	xfsm-upower.c							\
+ 	xfsm-upower.h
+ 
++if WITH_SYSTEMD
++xfce4_session_SOURCES +=						\
++	xfsm-systemd.c							\
++	xfsm-systemd.h
++else
++xfce4_session_SOURCES +=						\
++	xfsm-consolekit.c						\
++	xfsm-consolekit.h
++endif
++
+ xfce4_session_CFLAGS =							\
+ 	$(LIBSM_CFLAGS)							\
+ 	$(LIBX11_CFLAGS)						\
+@@ -72,6 +80,7 @@ xfce4_session_CFLAGS =							\
+ 	$(DBUS_CFLAGS)							\
+ 	$(DBUS_GLIB_CFLAGS)						\
+ 	$(LIBWNCK_CFLAGS)						\
++	$(SYSTEMD_CFLAGS)						\
+ 	$(XFCONF_CFLAGS)						\
+ 	$(GMODULE_CFLAGS)						\
+ 	$(PLATFORM_CFLAGS)
+@@ -91,6 +100,7 @@ xfce4_session_LDADD =							\
+ 	$(DBUS_LIBS)							\
+ 	$(DBUS_GLIB_LIBS)						\
+ 	$(LIBWNCK_LIBS)							\
++	$(SYSTEMD_LIBS)							\
+ 	$(XFCONF_LIBS)							\
+ 	-lm
+ 
+diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
+index d8757a8..1429abd 100644
+--- a/xfce4-session/xfsm-shutdown.c
++++ b/xfce4-session/xfsm-shutdown.c
+@@ -66,10 +66,13 @@
+ #include <xfce4-session/xfsm-fadeout.h>
+ #include <xfce4-session/xfsm-global.h>
+ #include <xfce4-session/xfsm-legacy.h>
+-#include <xfce4-session/xfsm-consolekit.h>
+ #include <xfce4-session/xfsm-upower.h>
+ 
+-
++#ifdef HAVE_SYSTEMD
++#include <xfce4-session/xfsm-systemd.h>
++#else
++#include <xfce4-session/xfsm-consolekit.h>
++#endif
+ 
+ static void xfsm_shutdown_finalize  (GObject      *object);
+ static void xfsm_shutdown_sudo_free (XfsmShutdown *shutdown);
diff --git a/extra/xfce4-smartbookmark-plugin/PKGBUILD b/extra/xfce4-smartbookmark-plugin/PKGBUILD
index 041af6211..b7857d6d0 100644
--- a/extra/xfce4-smartbookmark-plugin/PKGBUILD
+++ b/extra/xfce4-smartbookmark-plugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 159006 2012-05-14 20:21:29Z foutrelis $
+# $Id: PKGBUILD 171600 2012-11-19 20:34:28Z foutrelis $
 # Maintainer:
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-smartbookmark-plugin
 pkgver=0.4.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Plugin for the Xfce4 panel that lets you quicksearch from selected websites"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin"
@@ -16,16 +16,19 @@ makedepends=('intltool' 'libxt')
 options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.4/$pkgname-$pkgver.tar.bz2
         xfce4-smartbookmark-plugin-archlinux.patch
-        use-exo-open-instead-of-xfbrowser4.patch)
+        use-exo-open-instead-of-xfbrowser4.patch
+        fix-config-write.patch)
 sha256sums=('6c77e8fee0ec4dcee7aa34d94377e068a522b1ea650823422f2f5cca8126f2ed'
             'a126b086811b60a8f3cd1a2b818cb6b9a9c6e959e00db1499b114fa8803325e6'
-            '436f7cda2b2bdfee61ac3d887d17dc91094526fec8713ab84fda249850525aac')
+            '436f7cda2b2bdfee61ac3d887d17dc91094526fec8713ab84fda249850525aac'
+            '21873511b77e0fac6c85f15dc6332fcb4532ac688f3202bc839c00f372249b88')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   patch -Np0 -i "$srcdir/xfce4-smartbookmark-plugin-archlinux.patch"
   patch -Np1 -i "$srcdir/use-exo-open-instead-of-xfbrowser4.patch"
+  patch -Np1 -i "$srcdir/fix-config-write.patch"
 
   ./configure \
     --prefix=/usr \
diff --git a/extra/xfce4-smartbookmark-plugin/fix-config-write.patch b/extra/xfce4-smartbookmark-plugin/fix-config-write.patch
new file mode 100644
index 000000000..0f5a25f4f
--- /dev/null
+++ b/extra/xfce4-smartbookmark-plugin/fix-config-write.patch
@@ -0,0 +1,11 @@
+diff -upr xfce4-smartbookmark-plugin-0.4.4.orig/src/smartbookmark.c xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c
+--- xfce4-smartbookmark-plugin-0.4.4.orig/src/smartbookmark.c	2012-11-19 22:24:16.000000000 +0200
++++ xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c	2012-11-19 22:24:42.000000000 +0200
+@@ -365,6 +365,7 @@ static void search_create_options(XfcePa
+     search_apply_options_cb(search);
+     gtk_widget_destroy(search->opt_dialog);
+     xfce_panel_plugin_unblock_menu(plugin);
++    search_write_config(plugin, search);
+ }
+ 
+ 
diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD
index 9a79b4aee..4558e9281 100644
--- a/extra/xfdesktop/PKGBUILD
+++ b/extra/xfdesktop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 158046 2012-05-01 19:51:23Z foutrelis $
+# $Id: PKGBUILD 170256 2012-11-06 11:49:29Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfdesktop
 pkgver=4.10.0
-pkgrel=3
+pkgrel=5
 pkgdesc="A desktop manager for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
diff --git a/extra/xfdesktop/avoid-duplicating-volume-icons.patch b/extra/xfdesktop/avoid-duplicating-volume-icons.patch
new file mode 100644
index 000000000..45e18ac11
--- /dev/null
+++ b/extra/xfdesktop/avoid-duplicating-volume-icons.patch
@@ -0,0 +1,29 @@
+From 7b8b5cb05bd870549dee2d159e246ce58e325b7f Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Tue, 6 Nov 2012 00:10:48 +0200
+Subject: [PATCH] Avoid duplicating volume icons
+
+This is a workaround for GVFS 1.14.0 which emits volume-added signals
+for pre-existing volumes.
+---
+ src/xfdesktop-file-icon-manager.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
+index 72b6d09..e039cb8 100644
+--- a/src/xfdesktop-file-icon-manager.c
++++ b/src/xfdesktop-file-icon-manager.c
+@@ -2521,6 +2521,10 @@ xfdesktop_file_icon_manager_volume_added(GVolumeMonitor *monitor,
+ {
+     XfdesktopFileIconManager *fmanager = XFDESKTOP_FILE_ICON_MANAGER(user_data);
+ 
++    /* avoid duplicating volume icons -- workaround for GVFS 1.14.0 */
++    if (g_hash_table_lookup(fmanager->priv->removable_icons, volume))
++        return;
++
+     xfdesktop_file_icon_manager_add_removable_volume(fmanager, volume);
+ }
+ 
+-- 
+1.8.0
+
diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD
index 38909230a..439f56456 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168614 2012-10-13 11:49:44Z andyrtr $
+# $Id: PKGBUILD 169760 2012-10-27 23:42:28Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-lib
 pkgver=1.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A multimedia playback engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xine-project.org"
diff --git a/extra/xmms/PKGBUILD b/extra/xmms/PKGBUILD
index 978a9dfe1..b1d1a6dd0 100644
--- a/extra/xmms/PKGBUILD
+++ b/extra/xmms/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 146759 2012-01-17 03:41:24Z eric $
+# $Id: PKGBUILD 171126 2012-11-16 19:24:09Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xmms
 pkgver=1.2.11
-pkgrel=4.1
+pkgrel=6
 pkgdesc="The X MultiMedia System - a multimedia player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://legacy.xmms2.org/"
 license=('GPL')
-depends=('gtk' 'libxxf86vm' 'libsm' 'desktop-file-utils')
+depends=('gtk' 'libxxf86vm' 'libsm' 'zlib' 'desktop-file-utils')
 makedepends=('mesa' 'libmikmod' 'libvorbis' 'alsa-lib' 'libgl')
 optdepends=('libmikmod: for the MikMod input plugin' \
             'libvorbis: for the Ogg Vorbis input plugin' \
@@ -19,7 +19,7 @@ install=xmms.install
 source=(http://legacy.xmms2.org/${pkgname}-${pkgver}.tar.bz2 \
 	xmms-menu.patch xmms-1.2.10-crossfade-0.3.9.patch xmms-fix.diff \
         xmms-1.2.11-CVE-2007-0653.0654.patch xmms-1.2.11-fix-http-title-mpg123.patch \
-        xmms-1.2.11-3dse.patch xmms-1.2.10-recode-id3.patch \
+        xmms-1.2.11-3dse.patch xmms-1.2.10-recode-id3.patch xmms-1.2.11-fix-mikmod-driver.patch \
         xmms-1.2.10-fonts.patch xmms.16.png xmms.32.png xmms.48.png)
 sha1sums=('9d1eae4baab25fd35c9ddfb49321ca60222f672d'
           '27fb6e21bd6db923a425a8df8bd07a2a93867ddb'
@@ -29,6 +29,7 @@ sha1sums=('9d1eae4baab25fd35c9ddfb49321ca60222f672d'
           '0c060385561ea2a4b1c7ad3bd35d3646ae9554f5'
           '6f6db13c780ba4cbddb8613f0abd2db2823f3021'
           '2a3b1bf17054b6bd8b1e5937de5c0ad49af8dc92'
+          '155e11b344af1ba594b4e339640bcca37c8909af'
           '31abd37c9c57bd13b2088eb11a1e54e5aa312bf3'
           '0089d11aa3bce67f3496592d68ee65837406e220'
           'f24071ae484d9b55e61dba076801fa8e7976ff2f'
@@ -49,6 +50,7 @@ build() {
   [ "$CARCH" != "mips64el" ] && patch -p1 < ../xmms-1.2.11-3dse.patch
   patch -p1 < ../xmms-1.2.10-fonts.patch
   patch -p1 < ../xmms-1.2.11-CVE-2007-0653.0654.patch
+  patch -p1 < ../xmms-1.2.11-fix-mikmod-driver.patch
 
   if [ "$CARCH" == "i686" ]; then
     SIMDOPT="--enable-simd"
diff --git a/extra/xmms/xmms-1.2.11-fix-mikmod-driver.patch b/extra/xmms/xmms-1.2.11-fix-mikmod-driver.patch
new file mode 100644
index 000000000..c2d1b4c77
--- /dev/null
+++ b/extra/xmms/xmms-1.2.11-fix-mikmod-driver.patch
@@ -0,0 +1,20 @@
+--- a/Input/mikmod/drv_xmms.c	2003-05-19 23:22:06.000000000 +0200
++++ b/Input/mikmod/drv_xmms.c	2012-11-16 18:52:41.264644767 +0100
+@@ -117,6 +117,10 @@
+ 	return VC_Init();
+ }
+ 
++static void xmms_CommandLine(CHAR * commandLine)
++{
++}
++
+ MDRIVER drv_xmms =
+ {
+ 	NULL,
+@@ -126,5 +130,6 @@
+         "xmms",
+         NULL,
+ #endif
++	xmms_CommandLine, // Was missing
+         xmms_IsThere, 
+ 	VC_SampleLoad,
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 9fa7af6e5..0e11f6ff3 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169364 2012-10-20 06:35:05Z andyrtr $
+# $Id: PKGBUILD 170786 2012-11-11 10:23:23Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
 pkgver=1.13.0
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -21,7 +21,8 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         xvfb-run.1
         10-quirks.conf
         loongson.patch
-        0001-dix-fix-zaphod-screen-scrossing-54654.patch)
+        git-fixes.patch
+        use-pixman-glyph-cache.patch)
 sha256sums=('548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a'
             '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
             'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
@@ -29,11 +30,18 @@ sha256sums=('548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
             '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
             '966b8c509006e3b7e6ac951c93a760ecbb2cb2ad7a5807fb919f0c4ee5e079a5'
-            '23861814b4283ca3fe43aae6e88ee82bcbae5713bf88eabeaef7beb94efe9707')
+            'd49e534b77ead809eb873a1a86cd47c791a8ddd10557bfa635197bba6bc00b71'
+            '7c1dacd30c46b01424c7c75974285cd348dafd0327eb3f211cbe446ad90dd308')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
+  # Apply upstream fixes from server-1.13 branch
+  patch -Np1 -i "${srcdir}/git-fixes.patch"
+
+  # Use pixman 0.28.0 glyph cache - backported from git master
+  patch -Np1 -i "${srcdir}/use-pixman-glyph-cache.patch"
+
   # Use nouveau/nv/nvidia drivers for nvidia devices
   patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch"
 
@@ -43,41 +51,16 @@ build() {
   # Based on http://lists.freedesktop.org/archives/xorg-devel/2011-October/026249.html
   patch -Np1 -i "${srcdir}/loongson.patch"
 
-  # https://bugs.archlinux.org/task/31959 / https://bugs.freedesktop.org/show_bug.cgi?id=54654
-  patch -Np1 -i ${srcdir}/0001-dix-fix-zaphod-screen-scrossing-54654.patch
-
   autoreconf -fi
+
   if [ "$CARCH" = "mips64el" ]; then
-  ./configure --prefix=/usr \
-      --enable-ipv6 \
-      --disable-dri \
-      --disable-dri2 \
-      --enable-dmx \
-      --enable-xvfb \
-      --enable-xnest \
-      --enable-composite \
-      --enable-xcsecurity \
-      --enable-xorg \
-      --enable-xephyr \
-      --disable-glx \
-      --disable-glx-tls \
-      --enable-kdrive \
-      --enable-install-setuid \
-      --enable-config-udev \
-      --disable-config-dbus \
-      --enable-record \
-      --disable-xfbdev \
-      --disable-xfake \
-      --disable-static \
-      --sysconfdir=/etc/X11 \
-      --localstatedir=/var \
-      --with-xkb-path=/usr/share/X11/xkb \
-      --with-xkb-output=/var/lib/xkb \
-      --with-fontrootdir=/usr/share/fonts
+    extra="--disable-dri --disable-dri2 --disable-glx --disable-glx-tls"
   else
+    extra="--enable-dri --enable-glx-tls"
+  fi
+
   ./configure --prefix=/usr \
       --enable-ipv6 \
-      --enable-dri \
       --enable-dmx \
       --enable-xvfb \
       --enable-xnest \
@@ -85,7 +68,6 @@ build() {
       --enable-xcsecurity \
       --enable-xorg \
       --enable-xephyr \
-      --enable-glx-tls \
       --enable-kdrive \
       --enable-kdrive-evdev \
       --enable-kdrive-kbd \
@@ -101,8 +83,8 @@ build() {
       --localstatedir=/var \
       --with-xkb-path=/usr/share/X11/xkb \
       --with-xkb-output=/var/lib/xkb \
-      --with-fontrootdir=/usr/share/fonts
-  fi
+      --with-fontrootdir=/usr/share/fonts \
+      $extra
   make
 
   # Disable subdirs for make install rule to make splitting easier
@@ -132,7 +114,7 @@ package_xorg-server-common() {
 
 package_xorg-server() {
   pkgdesc="Xorg X server"
-  depends=(libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev)
+  depends=(libxdmcp libxfont libpciaccess libdrm 'pixman>=0.28.0' libgcrypt libxau xorg-server-common xf86-input-evdev)
   backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf')
   # see xorg-server-1.13.0/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
   provides=('X-ABI-VIDEODRV_VERSION=13' 'X-ABI-XINPUT_VERSION=18' 'X-ABI-EXTENSION_VERSION=7.0' 'x-server')
@@ -169,7 +151,7 @@ package_xorg-server() {
 
 package_xorg-server-xephyr() {
   pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common)
+  depends=(libxfont libgl libgcrypt libxv 'pixman>=0.28.0' xorg-server-common)
 
   cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive"
   make DESTDIR="${pkgdir}" install
@@ -180,7 +162,7 @@ package_xorg-server-xephyr() {
 
 package_xorg-server-xvfb() {
   pkgdesc="Virtual framebuffer X server"
-  depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common)
+  depends=(libxfont libxdmcp libxau libgcrypt 'pixman>=0.28.0' xorg-server-common)
 
   cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb"
   make DESTDIR="${pkgdir}" install
@@ -194,7 +176,7 @@ package_xorg-server-xvfb() {
 
 package_xorg-server-xnest() {
   pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont libxext libgcrypt pixman xorg-server-common)
+  depends=(libxfont libxext libgcrypt 'pixman>=0.28.0' xorg-server-common)
 
   cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest"
   make DESTDIR="${pkgdir}" install
@@ -205,7 +187,7 @@ package_xorg-server-xnest() {
 
 package_xorg-server-xdmx() {
   pkgdesc="Distributed Multihead X Server and utilities"
-  depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common)
+  depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes 'pixman>=0.28.0' xorg-server-common)
 
   cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx"
   make DESTDIR="${pkgdir}" install
@@ -220,6 +202,8 @@ package_xorg-server-devel() {
            xproto randrproto renderproto xextproto inputproto kbproto 
            fontsproto pixman videoproto xf86driproto glproto 
            mesa xineramaproto libpciaccess
+           # see FS#32146
+           resourceproto scrnsaverproto
            # not technically required but almost every Xorg pkg needs it to build
            xorg-util-macros)
 [ "$CARCH" = "mips64el" ] || depends+=('dri2proto')
@@ -237,24 +221,3 @@ package_xorg-server-devel() {
   install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel"
   ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING"
 }
-md5sums=('7297e025f442904768c360fcbaedbc1f'
-         'ea4852dedbb89550f6bc113ca66348a2'
-         '4f3bc572ad32e6ed22efc38d2a5e429a'
-         '52fd3effd80d7bc6c1660d4ecf23d31c'
-         '376c70308715cd2643f7bff936d9934b'
-         'd4f7dfc6be4ef4e2c6dd7632a9d88abe'
-         'd335870a88231cdbdd2919dd4ca76a1f')
-md5sums=('f87d830aa69885275e26dd6327d76a44'
-         'ea4852dedbb89550f6bc113ca66348a2'
-         '4f3bc572ad32e6ed22efc38d2a5e429a'
-         '52fd3effd80d7bc6c1660d4ecf23d31c'
-         '376c70308715cd2643f7bff936d9934b'
-         'd4f7dfc6be4ef4e2c6dd7632a9d88abe'
-         'd335870a88231cdbdd2919dd4ca76a1f')
-sha256sums=('8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7'
-            '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
-            'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
-            'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
-            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-            '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
-            '966b8c509006e3b7e6ac951c93a760ecbb2cb2ad7a5807fb919f0c4ee5e079a5')
diff --git a/extra/xorg-server/git-fixes.patch b/extra/xorg-server/git-fixes.patch
index f6ca2426b..d1817c00f 100644
--- a/extra/xorg-server/git-fixes.patch
+++ b/extra/xorg-server/git-fixes.patch
@@ -1,1717 +1,643 @@
-From b5bf0ac5405eab77f26bb2f8726644232af17178 Mon Sep 17 00:00:00 2001
-From: Keith Packard <keithp@keithp.com>
-Date: Wed, 11 Apr 2012 16:28:21 +0000
-Subject: hw/xfree86: Spurious ');' in xf86vmode.c messed up indentation badly
-
-Inside the unfinished XF86VIDMODE_EVENTS #ifdef block the
-function definition for xf86VidModeNotifyEvent had an extra ');'
-before the prototype argument declarations. This was harmless for the
-compiler as the code never gets used, but completely messed up the
-file re-indentation. This patch removes the spurious characters in
-preparation for re-indenting the file.
-
-Signed-off-by: Keith Packard <keithp@keithp.com>
-(cherry picked from commit 592bd0ae2b60cd6f6afd3efc40f5f659b12900b4)
----
-diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
-index 6e2a8e9..9f64f8e 100644
---- a/hw/xfree86/dixmods/extmod/xf86vmode.c
-+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
-@@ -75,7 +75,7 @@ static unsigned char XF86VidModeReqCode = 0;
- #ifdef XF86VIDMODE_EVENTS
- static int XF86VidModeEventBase = 0;
- 
--static void SXF86VidModeNotifyEvent();
-+static void SXF86VidModeNotifyEvent(
- xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent *        /* to */
-     );
- 
---
-cgit v0.9.0.2-2-gbebe
-From 3ad72a80088fe3236f38bd0696b04f399e24fe3d Mon Sep 17 00:00:00 2001
-From: Keith Packard <keithp@keithp.com>
-Date: Wed, 11 Apr 2012 16:33:54 +0000
-Subject: hw/xfree86: Re-indent xf86vmode.c
-
-This is the result of re-running the 'x-indent.sh' script over
-xf86vmode.c to clean up the disaster caused by broken syntax in the
-file.
-
-Signed-off-by: Keith Packard <keithp@keithp.com>
-(cherry picked from commit 9779b904c7c0b49c74054c22c420012c40595cdc)
----
-diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
-index 9f64f8e..68c4b58 100644
---- a/hw/xfree86/dixmods/extmod/xf86vmode.c
-+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
-@@ -75,8 +75,7 @@ static unsigned char XF86VidModeReqCode = 0;
- #ifdef XF86VIDMODE_EVENTS
- static int XF86VidModeEventBase = 0;
- 
--static void SXF86VidModeNotifyEvent(
--xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent *        /* to */
-+static void SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent *    /* to */
-     );
- 
- static RESTYPE EventType;       /* resource type for event masks */
-@@ -117,20 +116,22 @@ static DevPrivateKeyRec ScreenPrivateKeyRec;
- #define DEBUG_P(x) /**/
- #endif
-     static int
-- ClientMajorVersion(ClientPtr client) {
-+ClientMajorVersion(ClientPtr client)
-+{
-     VidModePrivPtr pPriv;
- 
--     pPriv = VM_GETPRIV(client);
-+    pPriv = VM_GETPRIV(client);
-     if (!pPriv)
--         return 0;
-+        return 0;
+diff --git a/Xi/exevents.c b/Xi/exevents.c
+index 494d07e..106da3a 100644
+--- a/Xi/exevents.c
++++ b/Xi/exevents.c
+@@ -949,8 +949,6 @@ UpdateDeviceState(DeviceIntPtr device, DeviceEvent *event)
+ 
+         if (!(event->flags & TOUCH_POINTER_EMULATED))
+             return DONT_PROCESS;
+-        if (!(event->flags & TOUCH_END))
+-            return DONT_PROCESS;
+ 
+         DecreaseButtonCount(device, key, &t->buttonsDown, &t->motionMask,
+                             &t->state);
+@@ -1561,6 +1559,7 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev)
+     uint32_t touchid;
+     int type = ev->any.type;
+     int emulate_pointer = ! !(ev->device_event.flags & TOUCH_POINTER_EMULATED);
++    DeviceIntPtr kbd;
+ 
+     if (!t)
+         return;
+@@ -1570,9 +1569,6 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev)
      else
--         return pPriv->major;
-+        return pPriv->major;
- }
-+
- #ifdef XF86VIDMODE_EVENTS
- static void
-- CheckScreenPrivate(pScreen)
-+CheckScreenPrivate(pScreen)
- ScreenPtr
--    pScreen;
-+ pScreen;
- {
-     SetupScreen(pScreen);
+         touchid = ev->device_event.touchid;
  
-@@ -142,9 +143,10 @@ ScreenPtr
+-    if (emulate_pointer)
+-        UpdateDeviceState(dev, &ev->device_event);
+-
+     if (type == ET_TouchBegin) {
+         ti = TouchBeginTouch(dev, ev->device_event.sourceid, touchid,
+                              emulate_pointer);
+@@ -1619,9 +1615,14 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev)
+      * events which _only_ emulate motion just work normally */
+     if (emulate_pointer && ev->any.type != ET_TouchUpdate)
+         DeliverEmulatedMotionEvent(dev, ti, ev);
++
+     if (emulate_pointer && IsMaster(dev))
+         CheckMotion(&ev->device_event, dev);
+ 
++    kbd = GetMaster(dev, KEYBOARD_OR_FLOAT);
++    event_set_state(NULL, kbd, &ev->device_event);
++    ev->device_event.corestate = event_get_corestate(NULL, kbd);
++
+     /* Make sure we have a valid window trace for event delivery; must be
+      * called after event type mutation. Touch end events are always processed
+      * in order to end touch records. */
+@@ -1643,6 +1644,9 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev)
+         if (ev->any.type == ET_TouchEnd)
+             TouchEndTouch(dev, ti);
      }
- }
- 
--static XF86VidModeScreenPrivatePtr MakeScreenPrivate(pScreen)
-+static XF86VidModeScreenPrivatePtr
-+MakeScreenPrivate(pScreen)
- ScreenPtr
--    pScreen;
-+ pScreen;
- {
-     SetupScreen(pScreen);
- 
-@@ -160,18 +162,22 @@ ScreenPtr
- }
- 
- static unsigned long
-- getEventMask(ScreenPtr pScreen, ClientPtr client) {
-+getEventMask(ScreenPtr pScreen, ClientPtr client)
-+{
-     SetupScreen(pScreen);
-     XF86VidModeEventPtr pEv;
- 
-     if (!pPriv)
--         return 0;
-+        return 0;
-     for (pEv = pPriv->events; pEv; pEv = pEv->next)
-         if (pEv->client == client)
-             return pEv->mask;
--     return 0;
--} static Bool
-- setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask) {
-+    return 0;
-+}
 +
-+static Bool
-+setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask)
-+{
-     SetupScreen(pScreen);
-     XF86VidModeEventPtr pEv, *pPrev;
- 
-@@ -181,7 +187,8 @@ static unsigned long
-         pPriv = MakeScreenPrivate(pScreen);
-         if (!pPriv)
-             return FALSE;
--    } for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next)
-+    }
-+    for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next)
-         if (pEv->client == client)
-             break;
-     if (mask == 0) {
-@@ -208,38 +215,43 @@ static unsigned long
- }
- 
- static int
-- XF86VidModeFreeEvents(pointer value, XID id) {
-+XF86VidModeFreeEvents(pointer value, XID id)
-+{
-     XF86VidModeEventPtr pOld = (XF86VidModeEventPtr) value;
-     ScreenPtr pScreen = pOld->screen;
--     SetupScreen(pScreen);
-+
-+    SetupScreen(pScreen);
-     XF86VidModeEventPtr pEv, *pPrev;
- 
-     if (!pPriv)
--         return TRUE;
-+        return TRUE;
-     for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next)
-         if (pEv == pOld)
-             break;
-     if (!pEv)
--         return TRUE;
-+        return TRUE;
-     *pPrev = pEv->next;
--     free(pEv);
--     CheckScreenPrivate(pScreen);
--     return TRUE;
--} static void
-- SendXF86VidModeNotify(ScreenPtr pScreen, int state, Bool forced) {
-+    free(pEv);
-+    CheckScreenPrivate(pScreen);
-+    return TRUE;
-+}
-+
-+static void
-+SendXF86VidModeNotify(ScreenPtr pScreen, int state, Bool forced)
-+{
-     XF86VidModeScreenPrivatePtr pPriv;
-     XF86VidModeEventPtr pEv;
-     unsigned long mask;
-     xXF86VidModeNotifyEvent ev;
-     int kind;
- 
--     UpdateCurrentTimeIf();
--     mask = XF86VidModeNotifyMask;
--     pScreen = screenInfo.screens[pScreen->myNum];
--     pPriv = GetScreenPrivate(pScreen);
-+    UpdateCurrentTimeIf();
-+    mask = XF86VidModeNotifyMask;
-+    pScreen = screenInfo.screens[pScreen->myNum];
-+    pPriv = GetScreenPrivate(pScreen);
-     if (!pPriv)
--         return;
--     kind = XF86VidModeModeChange;
-+        return;
-+    kind = XF86VidModeModeChange;
-     for (pEv = pPriv->events; pEv; pEv = pEv->next) {
-         if (!(pEv->mask & mask))
-             continue;
-@@ -251,8 +263,10 @@ static int
-         ev.forced = forced;
-         WriteEventsToClient(pEv->client, 1, (xEvent *) &ev);
- }} static void
-- SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * from,
--                         xXF86VidModeNotifyEvent * to) {
-+
-+SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * from,
-+                        xXF86VidModeNotifyEvent * to)
-+{
-     to->type = from->type;
-     to->state = from->state;
-     cpswaps(from->sequenceNumber, to->sequenceNumber);
-@@ -264,29 +278,31 @@ static int
- #endif
- 
- static int
-- ProcXF86VidModeQueryVersion(ClientPtr client) {
-+ProcXF86VidModeQueryVersion(ClientPtr client)
-+{
-     xXF86VidModeQueryVersionReply rep;
- 
--     DEBUG_P("XF86VidModeQueryVersion");
-+    DEBUG_P("XF86VidModeQueryVersion");
- 
--     REQUEST_SIZE_MATCH(xXF86VidModeQueryVersionReq);
--     rep.type = X_Reply;
--     rep.length = 0;
--     rep.sequenceNumber = client->sequence;
--     rep.majorVersion = SERVER_XF86VIDMODE_MAJOR_VERSION;
--     rep.minorVersion = SERVER_XF86VIDMODE_MINOR_VERSION;
-+    REQUEST_SIZE_MATCH(xXF86VidModeQueryVersionReq);
-+    rep.type = X_Reply;
-+    rep.length = 0;
-+    rep.sequenceNumber = client->sequence;
-+    rep.majorVersion = SERVER_XF86VIDMODE_MAJOR_VERSION;
-+    rep.minorVersion = SERVER_XF86VIDMODE_MINOR_VERSION;
-     if (client->swapped) {
-         swaps(&rep.sequenceNumber);
-         swapl(&rep.length);
-         swaps(&rep.majorVersion);
-         swaps(&rep.minorVersion);
--    } WriteToClient(client, sizeof(xXF86VidModeQueryVersionReply),
--                    (char *) &rep);
-+    }
-+    WriteToClient(client, sizeof(xXF86VidModeQueryVersionReply), (char *) &rep);
-     return Success;
++    if (emulate_pointer)
++        UpdateDeviceState(dev, &ev->device_event);
  }
  
- static int
-- ProcXF86VidModeGetModeLine(ClientPtr client) {
-+ProcXF86VidModeGetModeLine(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetModeLineReq);
-     xXF86VidModeGetModeLineReply rep;
-     xXF86OldVidModeGetModeLineReply oldrep;
-@@ -294,11 +310,11 @@ static int
-     int dotClock;
-     int ver;
- 
--     DEBUG_P("XF86VidModeGetModeline");
-+    DEBUG_P("XF86VidModeGetModeline");
- 
--     ver = ClientMajorVersion(client);
--     REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq);
--     rep.type = X_Reply;
-+    ver = ClientMajorVersion(client);
-+    REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq);
-+    rep.type = X_Reply;
-     if (ver < 2) {
-         rep.length = bytes_to_int32(SIZEOF(xXF86OldVidModeGetModeLineReply) -
-                                     SIZEOF(xGenericReply));
-@@ -386,7 +402,8 @@ static int
- }
- 
- static int
-- ProcXF86VidModeGetAllModeLines(ClientPtr client) {
-+ProcXF86VidModeGetAllModeLines(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetAllModeLinesReq);
-     xXF86VidModeGetAllModeLinesReply rep;
-     xXF86VidModeModeInfo mdinf;
-@@ -395,38 +412,39 @@ static int
-     int modecount, dotClock;
-     int ver;
- 
--     DEBUG_P("XF86VidModeGetAllModelines");
-+    DEBUG_P("XF86VidModeGetAllModelines");
- 
--     REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq);
-+    REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq);
- 
-     if (stuff->screen >= screenInfo.numScreens)
--         return BadValue;
-+        return BadValue;
- 
--     ver = ClientMajorVersion(client);
-+    ver = ClientMajorVersion(client);
- 
--     modecount = VidModeGetNumOfModes(stuff->screen);
-+    modecount = VidModeGetNumOfModes(stuff->screen);
-     if (modecount < 1)
--         return VidModeErrorBase + XF86VidModeExtensionDisabled;
-+        return VidModeErrorBase + XF86VidModeExtensionDisabled;
- 
-     if (!VidModeGetFirstModeline(stuff->screen, &mode, &dotClock))
--         return BadValue;
-+        return BadValue;
- 
--     rep.type = X_Reply;
--     rep.length = SIZEOF(xXF86VidModeGetAllModeLinesReply) -
-+    rep.type = X_Reply;
-+    rep.length = SIZEOF(xXF86VidModeGetAllModeLinesReply) -
-         SIZEOF(xGenericReply);
-     if (ver < 2)
--         rep.length += modecount * sizeof(xXF86OldVidModeModeInfo);
-+        rep.length += modecount * sizeof(xXF86OldVidModeModeInfo);
-     else
--         rep.length += modecount * sizeof(xXF86VidModeModeInfo);
--     rep.length >>= 2;
--     rep.sequenceNumber = client->sequence;
--     rep.modecount = modecount;
-+        rep.length += modecount * sizeof(xXF86VidModeModeInfo);
-+    rep.length >>= 2;
-+    rep.sequenceNumber = client->sequence;
-+    rep.modecount = modecount;
-     if (client->swapped) {
-         swaps(&rep.sequenceNumber);
-         swapl(&rep.length);
-         swapl(&rep.modecount);
--    } WriteToClient(client, sizeof(xXF86VidModeGetAllModeLinesReply),
--                    (char *) &rep);
-+    }
-+    WriteToClient(client, sizeof(xXF86VidModeGetAllModeLinesReply),
-+                  (char *) &rep);
- 
-     do {
-         mdinf.dotclock = dotClock;
-@@ -492,7 +510,8 @@ static int
-      && VidModeGetModeValue(mode, VIDMODE_FLAGS)  == stuff->flags )
- 
- static int
-- ProcXF86VidModeAddModeLine(ClientPtr client) {
-+ProcXF86VidModeAddModeLine(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeAddModeLineReq);
-     xXF86OldVidModeAddModeLineReq *oldstuff =
-         (xXF86OldVidModeAddModeLineReq *) client->requestBuffer;
-@@ -502,9 +521,9 @@ static int
-     int dotClock;
-     int ver;
- 
--     DEBUG_P("XF86VidModeAddModeline");
-+    DEBUG_P("XF86VidModeAddModeline");
- 
--     ver = ClientMajorVersion(client);
-+    ver = ClientMajorVersion(client);
-     if (ver < 2) {
-         /* convert from old format */
-         stuff = &newstuff;
-@@ -533,7 +552,8 @@ static int
-         stuff->after_vsyncend = oldstuff->after_vsyncend;
-         stuff->after_vtotal = oldstuff->after_vtotal;
-         stuff->after_flags = oldstuff->after_flags;
--    } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-+    }
-+    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-         ErrorF("AddModeLine - scrn: %d clock: %ld\n",
-                (int) stuff->screen, (unsigned long) stuff->dotclock);
-         ErrorF("AddModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n",
-@@ -654,7 +674,8 @@ static int
- }
- 
- static int
-- ProcXF86VidModeDeleteModeLine(ClientPtr client) {
-+ProcXF86VidModeDeleteModeLine(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeDeleteModeLineReq);
-     xXF86OldVidModeDeleteModeLineReq *oldstuff =
-         (xXF86OldVidModeDeleteModeLineReq *) client->requestBuffer;
-@@ -663,9 +684,9 @@ static int
-     int len, dotClock;
-     int ver;
- 
--     DEBUG_P("XF86VidModeDeleteModeline");
-+    DEBUG_P("XF86VidModeDeleteModeline");
- 
--     ver = ClientMajorVersion(client);
-+    ver = ClientMajorVersion(client);
-     if (ver < 2) {
-         /* convert from old format */
-         stuff = &newstuff;
-@@ -683,7 +704,8 @@ static int
-         stuff->vtotal = oldstuff->vtotal;
-         stuff->flags = oldstuff->flags;
-         stuff->privsize = oldstuff->privsize;
--    } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-+    }
-+    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-         ErrorF("DeleteModeLine - scrn: %d clock: %ld\n",
-                (int) stuff->screen, (unsigned long) stuff->dotclock);
-         ErrorF("                 hdsp: %d hbeg: %d hend: %d httl: %d\n",
-@@ -777,7 +799,8 @@ static int
- }
- 
- static int
-- ProcXF86VidModeModModeLine(ClientPtr client) {
-+ProcXF86VidModeModModeLine(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeModModeLineReq);
-     xXF86OldVidModeModModeLineReq *oldstuff =
-         (xXF86OldVidModeModModeLineReq *) client->requestBuffer;
-@@ -786,9 +809,9 @@ static int
-     int len, dotClock;
-     int ver;
- 
--     DEBUG_P("XF86VidModeModModeline");
-+    DEBUG_P("XF86VidModeModModeline");
- 
--     ver = ClientMajorVersion(client);
-+    ver = ClientMajorVersion(client);
-     if (ver < 2) {
-         /* convert from old format */
-         stuff = &newstuff;
-@@ -805,7 +828,8 @@ static int
-         stuff->vtotal = oldstuff->vtotal;
-         stuff->flags = oldstuff->flags;
-         stuff->privsize = oldstuff->privsize;
--    } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-+    }
-+    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-         ErrorF("ModModeLine - scrn: %d hdsp: %d hbeg: %d hend: %d httl: %d\n",
-                (int) stuff->screen, stuff->hdisplay, stuff->hsyncstart,
-                stuff->hsyncend, stuff->htotal);
-@@ -903,7 +927,8 @@ static int
- }
- 
- static int
-- ProcXF86VidModeValidateModeLine(ClientPtr client) {
-+ProcXF86VidModeValidateModeLine(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeValidateModeLineReq);
-     xXF86OldVidModeValidateModeLineReq *oldstuff =
-         (xXF86OldVidModeValidateModeLineReq *) client->requestBuffer;
-@@ -913,9 +938,9 @@ static int
-     int len, status, dotClock;
-     int ver;
- 
--     DEBUG_P("XF86VidModeValidateModeline");
-+    DEBUG_P("XF86VidModeValidateModeline");
- 
--     ver = ClientMajorVersion(client);
-+    ver = ClientMajorVersion(client);
-     if (ver < 2) {
-         /* convert from old format */
-         stuff = &newstuff;
-@@ -933,7 +958,8 @@ static int
-         stuff->vtotal = oldstuff->vtotal;
-         stuff->flags = oldstuff->flags;
-         stuff->privsize = oldstuff->privsize;
--    } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-+    }
-+    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-         ErrorF("ValidateModeLine - scrn: %d clock: %ld\n",
-                (int) stuff->screen, (unsigned long) stuff->dotclock);
-         ErrorF("                   hdsp: %d hbeg: %d hend: %d httl: %d\n",
-@@ -1022,7 +1048,8 @@ static int
- }
- 
- static int
-- ProcXF86VidModeSwitchMode(ClientPtr client) {
-+ProcXF86VidModeSwitchMode(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeSwitchModeReq);
- 
-     DEBUG_P("XF86VidModeSwitchMode");
-@@ -1035,8 +1062,11 @@ static int
-     VidModeZoomViewport(stuff->screen, (short) stuff->zoom);
- 
-     return Success;
--} static int
-- ProcXF86VidModeSwitchToMode(ClientPtr client) {
-+}
-+
-+static int
-+ProcXF86VidModeSwitchToMode(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeSwitchToModeReq);
-     xXF86OldVidModeSwitchToModeReq *oldstuff =
-         (xXF86OldVidModeSwitchToModeReq *) client->requestBuffer;
-@@ -1045,9 +1075,9 @@ static int
-     int len, dotClock;
-     int ver;
- 
--     DEBUG_P("XF86VidModeSwitchToMode");
-+    DEBUG_P("XF86VidModeSwitchToMode");
+ /**
+@@ -1864,6 +1868,11 @@ DeliverTouchEndEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, InternalEvent *ev,
+         goto out;
+     }
  
--     ver = ClientMajorVersion(client);
-+    ver = ClientMajorVersion(client);
-     if (ver < 2) {
-         /* convert from old format */
-         stuff = &newstuff;
-@@ -1065,7 +1095,8 @@ static int
-         stuff->vtotal = oldstuff->vtotal;
-         stuff->flags = oldstuff->flags;
-         stuff->privsize = oldstuff->privsize;
--    } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
++    if (listener->state == LISTENER_AWAITING_BEGIN) {
++        listener->state = LISTENER_HAS_END;
++        goto out;
 +    }
-+    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-         ErrorF("SwitchToMode - scrn: %d clock: %ld\n",
-                (int) stuff->screen, (unsigned long) stuff->dotclock);
-         ErrorF("               hdsp: %d hbeg: %d hend: %d httl: %d\n",
-@@ -1138,7 +1169,8 @@ static int
- }
- 
- static int
-- ProcXF86VidModeLockModeSwitch(ClientPtr client) {
-+ProcXF86VidModeLockModeSwitch(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeLockModeSwitchReq);
- 
-     REQUEST_SIZE_MATCH(xXF86VidModeLockModeSwitchReq);
-@@ -1152,53 +1184,57 @@ static int
-         return VidModeErrorBase + XF86VidModeZoomLocked;
- 
-     return Success;
--} static int
-- ProcXF86VidModeGetMonitor(ClientPtr client) {
-+}
 +
-+static int
-+ProcXF86VidModeGetMonitor(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetMonitorReq);
-     xXF86VidModeGetMonitorReply rep;
-     CARD32 *hsyncdata, *vsyncdata;
-     int i, nHsync, nVrefresh;
-     pointer monitor;
- 
--     DEBUG_P("XF86VidModeGetMonitor");
-+    DEBUG_P("XF86VidModeGetMonitor");
- 
--     REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq);
-+    REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq);
- 
-     if (stuff->screen >= screenInfo.numScreens)
--         return BadValue;
-+        return BadValue;
- 
-     if (!VidModeGetMonitor(stuff->screen, &monitor))
--         return BadValue;
-+        return BadValue;
- 
--     nHsync = VidModeGetMonitorValue(monitor, VIDMODE_MON_NHSYNC, 0).i;
--     nVrefresh = VidModeGetMonitorValue(monitor, VIDMODE_MON_NVREFRESH, 0).i;
-+    nHsync = VidModeGetMonitorValue(monitor, VIDMODE_MON_NHSYNC, 0).i;
-+    nVrefresh = VidModeGetMonitorValue(monitor, VIDMODE_MON_NVREFRESH, 0).i;
+     /* Event in response to reject */
+     if (ev->device_event.flags & TOUCH_REJECT) {
+         if (listener->state != LISTENER_HAS_END)
+diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c
+index 0e45cb8..ab1b624 100644
+--- a/Xi/xiselectev.c
++++ b/Xi/xiselectev.c
+@@ -180,8 +180,13 @@ ProcXISelectEvents(ClientPtr client)
+                     if (CLIENT_ID(iclient->resource) == client->index)
+                         continue;
+ 
+-                    dixLookupDevice(&tmp, evmask->deviceid, serverClient,
+-                                    DixReadAccess);
++                    if (evmask->deviceid == XIAllDevices)
++                        tmp = inputInfo.all_devices;
++                    else if (evmask->deviceid == XIAllMasterDevices)
++                        tmp = inputInfo.all_master_devices;
++                    else
++                        dixLookupDevice(&tmp, evmask->deviceid, serverClient,
++                                        DixReadAccess);
+                     if (!tmp)
+                         return BadImplementation;       /* this shouldn't happen */
+ 
+diff --git a/config/udev.c b/config/udev.c
+index c2d00bb..454838f 100644
+--- a/config/udev.c
++++ b/config/udev.c
+@@ -300,9 +300,15 @@ wakeup_handler(pointer data, int err, pointer read_mask)
+             return;
+         action = udev_device_get_action(udev_device);
+         if (action) {
+-            if (!strcmp(action, "add") || !strcmp(action, "change")) {
++            if (!strcmp(action, "add")) {
+                 device_removed(udev_device);
+                 device_added(udev_device);
++            } else if (!strcmp(action, "change")) {
++                /* ignore change for the drm devices */
++                if (strcmp(udev_device_get_subsystem(udev_device), "drm")) {
++                    device_removed(udev_device);
++                    device_added(udev_device);
++                }
+             }
+             else if (!strcmp(action, "remove"))
+                 device_removed(udev_device);
+diff --git a/dix/devices.c b/dix/devices.c
+index 9cf04ed..fd4916a 100644
+--- a/dix/devices.c
++++ b/dix/devices.c
+@@ -306,6 +306,9 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
+     /* unity matrix */
+     memset(transform, 0, sizeof(transform));
+     transform[0] = transform[4] = transform[8] = 1.0f;
++    dev->transform.m[0][0] = 1.0;
++    dev->transform.m[1][1] = 1.0;
++    dev->transform.m[2][2] = 1.0;
+ 
+     XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_TRANSFORM),
+                            XIGetKnownProperty(XATOM_FLOAT), 32,
+@@ -440,6 +443,7 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
+     if (*prev != dev)
+         return FALSE;
  
--     rep.type = X_Reply;
-+    rep.type = X_Reply;
-     if ((char *) (VidModeGetMonitorValue(monitor, VIDMODE_MON_VENDOR, 0)).ptr)
--         rep.vendorLength = strlen((char *) (VidModeGetMonitorValue(monitor,
--                                                                    VIDMODE_MON_VENDOR,
--                                                                    0)).ptr);
-+        rep.vendorLength = strlen((char *) (VidModeGetMonitorValue(monitor,
-+                                                                   VIDMODE_MON_VENDOR,
-+                                                                   0)).ptr);
++    TouchEndPhysicallyActiveTouches(dev);
+     ReleaseButtonsAndKeys(dev);
+     SyncRemoveDeviceIdleTime(dev->idle_counter);
+     dev->idle_counter = NULL;
+diff --git a/dix/events.c b/dix/events.c
+index 3b40446..ddb5b34 100644
+--- a/dix/events.c
++++ b/dix/events.c
+@@ -1555,11 +1555,13 @@ ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time,
+     WindowPtr oldWin;
+ 
+     /* slave devices need to float for the duration of the grab. */
+-    if (grab->grabtype == XI2 &&
++    if (grab->grabtype == XI2 && keybd->enabled &&
+         !(passive & ImplicitGrabMask) && !IsMaster(keybd))
+         DetachFromMaster(keybd);
+ 
+-    if (grabinfo->grab)
++    if (!keybd->enabled)
++        oldWin = NULL;
++    else if (grabinfo->grab)
+         oldWin = grabinfo->grab->window;
+     else if (keybd->focus)
+         oldWin = keybd->focus->win;
+@@ -1569,7 +1571,8 @@ ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time,
+         oldWin = keybd->focus->win;
+     if (keybd->valuator)
+         keybd->valuator->motionHintWindow = NullWindow;
+-    DoFocusEvents(keybd, oldWin, grab->window, NotifyGrab);
++    if (oldWin)
++        DoFocusEvents(keybd, oldWin, grab->window, NotifyGrab);
+     if (syncEvents.playingEvents)
+         grabinfo->grabTime = syncEvents.time;
      else
--         rep.vendorLength = 0;
-+        rep.vendorLength = 0;
-     if ((char *) (VidModeGetMonitorValue(monitor, VIDMODE_MON_MODEL, 0)).ptr)
--         rep.modelLength = strlen((char *) (VidModeGetMonitorValue(monitor,
--                                                                   VIDMODE_MON_MODEL,
--                                                                   0)).ptr);
-+        rep.modelLength = strlen((char *) (VidModeGetMonitorValue(monitor,
-+                                                                  VIDMODE_MON_MODEL,
-+                                                                  0)).ptr);
-     else
--         rep.modelLength = 0;
--     rep.length =
-+        rep.modelLength = 0;
-+    rep.length =
-         bytes_to_int32(SIZEOF(xXF86VidModeGetMonitorReply) -
-                        SIZEOF(xGenericReply) + (nHsync +
-                                                 nVrefresh) * sizeof(CARD32) +
-                        pad_to_int32(rep.vendorLength) +
-                        pad_to_int32(rep.modelLength));
--     rep.sequenceNumber = client->sequence;
--     rep.nhsync = nHsync;
--     rep.nvsync = nVrefresh;
--     hsyncdata = malloc(nHsync * sizeof(CARD32));
-+    rep.sequenceNumber = client->sequence;
-+    rep.nhsync = nHsync;
-+    rep.nvsync = nVrefresh;
-+    hsyncdata = malloc(nHsync * sizeof(CARD32));
-     if (!hsyncdata) {
-         return BadAlloc;
--    } vsyncdata = malloc(nVrefresh * sizeof(CARD32));
-+    }
-+    vsyncdata = malloc(nVrefresh * sizeof(CARD32));
- 
-     if (!vsyncdata) {
-         free(hsyncdata);
-@@ -1208,19 +1244,18 @@ static int
-     for (i = 0; i < nHsync; i++) {
-         hsyncdata[i] = (unsigned short) (VidModeGetMonitorValue(monitor,
-                                                                 VIDMODE_MON_HSYNC_LO,
--                                                                i)).
--            f | (unsigned
--                 short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_HSYNC_HI,
--                                                i)).f << 16;
-+                                                                i)).f |
-+            (unsigned
-+             short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_HSYNC_HI,
-+                                            i)).f << 16;
-     }
-     for (i = 0; i < nVrefresh; i++) {
-         vsyncdata[i] = (unsigned short) (VidModeGetMonitorValue(monitor,
-                                                                 VIDMODE_MON_VREFRESH_LO,
--                                                                i)).
--            f | (unsigned
--                 short) (VidModeGetMonitorValue(monitor,
--                                                VIDMODE_MON_VREFRESH_HI,
--                                                i)).f << 16;
-+                                                                i)).f |
-+            (unsigned
-+             short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_VREFRESH_HI,
-+                                            i)).f << 16;
+@@ -1590,13 +1593,10 @@ DeactivateKeyboardGrab(DeviceIntPtr keybd)
+ {
+     GrabPtr grab = keybd->deviceGrab.grab;
+     DeviceIntPtr dev;
+-    WindowPtr focusWin = keybd->focus ? keybd->focus->win
+-        : keybd->spriteInfo->sprite->win;
++    WindowPtr focusWin;
+     Bool wasImplicit = (keybd->deviceGrab.fromPassiveGrab &&
+                         keybd->deviceGrab.implicitGrab);
+ 
+-    if (focusWin == FollowKeyboardWin)
+-        focusWin = inputInfo.keyboard->focus->win;
+     if (keybd->valuator)
+         keybd->valuator->motionHintWindow = NullWindow;
+     keybd->deviceGrab.grab = NullGrab;
+@@ -1607,6 +1607,17 @@ DeactivateKeyboardGrab(DeviceIntPtr keybd)
+         if (dev->deviceGrab.sync.other == grab)
+             dev->deviceGrab.sync.other = NullGrab;
      }
- 
-     if (client->swapped) {
-@@ -1249,38 +1284,40 @@ static int
- }
- 
- static int
-- ProcXF86VidModeGetViewPort(ClientPtr client) {
-+ProcXF86VidModeGetViewPort(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetViewPortReq);
-     xXF86VidModeGetViewPortReply rep;
-     int x, y;
- 
--     DEBUG_P("XF86VidModeGetViewPort");
-+    DEBUG_P("XF86VidModeGetViewPort");
- 
--     REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq);
-+    REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq);
- 
-     if (stuff->screen >= screenInfo.numScreens)
--         return BadValue;
-+        return BadValue;
- 
--     rep.type = X_Reply;
--     rep.length = 0;
--     rep.sequenceNumber = client->sequence;
-+    rep.type = X_Reply;
-+    rep.length = 0;
-+    rep.sequenceNumber = client->sequence;
- 
--     VidModeGetViewPort(stuff->screen, &x, &y);
--     rep.x = x;
--     rep.y = y;
-+    VidModeGetViewPort(stuff->screen, &x, &y);
-+    rep.x = x;
-+    rep.y = y;
- 
-     if (client->swapped) {
-         swaps(&rep.sequenceNumber);
-         swapl(&rep.length);
-         swapl(&rep.x);
-         swapl(&rep.y);
--    } WriteToClient(client, SIZEOF(xXF86VidModeGetViewPortReply),
--                    (char *) &rep);
-+    }
-+    WriteToClient(client, SIZEOF(xXF86VidModeGetViewPortReply), (char *) &rep);
-     return Success;
- }
- 
- static int
-- ProcXF86VidModeSetViewPort(ClientPtr client) {
-+ProcXF86VidModeSetViewPort(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeSetViewPortReq);
- 
-     DEBUG_P("XF86VidModeSetViewPort");
-@@ -1294,8 +1331,11 @@ static int
-         return BadValue;
- 
-     return Success;
--} static int
-- ProcXF86VidModeGetDotClocks(ClientPtr client) {
-+}
 +
-+static int
-+ProcXF86VidModeGetDotClocks(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetDotClocksReq);
-     xXF86VidModeGetDotClocksReply rep;
-     int n;
-@@ -1304,31 +1344,33 @@ static int
-     int *Clocks = NULL;
-     Bool ClockProg;
- 
--     DEBUG_P("XF86VidModeGetDotClocks");
-+    DEBUG_P("XF86VidModeGetDotClocks");
- 
--     REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq);
-+    REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq);
- 
-     if (stuff->screen >= screenInfo.numScreens)
--         return BadValue;
-+        return BadValue;
- 
--     numClocks = VidModeGetNumOfClocks(stuff->screen, &ClockProg);
-+    numClocks = VidModeGetNumOfClocks(stuff->screen, &ClockProg);
- 
--     rep.type = X_Reply;
--     rep.length = bytes_to_int32(SIZEOF(xXF86VidModeGetDotClocksReply)
--                                 - SIZEOF(xGenericReply) + numClocks);
--     rep.sequenceNumber = client->sequence;
--     rep.clocks = numClocks;
--     rep.maxclocks = MAXCLOCKS;
--     rep.flags = 0;
-+    rep.type = X_Reply;
-+    rep.length = bytes_to_int32(SIZEOF(xXF86VidModeGetDotClocksReply)
-+                                - SIZEOF(xGenericReply) + numClocks);
-+    rep.sequenceNumber = client->sequence;
-+    rep.clocks = numClocks;
-+    rep.maxclocks = MAXCLOCKS;
-+    rep.flags = 0;
- 
-     if (!ClockProg) {
-         Clocks = malloc(numClocks * sizeof(int));
-         if (!Clocks)
--             return BadValue;
-+            return BadValue;
-         if (!VidModeGetClocks(stuff->screen, Clocks)) {
-             free(Clocks);
-             return BadValue;
--    }} if (ClockProg) {
-+        }
-+    }
-+    if (ClockProg) {
-         rep.flags |= CLKFLAG_PROGRAMABLE;
-     }
-     if (client->swapped) {
-@@ -1356,7 +1398,8 @@ static int
- }
- 
- static int
-- ProcXF86VidModeSetGamma(ClientPtr client) {
-+ProcXF86VidModeSetGamma(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeSetGammaReq);
- 
-     DEBUG_P("XF86VidModeSetGamma");
-@@ -1372,79 +1415,89 @@ static int
-         return BadValue;
- 
-     return Success;
--} static int
-- ProcXF86VidModeGetGamma(ClientPtr client) {
-+}
++    if (keybd->focus)
++        focusWin = keybd->focus->win;
++    else if (keybd->spriteInfo->sprite)
++        focusWin = keybd->spriteInfo->sprite->win;
++    else
++        focusWin = NullWindow;
 +
-+static int
-+ProcXF86VidModeGetGamma(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetGammaReq);
-     xXF86VidModeGetGammaReply rep;
-     float red, green, blue;
- 
--     DEBUG_P("XF86VidModeGetGamma");
-+    DEBUG_P("XF86VidModeGetGamma");
++    if (focusWin == FollowKeyboardWin)
++        focusWin = inputInfo.keyboard->focus->win;
++
+     DoFocusEvents(keybd, grab->window, focusWin, NotifyUngrab);
  
--     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq);
-+    REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq);
+     if (!wasImplicit && grab->grabtype == XI2)
+diff --git a/dix/getevents.c b/dix/getevents.c
+index 4e62507..8b4379d 100644
+--- a/dix/getevents.c
++++ b/dix/getevents.c
+@@ -896,9 +896,9 @@ scale_to_desktop(DeviceIntPtr dev, ValuatorMask *mask,
+ 
+     /* scale x&y to desktop coordinates */
+     *screenx = rescaleValuatorAxis(x, dev->valuator->axes + 0, NULL,
+-                                   screenInfo.x, screenInfo.width);
++                                   screenInfo.x, screenInfo.width - 1);
+     *screeny = rescaleValuatorAxis(y, dev->valuator->axes + 1, NULL,
+-                                   screenInfo.y, screenInfo.height);
++                                   screenInfo.y, screenInfo.height - 1);
+ 
+     *devx = x;
+     *devy = y;
+@@ -1400,8 +1400,9 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
+        coordinates were.
+      */
+     if (flags & POINTER_SCREEN) {
+-        screenx = sx;
+-        screeny = sy;
++        scr = miPointerGetScreen(pDev);
++        screenx = sx + scr->x;
++        screeny = sy + scr->y;
+     }
  
-     if (stuff->screen >= screenInfo.numScreens)
--         return BadValue;
-+        return BadValue;
+     scr = positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative,
+diff --git a/dix/touch.c b/dix/touch.c
+index 497ad7d..5f77be5 100644
+--- a/dix/touch.c
++++ b/dix/touch.c
+@@ -572,8 +572,8 @@ TouchBuildSprite(DeviceIntPtr sourcedev, TouchPointInfoPtr ti,
+         return FALSE;
  
--     rep.type = X_Reply;
--     rep.length = 0;
--     rep.sequenceNumber = client->sequence;
-+    rep.type = X_Reply;
-+    rep.length = 0;
-+    rep.sequenceNumber = client->sequence;
-     if (!VidModeGetGamma(stuff->screen, &red, &green, &blue))
--         return BadValue;
--     rep.red = (CARD32) (red * 10000.);
--     rep.green = (CARD32) (green * 10000.);
--     rep.blue = (CARD32) (blue * 10000.);
-+        return BadValue;
-+    rep.red = (CARD32) (red * 10000.);
-+    rep.green = (CARD32) (green * 10000.);
-+    rep.blue = (CARD32) (blue * 10000.);
-     if (client->swapped) {
-         swaps(&rep.sequenceNumber);
-         swapl(&rep.length);
-         swapl(&rep.red);
-         swapl(&rep.green);
-         swapl(&rep.blue);
--    } WriteToClient(client, sizeof(xXF86VidModeGetGammaReply), (char *) &rep);
-+    }
-+    WriteToClient(client, sizeof(xXF86VidModeGetGammaReply), (char *) &rep);
+     /* Mark which grabs/event selections we're delivering to: max one grab per
+-     * window plus the bottom-most event selection. */
+-    ti->listeners = calloc(sprite->spriteTraceGood + 1, sizeof(*ti->listeners));
++     * window plus the bottom-most event selection, plus any active grab. */
++    ti->listeners = calloc(sprite->spriteTraceGood + 2, sizeof(*ti->listeners));
+     if (!ti->listeners) {
+         sprite->spriteTraceGood = 0;
+         return FALSE;
+@@ -1029,3 +1029,31 @@ TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode,
  
-     return Success;
+     return TouchListenerAcceptReject(dev, ti, i, mode);
  }
- 
- static int
-- ProcXF86VidModeSetGammaRamp(ClientPtr client) {
-+ProcXF86VidModeSetGammaRamp(ClientPtr client)
++
++/**
++ * End physically active touches for a device.
++ */
++void
++TouchEndPhysicallyActiveTouches(DeviceIntPtr dev)
 +{
-     CARD16 *r, *g, *b;
-     int length;
--     REQUEST(xXF86VidModeSetGammaRampReq);
++    InternalEvent *eventlist = InitEventList(GetMaximumEventsNum());
++    int i;
 +
-+    REQUEST(xXF86VidModeSetGammaRampReq);
- 
-     if (stuff->screen >= screenInfo.numScreens)
--         return BadValue;
-+        return BadValue;
- 
-     if (stuff->size != VidModeGetGammaRampSize(stuff->screen))
--         return BadValue;
-+        return BadValue;
- 
--     length = (stuff->size + 1) & ~1;
-+    length = (stuff->size + 1) & ~1;
- 
--     REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length * 6);
-+    REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length * 6);
- 
--     r = (CARD16 *) &stuff[1];
--     g = r + length;
--     b = g + length;
-+    r = (CARD16 *) &stuff[1];
-+    g = r + length;
-+    b = g + length;
- 
-     if (!VidModeSetGammaRamp(stuff->screen, stuff->size, r, g, b))
--         return BadValue;
-+        return BadValue;
- 
--     return Success;
--} static int
-- ProcXF86VidModeGetGammaRamp(ClientPtr client) {
-+    return Success;
-+}
++    OsBlockSignals();
++    mieqProcessInputEvents();
++    for (i = 0; i < dev->last.num_touches; i++) {
++        DDXTouchPointInfoPtr ddxti = dev->last.touches + i;
 +
-+static int
-+ProcXF86VidModeGetGammaRamp(ClientPtr client)
-+{
-     CARD16 *ramp = NULL;
-     int length;
-     size_t ramplen = 0;
-     xXF86VidModeGetGammaRampReply rep;
--     REQUEST(xXF86VidModeGetGammaRampReq);
++        if (ddxti->active) {
++            int j;
++            int nevents = GetTouchEvents(eventlist, dev, ddxti->ddx_id,
++                                         XI_TouchEnd, 0, NULL);
 +
-+    REQUEST(xXF86VidModeGetGammaRampReq);
- 
-     if (stuff->screen >= screenInfo.numScreens)
--         return BadValue;
-+        return BadValue;
- 
-     if (stuff->size != VidModeGetGammaRampSize(stuff->screen))
--         return BadValue;
-+        return BadValue;
- 
--     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq);
-+    REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq);
- 
--     length = (stuff->size + 1) & ~1;
-+    length = (stuff->size + 1) & ~1;
- 
-     if (stuff->size) {
-         ramplen = length * 3 * sizeof(CARD16);
-@@ -1455,7 +1508,9 @@ static int
-                                  ramp, ramp + length, ramp + (length * 2))) {
-             free(ramp);
-             return BadValue;
--    }} rep.type = X_Reply;
++            for (j = 0; j < nevents; j++)
++                mieqProcessDeviceEvent(dev, eventlist + j, NULL);
 +        }
 +    }
-+    rep.type = X_Reply;
-     rep.length = (length >> 1) * 3;
-     rep.sequenceNumber = client->sequence;
-     rep.size = stuff->size;
-@@ -1476,47 +1531,53 @@ static int
- }
- 
- static int
-- ProcXF86VidModeGetGammaRampSize(ClientPtr client) {
-+ProcXF86VidModeGetGammaRampSize(ClientPtr client)
-+{
-     xXF86VidModeGetGammaRampSizeReply rep;
--     REQUEST(xXF86VidModeGetGammaRampSizeReq);
++    OsReleaseSignals();
 +
-+    REQUEST(xXF86VidModeGetGammaRampSizeReq);
- 
-     if (stuff->screen >= screenInfo.numScreens)
--         return BadValue;
-+        return BadValue;
- 
--     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq);
-+    REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq);
- 
--     rep.type = X_Reply;
--     rep.length = 0;
--     rep.sequenceNumber = client->sequence;
--     rep.size = VidModeGetGammaRampSize(stuff->screen);
-+    rep.type = X_Reply;
-+    rep.length = 0;
-+    rep.sequenceNumber = client->sequence;
-+    rep.size = VidModeGetGammaRampSize(stuff->screen);
-     if (client->swapped) {
-         swaps(&rep.sequenceNumber);
-         swapl(&rep.length);
-         swaps(&rep.size);
--    } WriteToClient(client, sizeof(xXF86VidModeGetGammaRampSizeReply),
--                    (char *) &rep);
-+    }
-+    WriteToClient(client, sizeof(xXF86VidModeGetGammaRampSizeReply),
-+                  (char *) &rep);
- 
-     return Success;
- }
- 
- static int
-- ProcXF86VidModeGetPermissions(ClientPtr client) {
-+ProcXF86VidModeGetPermissions(ClientPtr client)
-+{
-     xXF86VidModeGetPermissionsReply rep;
--     REQUEST(xXF86VidModeGetPermissionsReq);
++    FreeEventList(eventlist, GetMaximumEventsNum());
++}
+diff --git a/exa/exa_priv.h b/exa/exa_priv.h
+index ea7e7fa..2e4759d 100644
+--- a/exa/exa_priv.h
++++ b/exa/exa_priv.h
+@@ -209,6 +209,7 @@ typedef struct {
+     RegionRec srcReg;
+     RegionRec maskReg;
+     PixmapPtr srcPix;
++    PixmapPtr maskPix;
+ 
+     DevPrivateKeyRec pixmapPrivateKeyRec;
+     DevPrivateKeyRec gcPrivateKeyRec;
+diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
+index 5716138..b0a0011 100644
+--- a/exa/exa_unaccel.c
++++ b/exa/exa_unaccel.c
+@@ -442,6 +442,13 @@ ExaSrcValidate(DrawablePtr pDrawable,
+     RegionPtr dst;
+     int xoff, yoff;
+ 
++    if (pExaScr->srcPix == pPix)
++        dst = &pExaScr->srcReg;
++    else if (pExaScr->maskPix == pPix)
++        dst = &pExaScr->maskReg;
++    else
++        return;
 +
-+    REQUEST(xXF86VidModeGetPermissionsReq);
+     exaGetDrawableDeltas(pDrawable, pPix, &xoff, &yoff);
  
-     if (stuff->screen >= screenInfo.numScreens)
--         return BadValue;
-+        return BadValue;
+     box.x1 = x + xoff;
+@@ -449,8 +456,6 @@ ExaSrcValidate(DrawablePtr pDrawable,
+     box.x2 = box.x1 + width;
+     box.y2 = box.y1 + height;
  
--     REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq);
-+    REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq);
- 
--     rep.type = X_Reply;
--     rep.length = 0;
--     rep.sequenceNumber = client->sequence;
--     rep.permissions = XF86VM_READ_PERMISSION;
-+    rep.type = X_Reply;
-+    rep.length = 0;
-+    rep.sequenceNumber = client->sequence;
-+    rep.permissions = XF86VM_READ_PERMISSION;
-     if (xf86GetVidModeEnabled() &&
-         (xf86GetVidModeAllowNonLocal() || LocalClient(client))) {
-         rep.permissions |= XF86VM_WRITE_PERMISSION;
--    } if (client->swapped) {
-+    }
-+    if (client->swapped) {
-         swaps(&rep.sequenceNumber);
-         swapl(&rep.length);
-         swapl(&rep.permissions);
-@@ -1528,21 +1589,23 @@ static int
- }
- 
- static int
-- ProcXF86VidModeSetClientVersion(ClientPtr client) {
-+ProcXF86VidModeSetClientVersion(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeSetClientVersionReq);
- 
-     VidModePrivPtr pPriv;
- 
--     DEBUG_P("XF86VidModeSetClientVersion");
-+    DEBUG_P("XF86VidModeSetClientVersion");
- 
--     REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq);
-+    REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq);
- 
-     if ((pPriv = VM_GETPRIV(client)) == NULL) {
-         pPriv = malloc(sizeof(VidModePrivRec));
-         if (!pPriv)
-             return BadAlloc;
-         VM_SETPRIV(client, pPriv);
--    } pPriv->major = stuff->major;
-+    }
-+    pPriv->major = stuff->major;
- 
-     pPriv->minor = stuff->minor;
- 
-@@ -1550,85 +1613,103 @@ static int
- }
+-    dst = (pExaScr->srcPix == pPix) ? &pExaScr->srcReg : &pExaScr->maskReg;
+-
+     RegionInit(&reg, &box, 1);
+     RegionUnion(dst, dst, &reg);
+     RegionUninit(&reg);
+@@ -495,16 +500,19 @@ ExaPrepareCompositeReg(ScreenPtr pScreen,
+         if (pSrc != pDst)
+             RegionTranslate(pSrc->pCompositeClip,
+                             -pSrc->pDrawable->x, -pSrc->pDrawable->y);
+-    }
++    } else
++        pExaScr->srcPix = NULL;
+ 
+     if (pMask && pMask->pDrawable) {
+         pMaskPix = exaGetDrawablePixmap(pMask->pDrawable);
+         RegionNull(&pExaScr->maskReg);
+         maskReg = &pExaScr->maskReg;
++        pExaScr->maskPix = pMaskPix;
+         if (pMask != pDst && pMask != pSrc)
+             RegionTranslate(pMask->pCompositeClip,
+                             -pMask->pDrawable->x, -pMask->pDrawable->y);
+-    }
++    } else
++        pExaScr->maskPix = NULL;
+ 
+     RegionTranslate(pDst->pCompositeClip,
+                     -pDst->pDrawable->x, -pDst->pDrawable->y);
+diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
+index f8fcde9..532d87b 100644
+--- a/hw/xfree86/common/Makefile.am
++++ b/hw/xfree86/common/Makefile.am
+@@ -15,6 +15,7 @@ XVSDKINCS = xf86xv.h xf86xvmc.h xf86xvpriv.h
+ endif
+ 
+ if XF86VIDMODE
++XF86VMODESOURCES = xf86vmode.c
+ XF86VMODE_SDK = vidmodeproc.h
+ endif
+ 
+@@ -47,7 +48,7 @@ libcommon_la_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
+                       xf86VidMode.c xf86fbman.c xf86cmap.c \
+                       xf86Helper.c xf86PM.c xf86Xinput.c xisb.c \
+                       xf86Mode.c xorgHelper.c xf86Extensions.h \
+-		      xf86Extensions.c xf86vmode.c \
++		      xf86Extensions.c $(XF86VMODESOURCES) \
+                       $(XVSOURCES) $(BUSSOURCES) $(RANDRSOURCES)
+ nodist_libcommon_la_SOURCES = xf86DefModeSet.c xf86Build.h
+ libcommon_la_LIBADD = $(top_builddir)/config/libconfig.la
+diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
+index bb2903d..74da438 100644
+--- a/hw/xfree86/common/xf86.h
++++ b/hw/xfree86/common/xf86.h
+@@ -468,4 +468,8 @@ extern _X_EXPORT ScreenPtr xf86ScrnToScreen(ScrnInfoPtr pScrn);
+ /* flags passed to xf86 allocate screen */
+ #define XF86_ALLOCATE_GPU_SCREEN 1
+ 
++/* Update the internal total dimensions of all ScreenRecs together */
++extern _X_EXPORT void
++xf86UpdateDesktopDimensions(void);
++
+ #endif                          /* _XF86_H */
+diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
+index 6de8409..4ffbf7e 100644
+--- a/hw/xfree86/common/xf86Bus.c
++++ b/hw/xfree86/common/xf86Bus.c
+@@ -81,6 +81,8 @@ xf86CallDriverProbe(DriverPtr drv, Bool detect_only)
+     if (drv->platformProbe != NULL) {
+         foundScreen = xf86platformProbeDev(drv);
+     }
++    if (ServerIsNotSeat0())
++        return foundScreen;
+ #endif
  
- static int
-- ProcXF86VidModeDispatch(ClientPtr client) {
-+ProcXF86VidModeDispatch(ClientPtr client)
-+{
-     REQUEST(xReq);
-     switch (stuff->data) {
-     case X_XF86VidModeQueryVersion:
-         return ProcXF86VidModeQueryVersion(client);
--        case X_XF86VidModeGetModeLine:return ProcXF86VidModeGetModeLine(client);
--        case X_XF86VidModeGetMonitor:return ProcXF86VidModeGetMonitor(client);
--        case X_XF86VidModeGetAllModeLines:return
--            ProcXF86VidModeGetAllModeLines(client);
--        case X_XF86VidModeValidateModeLine:return
--            ProcXF86VidModeValidateModeLine(client);
--        case X_XF86VidModeGetViewPort:return ProcXF86VidModeGetViewPort(client);
--        case X_XF86VidModeGetDotClocks:return
--            ProcXF86VidModeGetDotClocks(client);
--        case X_XF86VidModeSetClientVersion:return
--            ProcXF86VidModeSetClientVersion(client);
--        case X_XF86VidModeGetGamma:return ProcXF86VidModeGetGamma(client);
--        case X_XF86VidModeGetGammaRamp:return
--            ProcXF86VidModeGetGammaRamp(client);
--        case X_XF86VidModeGetGammaRampSize:return
--            ProcXF86VidModeGetGammaRampSize(client);
--        case X_XF86VidModeGetPermissions:return
--            ProcXF86VidModeGetPermissions(client);
--        default:if (!xf86GetVidModeEnabled())
-+    case X_XF86VidModeGetModeLine:
-+        return ProcXF86VidModeGetModeLine(client);
-+    case X_XF86VidModeGetMonitor:
-+        return ProcXF86VidModeGetMonitor(client);
-+    case X_XF86VidModeGetAllModeLines:
-+        return ProcXF86VidModeGetAllModeLines(client);
-+    case X_XF86VidModeValidateModeLine:
-+        return ProcXF86VidModeValidateModeLine(client);
-+    case X_XF86VidModeGetViewPort:
-+        return ProcXF86VidModeGetViewPort(client);
-+    case X_XF86VidModeGetDotClocks:
-+        return ProcXF86VidModeGetDotClocks(client);
-+    case X_XF86VidModeSetClientVersion:
-+        return ProcXF86VidModeSetClientVersion(client);
-+    case X_XF86VidModeGetGamma:
-+        return ProcXF86VidModeGetGamma(client);
-+    case X_XF86VidModeGetGammaRamp:
-+        return ProcXF86VidModeGetGammaRamp(client);
-+    case X_XF86VidModeGetGammaRampSize:
-+        return ProcXF86VidModeGetGammaRampSize(client);
-+    case X_XF86VidModeGetPermissions:
-+        return ProcXF86VidModeGetPermissions(client);
-+    default:
-+        if (!xf86GetVidModeEnabled())
-             return VidModeErrorBase + XF86VidModeExtensionDisabled;
-         if (xf86GetVidModeAllowNonLocal() || LocalClient(client)) {
-             switch (stuff->data) {
-             case X_XF86VidModeAddModeLine:
-                 return ProcXF86VidModeAddModeLine(client);
--                case X_XF86VidModeDeleteModeLine:return
--                    ProcXF86VidModeDeleteModeLine(client);
--                case X_XF86VidModeModModeLine:return
--                    ProcXF86VidModeModModeLine(client);
--                case X_XF86VidModeSwitchMode:return
--                    ProcXF86VidModeSwitchMode(client);
--                case X_XF86VidModeSwitchToMode:return
--                    ProcXF86VidModeSwitchToMode(client);
--                case X_XF86VidModeLockModeSwitch:return
--                    ProcXF86VidModeLockModeSwitch(client);
--                case X_XF86VidModeSetViewPort:return
--                    ProcXF86VidModeSetViewPort(client);
--                case X_XF86VidModeSetGamma:return
--                    ProcXF86VidModeSetGamma(client);
--                case X_XF86VidModeSetGammaRamp:return
--                    ProcXF86VidModeSetGammaRamp(client);
--                default:return BadRequest;
--        }}
-+            case X_XF86VidModeDeleteModeLine:
-+                return ProcXF86VidModeDeleteModeLine(client);
-+            case X_XF86VidModeModModeLine:
-+                return ProcXF86VidModeModModeLine(client);
-+            case X_XF86VidModeSwitchMode:
-+                return ProcXF86VidModeSwitchMode(client);
-+            case X_XF86VidModeSwitchToMode:
-+                return ProcXF86VidModeSwitchToMode(client);
-+            case X_XF86VidModeLockModeSwitch:
-+                return ProcXF86VidModeLockModeSwitch(client);
-+            case X_XF86VidModeSetViewPort:
-+                return ProcXF86VidModeSetViewPort(client);
-+            case X_XF86VidModeSetGamma:
-+                return ProcXF86VidModeSetGamma(client);
-+            case X_XF86VidModeSetGammaRamp:
-+                return ProcXF86VidModeSetGammaRamp(client);
-+            default:
-+                return BadRequest;
-+            }
-+        }
-         else
--             return VidModeErrorBase + XF86VidModeClientNotLocal;
-+            return VidModeErrorBase + XF86VidModeClientNotLocal;
+ #ifdef XSERVER_LIBPCIACCESS
+@@ -214,6 +216,8 @@ xf86BusProbe(void)
+ {
+ #ifdef XSERVER_PLATFORM_BUS
+     xf86platformProbe();
++    if (ServerIsNotSeat0())
++        return;
+ #endif
+ #ifdef XSERVER_LIBPCIACCESS
+     xf86PciProbe();
+diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
+index f681a85..721159d 100644
+--- a/hw/xfree86/common/xf86Helper.c
++++ b/hw/xfree86/common/xf86Helper.c
+@@ -1898,3 +1898,9 @@ xf86ScrnToScreen(ScrnInfoPtr pScrn)
+         return screenInfo.screens[pScrn->scrnIndex];
      }
  }
- 
- static int
-- SProcXF86VidModeQueryVersion(ClientPtr client) {
-+SProcXF86VidModeQueryVersion(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeQueryVersionReq);
-     swaps(&stuff->length);
-     return ProcXF86VidModeQueryVersion(client);
--} static int
-- SProcXF86VidModeGetModeLine(ClientPtr client) {
-+}
 +
-+static int
-+SProcXF86VidModeGetModeLine(ClientPtr client)
++void
++xf86UpdateDesktopDimensions(void)
 +{
-     REQUEST(xXF86VidModeGetModeLineReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq);
-     swaps(&stuff->screen);
-     return ProcXF86VidModeGetModeLine(client);
--} static int
-- SProcXF86VidModeGetAllModeLines(ClientPtr client) {
++    update_desktop_dimensions();
 +}
-+
-+static int
-+SProcXF86VidModeGetAllModeLines(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetAllModeLinesReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq);
-     swaps(&stuff->screen);
-     return ProcXF86VidModeGetAllModeLines(client);
--} static int
-- SProcXF86VidModeAddModeLine(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeAddModeLine(ClientPtr client)
-+{
-     xXF86OldVidModeAddModeLineReq *oldstuff =
-         (xXF86OldVidModeAddModeLineReq *) client->requestBuffer;
-     int ver;
- 
--     REQUEST(xXF86VidModeAddModeLineReq);
--     ver = ClientMajorVersion(client);
-+    REQUEST(xXF86VidModeAddModeLineReq);
-+    ver = ClientMajorVersion(client);
-     if (ver < 2) {
-         swaps(&oldstuff->length);
-         REQUEST_AT_LEAST_SIZE(xXF86OldVidModeAddModeLineReq);
-@@ -1666,13 +1747,14 @@ static int
- }
- 
- static int
-- SProcXF86VidModeDeleteModeLine(ClientPtr client) {
-+SProcXF86VidModeDeleteModeLine(ClientPtr client)
-+{
-     xXF86OldVidModeDeleteModeLineReq *oldstuff =
-         (xXF86OldVidModeDeleteModeLineReq *) client->requestBuffer;
-     int ver;
- 
--     REQUEST(xXF86VidModeDeleteModeLineReq);
--     ver = ClientMajorVersion(client);
-+    REQUEST(xXF86VidModeDeleteModeLineReq);
-+    ver = ClientMajorVersion(client);
-     if (ver < 2) {
-         swaps(&oldstuff->length);
-         REQUEST_AT_LEAST_SIZE(xXF86OldVidModeDeleteModeLineReq);
-@@ -1710,13 +1792,14 @@ static int
- }
- 
- static int
-- SProcXF86VidModeModModeLine(ClientPtr client) {
-+SProcXF86VidModeModModeLine(ClientPtr client)
-+{
-     xXF86OldVidModeModModeLineReq *oldstuff =
-         (xXF86OldVidModeModModeLineReq *) client->requestBuffer;
-     int ver;
- 
--     REQUEST(xXF86VidModeModModeLineReq);
--     ver = ClientMajorVersion(client);
-+    REQUEST(xXF86VidModeModModeLineReq);
-+    ver = ClientMajorVersion(client);
-     if (ver < 2) {
-         swaps(&oldstuff->length);
-         REQUEST_AT_LEAST_SIZE(xXF86OldVidModeModModeLineReq);
-@@ -1754,13 +1837,14 @@ static int
- }
+diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
+index 83f9790..f58b87e 100644
+--- a/hw/xfree86/common/xf86Module.h
++++ b/hw/xfree86/common/xf86Module.h
+@@ -80,7 +80,7 @@ typedef enum {
+  * mask is 0xFFFF0000.
+  */
+ #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
+-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(13, 0)
++#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(13, 1)
+ #define ABI_XINPUT_VERSION	SET_ABI_VERSION(18, 0)
+ #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(7, 0)
+ #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)
+diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
+index 24b9473..0525e39 100644
+--- a/hw/xfree86/common/xf86platformBus.c
++++ b/hw/xfree86/common/xf86platformBus.c
+@@ -213,11 +213,12 @@ xf86platformProbe(void)
+     int i;
+     Bool pci = TRUE;
  
- static int
-- SProcXF86VidModeValidateModeLine(ClientPtr client) {
-+SProcXF86VidModeValidateModeLine(ClientPtr client)
-+{
-     xXF86OldVidModeValidateModeLineReq *oldstuff =
-         (xXF86OldVidModeValidateModeLineReq *) client->requestBuffer;
-     int ver;
++    config_odev_probe(xf86PlatformDeviceProbe);
++
+     if (!xf86scanpci()) {
+         pci = FALSE;
+     }
  
--     REQUEST(xXF86VidModeValidateModeLineReq);
--     ver = ClientMajorVersion(client);
-+    REQUEST(xXF86VidModeValidateModeLineReq);
-+    ver = ClientMajorVersion(client);
-     if (ver < 2) {
-         swaps(&oldstuff->length);
-         REQUEST_AT_LEAST_SIZE(xXF86OldVidModeValidateModeLineReq);
-@@ -1798,44 +1882,60 @@ static int
+-    config_odev_probe(&xf86PlatformDeviceProbe);
+     for (i = 0; i < xf86_num_platform_devices; i++) {
+         char *busid = xf86_get_platform_attrib(i, ODEV_ATTRIB_BUSID);
+ 
+@@ -358,6 +359,9 @@ xf86platformProbeDev(DriverPtr drvp)
+                     break;
+             }
+             else {
++                /* for non-seat0 servers assume first device is the master */
++                if (ServerIsNotSeat0())
++                    break;
+                 if (xf86_platform_devices[j].pdev) {
+                     if (xf86IsPrimaryPlatform(&xf86_platform_devices[j]))
+                         break;
+diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
+index 23f589c..40963c3 100644
+--- a/hw/xfree86/dri2/dri2.c
++++ b/hw/xfree86/dri2/dri2.c
+@@ -766,6 +766,44 @@ static inline PixmapPtr GetDrawablePixmap(DrawablePtr drawable)
+     }
  }
  
- static int
-- SProcXF86VidModeSwitchMode(ClientPtr client) {
-+SProcXF86VidModeSwitchMode(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeSwitchModeReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeSwitchModeReq);
-     swaps(&stuff->screen);
-     swaps(&stuff->zoom);
-     return ProcXF86VidModeSwitchMode(client);
--} static int
-- SProcXF86VidModeSwitchToMode(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeSwitchToMode(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeSwitchToModeReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeSwitchToModeReq);
-     swapl(&stuff->screen);
-     return ProcXF86VidModeSwitchToMode(client);
--} static int
-- SProcXF86VidModeLockModeSwitch(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeLockModeSwitch(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeLockModeSwitchReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeLockModeSwitchReq);
-     swaps(&stuff->screen);
-     swaps(&stuff->lock);
-     return ProcXF86VidModeLockModeSwitch(client);
--} static int
-- SProcXF86VidModeGetMonitor(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeGetMonitor(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetMonitorReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq);
-     swaps(&stuff->screen);
-     return ProcXF86VidModeGetMonitor(client);
--} static int
-- SProcXF86VidModeGetViewPort(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeGetViewPort(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetViewPortReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq);
-     swaps(&stuff->screen);
-     return ProcXF86VidModeGetViewPort(client);
--} static int
-- SProcXF86VidModeSetViewPort(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeSetViewPort(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeSetViewPortReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeSetViewPortReq);
-@@ -1843,23 +1943,32 @@ static int
-     swapl(&stuff->x);
-     swapl(&stuff->y);
-     return ProcXF86VidModeSetViewPort(client);
--} static int
-- SProcXF86VidModeGetDotClocks(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeGetDotClocks(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetDotClocksReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq);
-     swaps(&stuff->screen);
-     return ProcXF86VidModeGetDotClocks(client);
--} static int
-- SProcXF86VidModeSetClientVersion(ClientPtr client) {
-+}
-+
++/*
++ * A TraverseTree callback to invalidate all windows using the same
++ * pixmap
++ */
 +static int
-+SProcXF86VidModeSetClientVersion(ClientPtr client)
++DRI2InvalidateWalk(WindowPtr pWin, pointer data)
 +{
-     REQUEST(xXF86VidModeSetClientVersionReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq);
-     swaps(&stuff->major);
-     swaps(&stuff->minor);
-     return ProcXF86VidModeSetClientVersion(client);
--} static int
-- SProcXF86VidModeSetGamma(ClientPtr client) {
++    if (pWin->drawable.pScreen->GetWindowPixmap(pWin) != data)
++        return WT_DONTWALKCHILDREN;
++    DRI2InvalidateDrawable(&pWin->drawable);
++    return WT_WALKCHILDREN;
 +}
 +
-+static int
-+SProcXF86VidModeSetGamma(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeSetGammaReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeSetGammaReq);
-@@ -1868,120 +1977,145 @@ static int
-     swapl(&stuff->green);
-     swapl(&stuff->blue);
-     return ProcXF86VidModeSetGamma(client);
--} static int
-- SProcXF86VidModeGetGamma(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeGetGamma(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetGammaReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq);
-     swaps(&stuff->screen);
-     return ProcXF86VidModeGetGamma(client);
--} static int
-- SProcXF86VidModeSetGammaRamp(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeSetGammaRamp(ClientPtr client)
-+{
-     int length;
--     REQUEST(xXF86VidModeSetGammaRampReq);
--     swaps(&stuff->length);
--     REQUEST_AT_LEAST_SIZE(xXF86VidModeSetGammaRampReq);
--     swaps(&stuff->size);
--     swaps(&stuff->screen);
--     length = ((stuff->size + 1) & ~1) * 6;
--     REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length);
--     SwapRestS(stuff);
--     return ProcXF86VidModeSetGammaRamp(client);
--} static int
-- SProcXF86VidModeGetGammaRamp(ClientPtr client) {
-+
-+    REQUEST(xXF86VidModeSetGammaRampReq);
-+    swaps(&stuff->length);
-+    REQUEST_AT_LEAST_SIZE(xXF86VidModeSetGammaRampReq);
-+    swaps(&stuff->size);
-+    swaps(&stuff->screen);
-+    length = ((stuff->size + 1) & ~1) * 6;
-+    REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length);
-+    SwapRestS(stuff);
-+    return ProcXF86VidModeSetGammaRamp(client);
-+}
-+
-+static int
-+SProcXF86VidModeGetGammaRamp(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetGammaRampReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq);
-     swaps(&stuff->size);
-     swaps(&stuff->screen);
-     return ProcXF86VidModeGetGammaRamp(client);
--} static int
-- SProcXF86VidModeGetGammaRampSize(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeGetGammaRampSize(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetGammaRampSizeReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq);
-     swaps(&stuff->screen);
-     return ProcXF86VidModeGetGammaRampSize(client);
--} static int
-- SProcXF86VidModeGetPermissions(ClientPtr client) {
++static void
++DRI2InvalidateDrawableAll(DrawablePtr pDraw)
++{
++    if (pDraw->type == DRAWABLE_WINDOW) {
++        WindowPtr pWin = (WindowPtr) pDraw;
++        PixmapPtr pPixmap = pDraw->pScreen->GetWindowPixmap(pWin);
++
++        /*
++         * Find the top-most window using this pixmap
++         */
++        while (pWin->parent &&
++               pDraw->pScreen->GetWindowPixmap(pWin->parent) == pPixmap)
++            pWin = pWin->parent;
++
++        /*
++         * Walk the sub-tree to invalidate all of the
++         * windows using the same pixmap
++         */
++        TraverseTree(pWin, DRI2InvalidateWalk, pPixmap);
++        DRI2InvalidateDrawable(&pPixmap->drawable);
++    }
++    else
++        DRI2InvalidateDrawable(pDraw);
 +}
 +
-+static int
-+SProcXF86VidModeGetPermissions(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetPermissionsReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq);
-     swaps(&stuff->screen);
-     return ProcXF86VidModeGetPermissions(client);
--} static int
-- SProcXF86VidModeDispatch(ClientPtr client) {
-+}
+ DrawablePtr DRI2UpdatePrime(DrawablePtr pDraw, DRI2BufferPtr pDest)
+ {
+     DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
+@@ -831,6 +869,8 @@ DrawablePtr DRI2UpdatePrime(DrawablePtr pDraw, DRI2BufferPtr pDest)
+     spix->screen_x = mpix->screen_x;
+     spix->screen_y = mpix->screen_y;
+ #endif
 +
-+static int
-+SProcXF86VidModeDispatch(ClientPtr client)
-+{
-     REQUEST(xReq);
-     switch (stuff->data) {
-     case X_XF86VidModeQueryVersion:
-         return SProcXF86VidModeQueryVersion(client);
--        case X_XF86VidModeGetModeLine:return
--            SProcXF86VidModeGetModeLine(client);
--        case X_XF86VidModeGetMonitor:return SProcXF86VidModeGetMonitor(client);
--        case X_XF86VidModeGetAllModeLines:return
--            SProcXF86VidModeGetAllModeLines(client);
--        case X_XF86VidModeGetViewPort:return
--            SProcXF86VidModeGetViewPort(client);
--        case X_XF86VidModeValidateModeLine:return
--            SProcXF86VidModeValidateModeLine(client);
--        case X_XF86VidModeGetDotClocks:return
--            SProcXF86VidModeGetDotClocks(client);
--        case X_XF86VidModeSetClientVersion:return
--            SProcXF86VidModeSetClientVersion(client);
--        case X_XF86VidModeGetGamma:return SProcXF86VidModeGetGamma(client);
--        case X_XF86VidModeGetGammaRamp:return
--            SProcXF86VidModeGetGammaRamp(client);
--        case X_XF86VidModeGetGammaRampSize:return
--            SProcXF86VidModeGetGammaRampSize(client);
--        case X_XF86VidModeGetPermissions:return
--            SProcXF86VidModeGetPermissions(client);
--        default:if (!xf86GetVidModeEnabled())
-+    case X_XF86VidModeGetModeLine:
-+        return SProcXF86VidModeGetModeLine(client);
-+    case X_XF86VidModeGetMonitor:
-+        return SProcXF86VidModeGetMonitor(client);
-+    case X_XF86VidModeGetAllModeLines:
-+        return SProcXF86VidModeGetAllModeLines(client);
-+    case X_XF86VidModeGetViewPort:
-+        return SProcXF86VidModeGetViewPort(client);
-+    case X_XF86VidModeValidateModeLine:
-+        return SProcXF86VidModeValidateModeLine(client);
-+    case X_XF86VidModeGetDotClocks:
-+        return SProcXF86VidModeGetDotClocks(client);
-+    case X_XF86VidModeSetClientVersion:
-+        return SProcXF86VidModeSetClientVersion(client);
-+    case X_XF86VidModeGetGamma:
-+        return SProcXF86VidModeGetGamma(client);
-+    case X_XF86VidModeGetGammaRamp:
-+        return SProcXF86VidModeGetGammaRamp(client);
-+    case X_XF86VidModeGetGammaRampSize:
-+        return SProcXF86VidModeGetGammaRampSize(client);
-+    case X_XF86VidModeGetPermissions:
-+        return SProcXF86VidModeGetPermissions(client);
-+    default:
-+        if (!xf86GetVidModeEnabled())
-             return VidModeErrorBase + XF86VidModeExtensionDisabled;
-         if (xf86GetVidModeAllowNonLocal() || LocalClient(client)) {
-             switch (stuff->data) {
-             case X_XF86VidModeAddModeLine:
-                 return SProcXF86VidModeAddModeLine(client);
--                case X_XF86VidModeDeleteModeLine:return
--                    SProcXF86VidModeDeleteModeLine(client);
--                case X_XF86VidModeModModeLine:return
--                    SProcXF86VidModeModModeLine(client);
--                case X_XF86VidModeSwitchMode:return
--                    SProcXF86VidModeSwitchMode(client);
--                case X_XF86VidModeSwitchToMode:return
--                    SProcXF86VidModeSwitchToMode(client);
--                case X_XF86VidModeLockModeSwitch:return
--                    SProcXF86VidModeLockModeSwitch(client);
--                case X_XF86VidModeSetViewPort:return
--                    SProcXF86VidModeSetViewPort(client);
--                case X_XF86VidModeSetGamma:return
--                    SProcXF86VidModeSetGamma(client);
--                case X_XF86VidModeSetGammaRamp:return
--                    SProcXF86VidModeSetGammaRamp(client);
--                default:return BadRequest;
--        }}
-+            case X_XF86VidModeDeleteModeLine:
-+                return SProcXF86VidModeDeleteModeLine(client);
-+            case X_XF86VidModeModModeLine:
-+                return SProcXF86VidModeModModeLine(client);
-+            case X_XF86VidModeSwitchMode:
-+                return SProcXF86VidModeSwitchMode(client);
-+            case X_XF86VidModeSwitchToMode:
-+                return SProcXF86VidModeSwitchToMode(client);
-+            case X_XF86VidModeLockModeSwitch:
-+                return SProcXF86VidModeLockModeSwitch(client);
-+            case X_XF86VidModeSetViewPort:
-+                return SProcXF86VidModeSetViewPort(client);
-+            case X_XF86VidModeSetGamma:
-+                return SProcXF86VidModeSetGamma(client);
-+            case X_XF86VidModeSetGammaRamp:
-+                return SProcXF86VidModeSetGammaRamp(client);
-+            default:
-+                return BadRequest;
-+            }
-+        }
-         else
--             return VidModeErrorBase + XF86VidModeClientNotLocal;
-+            return VidModeErrorBase + XF86VidModeClientNotLocal;
-     }
++    DRI2InvalidateDrawableAll(pDraw);
+     return &spix->drawable;
  }
  
- void
-- XFree86VidModeExtensionInit(void) {
-+XFree86VidModeExtensionInit(void)
-+{
-     ExtensionEntry *extEntry;
-     ScreenPtr pScreen;
-     int i;
-     Bool enabled = FALSE;
- 
--     DEBUG_P("XFree86VidModeExtensionInit");
-+    DEBUG_P("XFree86VidModeExtensionInit");
- 
-     if (!dixRegisterPrivateKey(&VidModeClientPrivateKeyRec, PRIVATE_CLIENT, 0))
--         return;
-+        return;
- #ifdef XF86VIDMODE_EVENTS
-     if (!dixRegisterPrivateKey(&ScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
--         return;
-+        return;
- #endif
- 
- #ifdef XF86VIDMODE_EVENTS
--     EventType = CreateNewResourceType(XF86VidModeFreeEvents, "VidModeEvent");
-+    EventType = CreateNewResourceType(XF86VidModeFreeEvents, "VidModeEvent");
- #endif
- 
-     for (i = 0; i < screenInfo.numScreens; i++) {
-@@ -1990,8 +2124,8 @@ void
-             enabled = TRUE;
-     }
-     /* This means that the DDX doesn't want the vidmode extension enabled */
--        if (!enabled)
--         return;
-+    if (!enabled)
-+        return;
- 
-     if (
- #ifdef XF86VIDMODE_EVENTS
---
-cgit v0.9.0.2-2-gbebe
-From 15607cf2dc87405606b20113011f1ebd97637d32 Mon Sep 17 00:00:00 2001
-From: Daniel Kurtz <djkurtz@chromium.org>
-Date: Thu, 12 Apr 2012 00:11:10 +0000
-Subject: dix: don't BUG_WARN for button events from button-only device
-
-Events from button-only devices still need coordinates, and they get them
-from scale_to_desktop().  Therefore, a dev without valuators is not a bug.
-However, a dev with valuators, but less than two of them still is a bug.
-
-This was noticed when unplugging a "Creative Technology SB Arena Headset",
-which has some BTNs and some KEYs, but no REL or ABS valuators.
-It emits [BTN_3] = 0 on unplug, which would trigger the BUG_WARN.
-
-Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-(cherry picked from commit c5a45b0f7658c77725adce2b64a0fbd62f208328)
----
-diff --git a/dix/getevents.c b/dix/getevents.c
-index 4e0af45..9dc9617 100644
---- a/dix/getevents.c
-+++ b/dix/getevents.c
-@@ -842,7 +842,7 @@ scale_to_desktop(DeviceIntPtr dev, ValuatorMask *mask,
-     ScreenPtr scr = miPointerGetScreen(dev);
-     double x, y;
+@@ -1048,18 +1088,7 @@ DRI2WaitSwap(ClientPtr client, DrawablePtr pDrawable)
+     return FALSE;
+ }
  
--    BUG_WARN(!dev->valuator || dev->valuator->numAxes < 2);
-+    BUG_WARN(dev->valuator && dev->valuator->numAxes < 2);
-     if (!dev->valuator || dev->valuator->numAxes < 2) {
-         /* if we have no axes, last.valuators must be in screen coords
-          * anyway */
---
-cgit v0.9.0.2-2-gbebe
-From f8d2ca759ad37d5e99d462f21a2259ce17bb1a00 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed, 18 Apr 2012 05:56:37 +0000
-Subject: dix: indentation fix
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-(cherry picked from commit ebf214876a4885a98ded4f5525925b69005fae05)
----
-diff --git a/dix/dispatch.c b/dix/dispatch.c
-index 9a2e22f..d971805 100644
---- a/dix/dispatch.c
-+++ b/dix/dispatch.c
-@@ -416,8 +416,8 @@ Dispatch(void)
-                 if (XSERVER_REQUEST_START_ENABLED())
-                     XSERVER_REQUEST_START(LookupMajorName(client->majorOp),
-                                           client->majorOp,
--                                          ((xReq *) client->requestBuffer)->
--                                          length, client->index,
-+                                          ((xReq *) client->requestBuffer)->length,
-+                                          client->index,
-                                           client->requestBuffer);
- #endif
-                 if (result > (maxBigRequestSize << 2))
---
-cgit v0.9.0.2-2-gbebe
-From f012f0c48dedba4df69cc1a1ecdf8ee5d37daca9 Mon Sep 17 00:00:00 2001
-From: Michal Suchanek <hramrach@gmail.com>
-Date: Thu, 26 Apr 2012 13:11:20 +0000
-Subject: dmx: Annotate dmxlog.c with _X_ATTRIBUTE_PRINTF and _X_NORETURN
-
-and fix resulting printf warning in dmxLogVisual
-
-Signed-off-by: Michal Suchanek <hramrach@gmail.com>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-(cherry picked from commit d662fa2450856777b59c4b62b912395a8bfd52fd)
----
-diff --git a/hw/dmx/dmxlog.c b/hw/dmx/dmxlog.c
-index b56bb93..151f672 100644
---- a/hw/dmx/dmxlog.c
-+++ b/hw/dmx/dmxlog.c
-@@ -86,6 +86,8 @@ ErrorF(const char *format, ...)
+-/*
+- * A TraverseTree callback to invalidate all windows using the same
+- * pixmap
+- */
+-static int
+-DRI2InvalidateWalk(WindowPtr pWin, pointer data)
+-{
+-    if (pWin->drawable.pScreen->GetWindowPixmap(pWin) != data)
+-        return WT_DONTWALKCHILDREN;
+-    DRI2InvalidateDrawable(&pWin->drawable);
+-    return WT_WALKCHILDREN;
+-}
++
+ 
+ int
+ DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
+@@ -1162,26 +1191,7 @@ DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
+      */
+     *swap_target = pPriv->swap_count + pPriv->swapsPending;
+ 
+-    if (pDraw->type == DRAWABLE_WINDOW) {
+-        WindowPtr pWin = (WindowPtr) pDraw;
+-        PixmapPtr pPixmap = pScreen->GetWindowPixmap(pWin);
+-
+-        /*
+-         * Find the top-most window using this pixmap
+-         */
+-        while (pWin->parent &&
+-               pScreen->GetWindowPixmap(pWin->parent) == pPixmap)
+-            pWin = pWin->parent;
+-
+-        /*
+-         * Walk the sub-tree to invalidate all of the
+-         * windows using the same pixmap
+-         */
+-        TraverseTree(pWin, DRI2InvalidateWalk, pPixmap);
+-        DRI2InvalidateDrawable(&pPixmap->drawable);
+-    }
+-    else
+-        DRI2InvalidateDrawable(pDraw);
++    DRI2InvalidateDrawableAll(pDraw);
  
- /** Provide an VFatalError function when used stand-alone. */
- static void
-+VFatalError(const char *format, va_list args) _X_ATTRIBUTE_PRINTF(1, 0) _X_NORETURN;
-+static void
- VFatalError(const char *format, va_list args)
- {
-     vfprintf(stderr, format, args);     /* RATS: We assume the format string
-@@ -104,7 +106,9 @@ VErrorF(const char *format, va_list args)
+     return Success;
  }
- #else
- /** This function was removed between XFree86 4.3.0 and XFree86 4.4.0. */
--extern void AbortServer(void);
-+extern void AbortServer(void) _X_NORETURN;
-+static void
-+VFatalError(const char *format, va_list args) _X_ATTRIBUTE_PRINTF(1, 0) _X_NORETURN;
- static void
- VFatalError(const char *format, va_list args)
- {
-@@ -166,6 +170,8 @@ dmxHeader(dmxLogLevel logLevel, DMXInputInfo * dmxInput,
- /* Prints the error message with the appropriate low-level X output
-  * routine. */
- static void
-+dmxMessage(dmxLogLevel logLevel, const char *format, va_list args) _X_ATTRIBUTE_PRINTF(2, 0);
-+static void
- dmxMessage(dmxLogLevel logLevel, const char *format, va_list args)
- {
-     if (logLevel == dmxFatal || logLevel >= dmxCurrentLogLevel) {
-@@ -303,10 +309,11 @@ dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, int defaultVisual)
-         class = "DirectColor";
-         break;
-     }
-+#define VisualLogFormat "0x%02lx %s %2db %db/rgb %3d 0x%04lx 0x%04lx 0x%04lx%s\n"
+diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
+index 37cd8b3..1cf0f02 100644
+--- a/hw/xwin/InitOutput.c
++++ b/hw/xwin/InitOutput.c
+@@ -164,7 +164,7 @@ void XwinExtensionInit(void)
+     int i;
  
-     if (dmxScreen) {
-         dmxLogOutput(dmxScreen,
--                     "0x%02x %s %2db %db/rgb %3d 0x%04x 0x%04x 0x%04x%s\n",
-+                     VisualLogFormat,
-                      vi->visualid, class, vi->depth, vi->bits_per_rgb,
-                      vi->colormap_size,
-                      vi->red_mask, vi->green_mask, vi->blue_mask,
-@@ -314,7 +321,7 @@ dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, int defaultVisual)
+ #ifdef XWIN_GLX_WINDOWS
+-    if ((g_fNativeGl) && (serverGeneration == 1)) {
++    if (g_fNativeGl) {
+         /* install the native GL provider */
+         glxWinPushNativeProvider();
      }
-     else {
-         dmxLog(dmxInfo,
--               "  0x%02x %s %2db %db/rgb %3d 0x%04x 0x%04x 0x%04x%s\n",
-+               "  " VisualLogFormat,
-                vi->visualid, class, vi->depth, vi->bits_per_rgb,
-                vi->colormap_size,
-                vi->red_mask, vi->green_mask, vi->blue_mask,
-diff --git a/hw/dmx/dmxlog.h b/hw/dmx/dmxlog.h
-index 4d4cd26..162484b 100644
---- a/hw/dmx/dmxlog.h
-+++ b/hw/dmx/dmxlog.h
-@@ -55,18 +55,23 @@ typedef enum {
- /* Logging functions used by Xserver/hw/dmx routines. */
- extern dmxLogLevel dmxSetLogLevel(dmxLogLevel newLevel);
- extern dmxLogLevel dmxGetLogLevel(void);
--extern void dmxLog(dmxLogLevel logLevel, const char *format, ...);
--extern void dmxLogCont(dmxLogLevel logLevel, const char *format, ...);
-+extern void dmxLog(dmxLogLevel logLevel, const char *format,
-+                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
-+extern void dmxLogCont(dmxLogLevel logLevel, const char *format,
-+                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
- extern const char *dmxEventName(int type);
- 
- #ifndef DMX_LOG_STANDALONE
--extern void dmxLogOutput(DMXScreenInfo * dmxScreen, const char *format, ...);
-+extern void dmxLogOutput(DMXScreenInfo * dmxScreen, const char *format,
-+                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
- extern void dmxLogOutputCont(DMXScreenInfo * dmxScreen, const char *format,
--                             ...);
-+                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
- extern void dmxLogOutputWarning(DMXScreenInfo * dmxScreen, const char *format,
--                                ...);
--extern void dmxLogInput(DMXInputInfo * dmxInput, const char *format, ...);
--extern void dmxLogInputCont(DMXInputInfo * dmxInput, const char *format, ...);
-+                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
-+extern void dmxLogInput(DMXInputInfo * dmxInput, const char *format,
-+                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
-+extern void dmxLogInputCont(DMXInputInfo * dmxInput, const char *format,
-+                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
- extern void dmxLogArgs(dmxLogLevel logLevel, int argc, char **argv);
- extern void dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi,
-                          int defaultVisual);
---
-cgit v0.9.0.2-2-gbebe
-From 58dfb13953af71021317b9d85230b1163198f031 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Thu, 10 May 2012 07:53:20 +0000
-Subject: Revert "dix: when disabling a device, release all buttons and keys"
-
-This reverts commit 90299556db24543bb7365e8c2897deca3aa219e7.
-
-The commit being reverted triggered a segfault on server shutdown when a
-device posts raw events after the root windows are forced to NULL.
-
-https://lists.debian.org/debian-x/2012/05/msg00240.html
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/dix/devices.c b/dix/devices.c
-index d0e99bd..0125504 100644
---- a/dix/devices.c
-+++ b/dix/devices.c
-@@ -432,8 +432,6 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
-     if (*prev != dev)
-         return FALSE;
+@@ -901,7 +901,8 @@ InitOutput(ScreenInfo * screenInfo, int argc, char *argv[])
+ {
+     int i;
  
--    ReleaseButtonsAndKeys(dev);
--
-     /* float attached devices */
-     if (IsMaster(dev)) {
-         for (other = inputInfo.devices; other; other = other->next) {
---
-cgit v0.9.0.2-2-gbebe
+-    XwinExtensionInit();
++    if (serverGeneration == 1)
++        XwinExtensionInit();
+ 
+     /* Log the command line */
+     winLogCommandLine(argc, argv);
+diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
+index 4c2f04e..33729a9 100644
+--- a/hw/xwin/Makefile.am
++++ b/hw/xwin/Makefile.am
+@@ -109,13 +109,16 @@ SRCS =	InitInput.c \
+ 	winclipboard.h \
+ 	winconfig.h \
+ 	win.h \
++	winglobals.h \
+ 	winkeybd.h \
+ 	winkeynames.h \
+ 	winlayouts.h \
+ 	winmessages.h \
++	winmonitors.h \
+ 	winmsg.h \
+ 	winms.h \
+ 	winmultiwindowclass.h \
++	winmultiwindowicons.h \
+ 	winprefs.h \
+ 	winresource.h \
+ 	winwindow.h \
+diff --git a/hw/xwin/glx/Makefile.am b/hw/xwin/glx/Makefile.am
+index 7222a9f..59f6879 100644
+--- a/hw/xwin/glx/Makefile.am
++++ b/hw/xwin/glx/Makefile.am
+@@ -6,7 +6,8 @@ libXwinGLX_la_SOURCES = \
+ 	glwindows.h \
+ 	glwrap.c \
+ 	indirect.c \
+-	wgl_ext_api.c
++	wgl_ext_api.c \
++	wgl_ext_api.h
+ 
+ if XWIN_MULTIWINDOW
+ DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW
+diff --git a/include/input.h b/include/input.h
+index 5747f3c..f8459b8 100644
+--- a/include/input.h
++++ b/include/input.h
+@@ -579,6 +579,7 @@ extern int TouchListenerAcceptReject(DeviceIntPtr dev, TouchPointInfoPtr ti,
+                                      int listener, int mode);
+ extern int TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode,
+                              uint32_t touchid, Window grab_window, XID *error);
++extern void TouchEndPhysicallyActiveTouches(DeviceIntPtr dev);
+ 
+ /* misc event helpers */
+ extern Mask GetEventMask(DeviceIntPtr dev, xEvent *ev, InputClientsPtr clients);
+diff --git a/man/Xserver.man b/man/Xserver.man
+index 8d243d6..b103551 100644
+--- a/man/Xserver.man
++++ b/man/Xserver.man
+@@ -130,7 +130,7 @@ causes the server to generate a core dump on fatal errors.
+ .B \-displayfd \fIfd\fP
+ specifies a file descriptor in the launching process.  Rather than specify
+ a display number, the X server will attempt to listen on successively higher
+-display numbers, and upon finding a free one, will write the port number back
++display numbers, and upon finding a free one, will write the display number back
+ on this file descriptor as a newline-terminated string.  The \-pn option is
+ ignored when using \-displayfd.
+ .TP 8
+diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
+index 082c0db..c1af32e 100644
+--- a/xkb/xkbAccessX.c
++++ b/xkb/xkbAccessX.c
+@@ -709,7 +709,7 @@ ProcessPointerEvent(InternalEvent *ev, DeviceIntPtr mouse)
+     xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(mouse);
+     DeviceEvent *event = &ev->device_event;
+ 
+-    dev = IsFloating(mouse) ? mouse : GetMaster(mouse, MASTER_KEYBOARD);
++    dev = (IsMaster(mouse) || IsFloating(mouse)) ? mouse : GetMaster(mouse, MASTER_KEYBOARD);
+ 
+     if (dev && dev->key) {
+         xkbi = dev->key->xkbInfo;
diff --git a/extra/xorg-server/use-pixman-glyph-cache.patch b/extra/xorg-server/use-pixman-glyph-cache.patch
new file mode 100644
index 000000000..c1cd90d3a
--- /dev/null
+++ b/extra/xorg-server/use-pixman-glyph-cache.patch
@@ -0,0 +1,270 @@
+From 9cbcb5bd6a5360a128d15b77a02d8d3351f74366 Mon Sep 17 00:00:00 2001
+From: Søren Sandmann Pedersen <ssp@redhat.com>
+Date: Wed, 30 May 2012 09:19:08 +0000
+Subject: Use new pixman_glyph_cache_t API that will be in pixman 0.28.0
+
+This new API allows glyphs to be cached in a data structure in pixman,
+and entire glyph strings to be composited in one go.
+
+Also bump pixman dependency to 0.27.2.
+
+Results from the cairo peformance test suite running against Xvfb with
+a screen size of 1680x1050@32bpp:
+
+Speedups
+========
+ xlib          firefox-talos-gfx  12416.63 -> 3603.93   3.45x speedup
+██▌
+ xlib          xfce4-terminal-a1   1727.57 -> 1048.85:  1.65x speedup
+▋
+ xlib                  evolution   1370.49 -> 869.34:   1.58x speedup
+▋
+ xlib         gnome-terminal-vim   1832.83 -> 1251.94:  1.46x speedup
+▌
+ xlib                    poppler   1519.70 -> 1204.05:  1.26x speedup
+▎
+ xlib       firefox-planet-gnome   6982.55 -> 5598.16:  1.25x speedup
+▎
+ xlib                  ocitysmap   1142.77 -> 1071.53:  1.07x speedup
+▏
+
+No slowdowns were reported.
+
+Results of x11perf -aa10text:
+
+Before:
+
+      8000000 reps @   0.0007 msec (1450000.0/sec)
+      8000000 reps @   0.0007 msec (1460000.0/sec)
+      8000000 reps @   0.0007 msec (1460000.0/sec)
+      8000000 reps @   0.0007 msec (1470000.0/sec)
+      8000000 reps @   0.0007 msec (1480000.0/sec)
+     40000000 trep @   0.0007 msec (1460000.0/sec)
+
+After:
+
+     32000000 reps @   0.0002 msec (4910000.0/sec)
+     32000000 reps @   0.0002 msec (4830000.0/sec)
+     32000000 reps @   0.0002 msec (4890000.0/sec)
+     32000000 reps @   0.0002 msec (4830000.0/sec)
+     32000000 reps @   0.0002 msec (4900000.0/sec)
+    160000000 trep @   0.0002 msec (4870000.0/sec)
+
+Version 2: Destroy the glyph cache at server regen time
+
+Acked-by: Aaron Plattner <aplattner@nvidia.com>
+Reviewed-by: Keith Packard <keithp@keithp.com>
+Signed-off-by: Soren Sandmann <ssp@redhat.com>
+---
+diff --git a/configure.ac b/configure.ac
+index e686614..b6ed92c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -811,7 +811,7 @@ LIBPCIACCESS="pciaccess >= 0.12.901"
+ LIBUDEV="libudev >= 143"
+ LIBSELINUX="libselinux >= 2.0.86"
+ LIBDBUS="dbus-1 >= 1.0"
+-LIBPIXMAN="pixman-1 >= 0.21.8"
++LIBPIXMAN="pixman-1 >= 0.27.2"
+ 
+ dnl Pixman is always required, but we separate it out so we can link
+ dnl specific modules against it
+diff --git a/fb/fb.h b/fb/fb.h
+index 75596c5..b869d12 100644
+--- a/fb/fb.h
++++ b/fb/fb.h
+@@ -1344,6 +1344,9 @@ extern _X_EXPORT void
+ extern _X_EXPORT Bool
+  fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats);
+ 
++extern _X_EXPORT void
++fbDestroyGlyphCache(void);
++
+ /*
+  * fbpixmap.c
+  */
+diff --git a/fb/fbpict.c b/fb/fbpict.c
+index 097a1a6..2804ff4 100644
+--- a/fb/fbpict.c
++++ b/fb/fbpict.c
+@@ -70,6 +70,156 @@ fbComposite(CARD8 op,
+     free_pixman_pict(pDst, dest);
+ }
+ 
++static pixman_glyph_cache_t *glyphCache;
++
++void
++fbDestroyGlyphCache(void)
++{
++    if (glyphCache)
++    {
++	pixman_glyph_cache_destroy (glyphCache);
++	glyphCache = NULL;
++    }
++}
++
++static void
++fbUnrealizeGlyph(ScreenPtr pScreen,
++		 GlyphPtr pGlyph)
++{
++    if (glyphCache)
++	pixman_glyph_cache_remove (glyphCache, pGlyph, NULL);
++}
++
++static void
++fbGlyphs(CARD8 op,
++	 PicturePtr pSrc,
++	 PicturePtr pDst,
++	 PictFormatPtr maskFormat,
++	 INT16 xSrc,
++	 INT16 ySrc, int nlist,
++	 GlyphListPtr list,
++	 GlyphPtr *glyphs)
++{
++#define N_STACK_GLYPHS 512
++    ScreenPtr pScreen = pDst->pDrawable->pScreen;
++    pixman_glyph_t stack_glyphs[N_STACK_GLYPHS];
++    pixman_glyph_t *pglyphs = stack_glyphs;
++    pixman_image_t *srcImage, *dstImage;
++    int srcXoff, srcYoff, dstXoff, dstYoff;
++    GlyphPtr glyph;
++    int n_glyphs;
++    int x, y;
++    int i, n;
++    int xDst = list->xOff, yDst = list->yOff;
++
++    miCompositeSourceValidate(pSrc);
++    
++    n_glyphs = 0;
++    for (i = 0; i < nlist; ++i)
++	n_glyphs += list[i].len;
++
++    if (!glyphCache)
++	glyphCache = pixman_glyph_cache_create();
++
++    pixman_glyph_cache_freeze (glyphCache);
++    
++    if (n_glyphs > N_STACK_GLYPHS) {
++	if (!(pglyphs = malloc (n_glyphs * sizeof (pixman_glyph_t))))
++	    goto out;
++    }
++    
++    i = 0;
++    x = y = 0;
++    while (nlist--) {
++        x += list->xOff;
++        y += list->yOff;
++        n = list->len;
++        while (n--) {
++	    const void *g;
++
++            glyph = *glyphs++;
++
++	    if (!(g = pixman_glyph_cache_lookup (glyphCache, glyph, NULL))) {
++		pixman_image_t *glyphImage;
++		PicturePtr pPicture;
++		int xoff, yoff;
++
++		pPicture = GetGlyphPicture(glyph, pScreen);
++		if (!pPicture) {
++		    n_glyphs--;
++		    goto next;
++		}
++
++		if (!(glyphImage = image_from_pict(pPicture, FALSE, &xoff, &yoff)))
++		    goto out;
++
++		g = pixman_glyph_cache_insert(glyphCache, glyph, NULL,
++					      glyph->info.x,
++					      glyph->info.y,
++					      glyphImage);
++
++		free_pixman_pict(pPicture, glyphImage);
++
++		if (!g)
++		    goto out;
++	    }
++
++	    pglyphs[i].x = x;
++	    pglyphs[i].y = y;
++	    pglyphs[i].glyph = g;
++	    i++;
++
++	next:
++            x += glyph->info.xOff;
++            y += glyph->info.yOff;
++	}
++	list++;
++    }
++
++    if (!(srcImage = image_from_pict(pSrc, FALSE, &srcXoff, &srcYoff)))
++	goto out;
++
++    if (!(dstImage = image_from_pict(pDst, TRUE, &dstXoff, &dstYoff)))
++	goto out_free_src;
++
++    if (maskFormat) {
++	pixman_format_code_t format;
++	pixman_box32_t extents;
++	int x, y;
++
++	format = maskFormat->format | (maskFormat->depth << 24);
++
++	pixman_glyph_get_extents(glyphCache, n_glyphs, pglyphs, &extents);
++
++	x = extents.x1;
++	y = extents.y1;
++
++	pixman_composite_glyphs(op, srcImage, dstImage, format,
++				xSrc + srcXoff + xDst, ySrc + srcYoff + yDst,
++				x, y,
++				x + dstXoff, y + dstYoff,
++				extents.x2 - extents.x1,
++				extents.y2 - extents.y1,
++				glyphCache, n_glyphs, pglyphs);
++    }
++    else {
++	pixman_composite_glyphs_no_mask(op, srcImage, dstImage,
++					xSrc + srcXoff - xDst, ySrc + srcYoff - yDst,
++					dstXoff, dstYoff,
++					glyphCache, n_glyphs, pglyphs);
++    }
++
++    free_pixman_pict(pDst, dstImage);
++
++out_free_src:
++    free_pixman_pict(pSrc, srcImage);
++
++out:
++    pixman_glyph_cache_thaw(glyphCache);
++    if (pglyphs != stack_glyphs)
++	free(pglyphs);
++}
++
+ static pixman_image_t *
+ create_solid_fill_image(PicturePtr pict)
+ {
+@@ -357,7 +507,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
+         return FALSE;
+     ps = GetPictureScreen(pScreen);
+     ps->Composite = fbComposite;
+-    ps->Glyphs = miGlyphs;
++    ps->Glyphs = fbGlyphs;
++    ps->UnrealizeGlyph = fbUnrealizeGlyph;
+     ps->CompositeRects = miCompositeRects;
+     ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
+     ps->Trapezoids = fbTrapezoids;
+diff --git a/fb/fbscreen.c b/fb/fbscreen.c
+index 7c7d656..f9080a4 100644
+--- a/fb/fbscreen.c
++++ b/fb/fbscreen.c
+@@ -32,6 +32,7 @@ fbCloseScreen(ScreenPtr pScreen)
+     int d;
+     DepthPtr depths = pScreen->allowedDepths;
+ 
++    fbDestroyGlyphCache();
+     for (d = 0; d < pScreen->numDepths; d++)
+         free(depths[d].vids);
+     free(depths);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xorg-xdm/PKGBUILD b/extra/xorg-xdm/PKGBUILD
index 7c8f2ba23..e89df667a 100644
--- a/extra/xorg-xdm/PKGBUILD
+++ b/extra/xorg-xdm/PKGBUILD
@@ -1,41 +1,37 @@
-# $Id: PKGBUILD 163529 2012-07-14 17:17:56Z dreisner $
+# $Id: PKGBUILD 169967 2012-10-30 22:59:08Z heftig $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 pkgname=xorg-xdm
 pkgver=1.1.11
-pkgrel=3
+pkgrel=4
 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' 'systemd' 'xtrans')
+depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'systemd')
+makedepends=('pkgconfig' 'xorg-util-macros' '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'
-         '25c6d8adeed0796d432b2bbf1d83a7e9'
-         '13032add23a0a8d48a638418094bfc00'
-         '6de9362b1bf0835026270b20d8029909')
+        xdm.pam
+        git_fixes.diff)
 sha256sums=('d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47'
             'fd3e7c20837b42a8ab111369fd6dc9612f9edb91c1f6904cca1d6a1fa3cfa0ff'
             '77a1ce9bdf363591b72798db08b4df3589bd4e64737fd32cf9028f9245450edb'
-            '10ce850e6a93c6ba68b5d71104b1fd6680ad9760274068512f43a694b1edda76'
             '5f380a2d6f77feb910d77f7f6843fce9b00ff7610c159fc029ee44cc6c23a48a'
-            '7d6818a1c1a44e9bd38774c035e03b0b831f6646681bc2bf556761aec7baf418')
+            '7d6818a1c1a44e9bd38774c035e03b0b831f6646681bc2bf556761aec7baf418'
+            '781b5577bb070220d018a11832d0d4a65fd16e130730ba26fb055c3aa68156b2')
 
 build() {
   cd "${srcdir}/xdm-${pkgver}"
+  # upstream commits - Add some missing malloc failure checks 	2012-01-07
+  patch -Np1 -i "${srcdir}/git_fixes.diff"
+  
   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
diff --git a/extra/xorg-xdm/git_fixes.diff b/extra/xorg-xdm/git_fixes.diff
new file mode 100644
index 000000000..69836d488
--- /dev/null
+++ b/extra/xorg-xdm/git_fixes.diff
@@ -0,0 +1,673 @@
+From 011a2710a69cd345a8ee3a6b2f15407b4c3b355a Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun, 25 Sep 2011 07:56:15 +0000
+Subject: Require xt >= 1.0 for appdefaultdir
+
+https://bugs.freedesktop.org/show_bug.cgi?id=7237
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+diff --git a/configure.ac b/configure.ac
+index b488f0c..a4222f1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -383,7 +383,7 @@ PKG_CHECK_MODULES(AUTH, xau)
+ # Greeter
+ #
+ 
+-PKG_CHECK_MODULES(XDMGREET, xt x11 xext)
++PKG_CHECK_MODULES(XDMGREET, xt >= 1.0 x11 xext)
+ 
+ GREETERLIB="${XDMLIBDIR}/libXdmGreet.so"
+ AX_DEFINE_DIR(DEF_GREETER_LIB, GREETERLIB, [Location of Xdm Greeter library])
+--
+cgit v0.9.0.2-2-gbebe
+From 618039261b0c7f14eb3b32c8f636464369724407 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed, 21 Sep 2011 02:11:20 +0000
+Subject: Mark some chars as const to fix gcc -Wwrite-strings warnings
+
+Can't fix all the warnings, due to the Xt API, but can fix a bunch.
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/greeter/greet.c b/greeter/greet.c
+index 539ce17..82e2c21 100644
+--- a/greeter/greet.c
++++ b/greeter/greet.c
+@@ -110,9 +110,9 @@ void    (*__xdm_SessionExit)(struct display *d, int status, int removeAuth) = NU
+ void    (*__xdm_DeleteXloginResources)(struct display *d, Display *dpy) = NULL;
+ int     (*__xdm_source)(char **environ, char *file) = NULL;
+ char    **(*__xdm_defaultEnv)(void) = NULL;
+-char    **(*__xdm_setEnv)(char **e, char *name, char *value) = NULL;
++char    **(*__xdm_setEnv)(char **e, const char *name, const char *value) = NULL;
+ char    **(*__xdm_putEnv)(const char *string, char **env) = NULL;
+-char    **(*__xdm_parseArgs)(char **argv, char *string) = NULL;
++char    **(*__xdm_parseArgs)(char **argv, const char *string) = NULL;
+ void    (*__xdm_printEnv)(char **e) = NULL;
+ char    **(*__xdm_systemEnv)(struct display *d, char *user, char *home) = NULL;
+ void    (*__xdm_LogOutOfMem)(const char * fmt, ...) = NULL;
+diff --git a/greeter/verify.c b/greeter/verify.c
+index ea62cd2..5d2ad17 100644
+--- a/greeter/verify.c
++++ b/greeter/verify.c
+@@ -61,7 +61,7 @@ from The Open Group.
+ extern char *crypt(const char *, const char *);
+ #endif
+ 
+-static char *envvars[] = {
++static const char *envvars[] = {
+     "TZ",			/* SYSV and SVR4, but never hurts */
+ #if defined(sony) && !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV)
+     "bootdev",
+@@ -94,8 +94,8 @@ static char **
+ userEnv (struct display *d, int useSystemPath, char *user, char *home, char *shell)
+ {
+     char	**env;
+-    char	**envvar;
+-    char	*str;
++    const char	**envvar;
++    const char	*str;
+ 
+     env = defaultEnv ();
+     env = setEnv (env, "DISPLAY", d->name);
+diff --git a/include/dm.h b/include/dm.h
+index 316dd46..4085cae 100644
+--- a/include/dm.h
++++ b/include/dm.h
+@@ -443,7 +443,7 @@ extern void UnsecureDisplay (struct display *d, Display *dpy);
+ extern void execute(char **argv, char **environ);
+ 
+ /* server.c */
+-extern char *_SysErrorMsg (int n);
++extern const char *_SysErrorMsg (int n);
+ extern int StartServer (struct display *d);
+ extern int WaitForServer (struct display *d);
+ extern void ResetServer (struct display *d);
+@@ -462,10 +462,10 @@ extern int Asprintf(char ** ret, const char *restrict format, ...)
+     _X_ATTRIBUTE_PRINTF(2,3);
+ # endif
+ extern char *localHostname (void);
+-extern char **parseArgs (char **argv, char *string);
+-extern char **setEnv (char **e, char *name, char *value);
++extern char **parseArgs (char **argv, const char *string);
++extern char **setEnv (char **e, const char *name, const char *value);
+ extern char **putEnv(const char *string, char **env);
+-extern char *getEnv (char **e, char *name);
++extern char *getEnv (char **e, const char *name);
+ extern void CleanUpChild (void);
+ extern void freeArgs (char **argv);
+ extern void freeEnv (char **env);
+@@ -478,7 +478,7 @@ extern int Verify (struct display *d, struct greet_info *greet, struct verify_in
+ extern char *NetworkAddressToHostname (CARD16 connectionType, ARRAY8Ptr connectionAddress);
+ extern int AnyWellKnownSockets (void);
+ extern void DestroyWellKnownSockets (void);
+-extern void SendFailed (struct display *d, char *reason);
++extern void SendFailed (struct display *d, const char *reason);
+ extern void StopDisplay (struct display *d);
+ extern void WaitForChild (void);
+ extern void WaitForSomething (void);
+diff --git a/include/greet.h b/include/greet.h
+index 6b6689e..0d607ba 100644
+--- a/include/greet.h
++++ b/include/greet.h
+@@ -65,9 +65,9 @@ struct dlfuncs {
+     void (*_DeleteXloginResources)(struct display *d, Display *dpy);
+     int (*_source)(char **environ, char *file);
+     char **(*_defaultEnv)(void);
+-    char **(*_setEnv)(char **e, char *name, char *value);
++    char **(*_setEnv)(char **e, const char *name, const char *value);
+     char **(*_putEnv)(const char *string, char **env);
+-    char **(*_parseArgs)(char **argv, char *string);
++    char **(*_parseArgs)(char **argv, const char *string);
+     void (*_printEnv)(char **e);
+     char **(*_systemEnv)(struct display *d, char *user, char *home);
+     void (*_LogOutOfMem)(const char * fmt, ...);
+@@ -149,9 +149,9 @@ extern	void    (*__xdm_SessionExit)(struct display *d, int status, int removeAut
+ extern	void    (*__xdm_DeleteXloginResources)(struct display *d, Display *dpy);
+ extern	int     (*__xdm_source)(char **environ, char *file);
+ extern	char    **(*__xdm_defaultEnv)(void);
+-extern	char    **(*__xdm_setEnv)(char **e, char *name, char *value);
++extern	char    **(*__xdm_setEnv)(char **e, const char *name, const char *value);
+ extern	char    **(*__xdm_putEnv)(const char *string, char **env);
+-extern	char    **(*__xdm_parseArgs)(char **argv, char *string);
++extern	char    **(*__xdm_parseArgs)(char **argv, const char *string);
+ extern	void    (*__xdm_printEnv)(char **e);
+ extern	char    **(*__xdm_systemEnv)(struct display *d, char *user, char *home);
+ extern	void    (*__xdm_LogOutOfMem)(const char * fmt, ...);
+diff --git a/xdm/access.c b/xdm/access.c
+index d0850ad..7035375 100644
+--- a/xdm/access.c
++++ b/xdm/access.c
+@@ -667,7 +667,7 @@ scanHostlist (
+ /* Returns non-0 iff string is matched by pattern.  Does case folding.
+  */
+ static int
+-patternMatch (char *string, char *pattern)
++patternMatch (const char *string, char *pattern)
+ {
+     int	    p, s;
+ 
+diff --git a/xdm/auth.c b/xdm/auth.c
+index bbca167..9e5cba2 100644
+--- a/xdm/auth.c
++++ b/xdm/auth.c
+@@ -116,7 +116,7 @@ int chown(int a,int b,int c) {}
+ 
+ struct AuthProtocol {
+     unsigned short  name_length;
+-    char	    *name;
++    const char	    *name;
+     void	    (*InitAuth)(unsigned short len, char *name);
+     Xauth	    *(*GetAuth)(unsigned short len, char *name);
+     void	    (*GetXdmcpAuth)(
+diff --git a/xdm/file.c b/xdm/file.c
+index 6e929b8..7b7f3d3 100644
+--- a/xdm/file.c
++++ b/xdm/file.c
+@@ -225,7 +225,7 @@ ParseDisplay (char *source, DisplayType *acceptableTypes, int numAcceptable)
+ }
+ 
+ static struct displayMatch {
+-	char		*name;
++	const char	*name;
+ 	DisplayType	type;
+ } displayTypes[] = {
+ 	{ "local",		{ Local, Permanent, FromFile } },
+diff --git a/xdm/resource.c b/xdm/resource.c
+index ece4de3..83901a2 100644
+--- a/xdm/resource.c
++++ b/xdm/resource.c
+@@ -145,10 +145,10 @@ int	choiceTimeout;	/* chooser choice timeout */
+ #define DEF_UDP_PORT	"177"	    /* registered XDMCP port, dont change */
+ 
+ struct dmResources {
+-	char	*name, *class;
+-	int	type;
+-	char	**dm_value;
+-	char	*default_value;
++	const char	*name, *class;
++	int		type;
++	char		**dm_value;
++	const char	*default_value;
+ } DmResources[] = {
+ { "servers",	"Servers", 	DM_STRING,	&servers,
+ 				DEF_SERVER_LINE} ,
+@@ -203,10 +203,10 @@ struct dmResources {
+ #define boffset(f)	XtOffsetOf(struct display, f)
+ 
+ struct displayResource {
+-	char	*name, *class;
+-	int	type;
+-	int	offset;
+-	char	*default_value;
++	const char	*name, *class;
++	int		type;
++	int		offset;
++	const char	*default_value;
+ };
+ 
+ /* resources for managing the server */
+@@ -289,15 +289,16 @@ XrmDatabase	DmResourceDB;
+ 
+ static void
+ GetResource (
+-    char    *name,
+-    char    *class,
+-    int	    valueType,
+-    char    **valuep,
+-    char    *default_value)
++    const char    *name,
++    const char    *class,
++    int            valueType,
++    char         **valuep,
++    const char    *default_value)
+ {
+     char	*type;
+     XrmValue	value;
+-    char	*string, *new_string;
++    const char	*string;
++    char	*new_string;
+     char	str_buf[50];
+     int	len;
+ 
+diff --git a/xdm/server.c b/xdm/server.c
+index 7fe55e6..1bb8873 100644
+--- a/xdm/server.c
++++ b/xdm/server.c
+@@ -62,9 +62,9 @@ CatchUsr1 (int n)
+     errno = olderrno;
+ }
+ 
+-char *_SysErrorMsg (int n)
++const char *_SysErrorMsg (int n)
+ {
+-    char *s = strerror(n);
++    const char *s = strerror(n);
+     return (s ? s : "unknown error");
+ }
+ 
+diff --git a/xdm/util.c b/xdm/util.c
+index 033633a..60aab21 100644
+--- a/xdm/util.c
++++ b/xdm/util.c
+@@ -97,7 +97,7 @@ printEnv (char **e)
+ }
+ 
+ static char *
+-makeEnv (char *name, char *value)
++makeEnv (const char *name, const char *value)
+ {
+ 	char	*result;
+ 
+@@ -111,7 +111,7 @@ makeEnv (char *name, char *value)
+ }
+ 
+ char *
+-getEnv (char **e, char *name)
++getEnv (char **e, const char *name)
+ {
+ 	int	l = strlen (name);
+ 
+@@ -127,7 +127,7 @@ getEnv (char **e, char *name)
+ }
+ 
+ char **
+-setEnv (char **e, char *name, char *value)
++setEnv (char **e, const char *name, const char *value)
+ {
+ 	char	**new, **old;
+ 	char	*newe;
+@@ -207,9 +207,9 @@ freeEnv (char **env)
+ #define isblank(c)	((c) == ' ' || c == '\t')
+ 
+ char **
+-parseArgs (char **argv, char *string)
++parseArgs (char **argv, const char *string)
+ {
+-	char	*word;
++	const char *word;
+ 	char	*save;
+ 	char    **newargv;
+ 	int	i;
+diff --git a/xdm/xdmauth.c b/xdm/xdmauth.c
+index 4b945cf..66804a4 100644
+--- a/xdm/xdmauth.c
++++ b/xdm/xdmauth.c
+@@ -44,7 +44,7 @@ static char	auth_name[256];
+ static int	auth_name_len;
+ 
+ static void
+-XdmPrintDataHex (char *s, char *a, int l)
++XdmPrintDataHex (const char *s, const char *a, int l)
+ {
+     int	i;
+ 
+@@ -56,7 +56,7 @@ XdmPrintDataHex (char *s, char *a, int l)
+ 
+ # ifdef XDMCP
+ static void
+-XdmPrintArray8Hex (char *s, ARRAY8Ptr a)
++XdmPrintArray8Hex (const char *s, ARRAY8Ptr a)
+ {
+     XdmPrintDataHex (s, (char *) a->data, a->length);
+ }
+diff --git a/xdm/xdmcp.c b/xdm/xdmcp.c
+index 5bc4716..1c34e7c 100644
+--- a/xdm/xdmcp.c
++++ b/xdm/xdmcp.c
+@@ -74,7 +74,7 @@ static void request_respond (struct sockaddr *from, int fromlen, int length, int
+ static void send_accept (struct sockaddr *to, int tolen, CARD32 sessionID, ARRAY8Ptr authenticationName, ARRAY8Ptr authenticationData, ARRAY8Ptr authorizationName, ARRAY8Ptr authorizationData, int fd);
+ static void send_alive (struct sockaddr *from, int fromlen, int length, int fd);
+ static void send_decline (struct sockaddr *to, int tolen, ARRAY8Ptr authenticationName, ARRAY8Ptr authenticationData, ARRAY8Ptr status, int fd);
+-static void send_failed (struct sockaddr *from, int fromlen, char *name, CARD32 sessionID, char *reason, int fd);
++static void send_failed (struct sockaddr *from, int fromlen, const char *name, CARD32 sessionID, const char *reason, int fd);
+ static void send_refuse (struct sockaddr *from, int fromlen, CARD32 sessionID, int fd);
+ static void send_unwilling (struct sockaddr *from, int fromlen, ARRAY8Ptr authenticationName, ARRAY8Ptr status, int fd);
+ static void send_willing (struct sockaddr *from, int fromlen, ARRAY8Ptr authenticationName, ARRAY8Ptr status, int fd);
+@@ -1300,7 +1300,7 @@ abort:
+ void
+ SendFailed (
+     struct display  *d,
+-    char	    *reason)
++    const char	    *reason)
+ {
+     Debug ("Display start failed, sending Failed\n");
+     send_failed ((struct sockaddr *)(d->from), d->fromlen, d->name,
+@@ -1311,9 +1311,9 @@ static void
+ send_failed (
+     struct sockaddr *from,
+     int		    fromlen,
+-    char	    *name,
++    const char	    *name,
+     CARD32	    sessionID,
+-    char	    *reason,
++    const char	    *reason,
+     int		    fd)
+ {
+     static char	buf[256];
+@@ -1416,7 +1416,7 @@ NetworkAddressToHostname (
+ # else
+ 	    char dotted[20];
+ # endif
+-	    char *local_name = "";
++	    const char *local_name = "";
+ 	    int af_type;
+ 
+ # if defined(IPv6) && defined(AF_INET6)
+--
+cgit v0.9.0.2-2-gbebe
+From c43eb799774743bc50233eff6643c51a5fbe6899 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed, 21 Sep 2011 02:22:48 +0000
+Subject: Fix warnings about printing longs with int type format strings
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/xdm/dm.c b/xdm/dm.c
+index cd0ee25..7bc2605 100644
+--- a/xdm/dm.c
++++ b/xdm/dm.c
+@@ -536,7 +536,7 @@ WaitForChild (void)
+ 		  time(&now);
+ 		  crash = d->lastReserv &&
+ 		    ((now - d->lastReserv) < XDM_BROKEN_INTERVAL);
+-		  Debug("time %i %i try %i of %i%s\n", now, d->lastReserv,
++		  Debug("time %li %li try %i of %i%s\n", now, d->lastReserv,
+ 			d->reservTries, d->reservAttempts,
+ 			crash ? " crash" : "");
+ 
+diff --git a/xdm/xdmauth.c b/xdm/xdmauth.c
+index 66804a4..b3c1c16 100644
+--- a/xdm/xdmauth.c
++++ b/xdm/xdmauth.c
+@@ -234,7 +234,7 @@ XdmGetKey(struct protoDisplay *pdpy, ARRAY8Ptr displayID)
+ 	if (line[0] == '#' || sscanf (line, "%s %s", id, key) != 2)
+ 	    continue;
+ 	bzero(line, sizeof(line));
+-	Debug ("Key entry for \"%s\" %d bytes\n", id, strlen(key));
++	Debug ("Key entry for \"%s\" %ld bytes\n", id, strlen(key));
+ 	if (strlen (id) == displayID->length &&
+ 	    !strncmp (id, (char *)displayID->data, displayID->length))
+ 	{
+--
+cgit v0.9.0.2-2-gbebe
+From 8eee942be0db913511b4c53f94829e1201dfdf00 Mon Sep 17 00:00:00 2001
+From: Michał Górny <mgorny@gentoo.org>
+Date: Wed, 28 Sep 2011 19:25:17 +0000
+Subject: Support systemd startup notification.
+
+If libsystemd-daemon support is enabled, xdm uses it to announce its
+startup as soon as the session is established. This gives the user
+opportunity to delay I/O-intensive operations until the X server is
+started so that they would not interfere with its loading while keeping
+the machine busy when user types in his/her login.
+
+Reviewed-by: Jamey Sharp <jamey@minilop.net>
+Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/Makefile.am b/Makefile.am
+index e5f9f5c..bb6b51c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -43,8 +43,13 @@ endif LINT
+ if HAVE_SYSTEMD
+ systemdsystemunit_DATA = xdm.service
+ 
+-xdm.service: xdm.service.in
+-	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < $< > $@
++xdm.service: xdm.service.in Makefile
++if USE_SYSTEMD_DAEMON
++	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < xdm.service.in > $@
++else !USE_SYSTEMD_DAEMON
++	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < xdm.service.in > $@
++endif !USE_SYSTEMD_DAEMON
++
+ endif HAVE_SYSTEMD
+ CLEANFILES = xdm.service
+ EXTRA_DIST = xdm.service.in
+diff --git a/configure.ac b/configure.ac
+index a4222f1..fcb37f8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -146,6 +146,7 @@ if test "x$USE_SELINUX" != "xno" ; then
+ fi
+ 
+ # Check whether to install systemd unit files, as suggested in daemon(7).
++# When a full path is specified, this does not require systemd installed.
+ AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR],
+ 	[Directory for systemd service files (default from the System and Service Manager)]),,
+ 	[with_systemdsystemunitdir=auto])
+@@ -166,6 +167,21 @@ AS_IF([test "x$with_systemdsystemunitdir" != "xno"], [
+ ])
+ AM_CONDITIONAL(HAVE_SYSTEMD, [test "x$with_systemdsystemunitdir" != "xno"])
+ 
++# Check whether to enable systemd startup notification.
++# This requires libsystemd-daemon.
++AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon],
++	[Add support for systemd startup notification (default is autodetected)]),
++	[USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])
++AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
++    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
++	[AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])],
++	[AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
++	    [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]
++	)]
++    )
++])
++AM_CONDITIONAL(USE_SYSTEMD_DAEMON, [test "x$USE_SYSTEMD_DAEMON" != "xno"])
++
+ # FIXME: Find better test for which OS'es use su -m  - for now, just try to
+ # mirror the Imakefile setting of:
+ # if  defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(DarwinArchitecture)
+diff --git a/xdm.service.in b/xdm.service.in
+index d15e072..e782dd9 100644
+--- a/xdm.service.in
++++ b/xdm.service.in
+@@ -4,6 +4,8 @@ After=systemd-user-sessions.service
+ 
+ [Service]
+ ExecStart=BINDIR/xdm -nodaemon
++Type=notify
++NotifyAccess=all
+ 
+ [Install]
+ Alias=graphical.target.wants/xdm.service
+diff --git a/xdm/Makefile.am b/xdm/Makefile.am
+index aa9765c..797b5c5 100644
+--- a/xdm/Makefile.am
++++ b/xdm/Makefile.am
+@@ -22,11 +22,11 @@
+ bin_PROGRAMS = xdm
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+-AM_CFLAGS = $(CWARNFLAGS) $(XDM_CFLAGS)
++AM_CFLAGS = $(CWARNFLAGS) $(XDM_CFLAGS) $(SYSTEMD_DAEMON_CFLAGS)
+ 
+ # The xdm binary needs to export symbols so that they can be used from
+ # libXdmGreet.so loaded through a dlopen call from session.c
+-AM_LDFLAGS = $(XDM_LIBS) -export-dynamic
++AM_LDFLAGS = $(XDM_LIBS) $(SYSTEMD_DAEMON_LIBS) -export-dynamic
+ 
+ xdm_SOURCES =		\
+         access.c	\
+diff --git a/xdm/session.c b/xdm/session.c
+index 5fd47f0..573747d 100644
+--- a/xdm/session.c
++++ b/xdm/session.c
+@@ -81,6 +81,10 @@ extern int key_setnet(struct key_netstarg *arg);
+ #  define RTLD_NOW 1
+ # endif
+ 
++#ifdef USE_SYSTEMD_DAEMON
++#include <systemd/sd-daemon.h>
++#endif
++
+ #ifdef USE_SELINUX
+ /* This should be run just before we exec the user session. */
+ static int
+@@ -349,6 +353,12 @@ ManageSession (struct display *d)
+ 	exit(UNMANAGE_DISPLAY);
+ 	}
+ 
++#ifdef USE_SYSTEMD_DAEMON
++	/* Subsequent notifications will be ignored by systemd
++	 * and calling this function will clean up the env */
++	sd_notify(1, "READY=1");
++#endif
++
+     /* tell the possibly dynamically loaded greeter function
+      * what data structure formats to expect.
+      * These version numbers are registered with The Open Group. */
+--
+cgit v0.9.0.2-2-gbebe
+From 284532c0884893728b75ca37f5d2a9a33f7bc8db Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Sat, 22 Oct 2011 15:14:46 +0000
+Subject: greeter: link against -lXrender if xft is enabled
+
+XmuCvtStringToXftColor uses XRenderParseColor, so require xrender for
+the xft option, and link against it.
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/configure.ac b/configure.ac
+index fcb37f8..d20ae28 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -345,10 +345,10 @@ AC_ARG_WITH(xft,
+ 	AS_HELP_STRING([--with-xft],
+ 			[Use Xft to draw text (default is YES if installed)]),
+ 	[USE_XFT="$withval"],
+-	PKG_CHECK_EXISTS(xft, [USE_XFT="yes"], [USE_XFT="no"]))
++	PKG_CHECK_EXISTS(xft xrender, [USE_XFT="yes"], [USE_XFT="no"]))
+ 
+ if test "x$USE_XFT" = "xyes" ; then
+-	PKG_CHECK_MODULES(XFT, xft)
++	PKG_CHECK_MODULES(XFT, xft xrender)
+ 	GREETER_CFLAGS="$GREETER_CFLAGS $XFT_CFLAGS"
+ 	GREETER_LIBS="$GREETER_LIBS $XFT_LIBS"
+ 	AC_DEFINE([USE_XFT], 1,
+diff --git a/greeter/Login.c b/greeter/Login.c
+index 99a3932..d899376 100644
+--- a/greeter/Login.c
++++ b/greeter/Login.c
+@@ -86,6 +86,10 @@ from The Open Group.
+ # include <X11/extensions/Xinerama.h>
+ #endif
+ 
++#ifdef USE_XFT
++# include <X11/extensions/Xrender.h>
++#endif
++
+ #ifndef DEBUG
+ # define XDM_ASSERT(a)	/* do nothing */
+ #else
+--
+cgit v0.9.0.2-2-gbebe
+From a02edebf21aae37f8564d7b9fad01d5d2942ad8d Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Mon, 07 Nov 2011 16:01:44 +0000
+Subject: Fix build outside of source dir. Fixes distcheck too.
+
+Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/Makefile.am b/Makefile.am
+index bb6b51c..e9da40f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -45,9 +45,9 @@ systemdsystemunit_DATA = xdm.service
+ 
+ xdm.service: xdm.service.in Makefile
+ if USE_SYSTEMD_DAEMON
+-	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < xdm.service.in > $@
++	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < ${srcdir}/xdm.service.in > $@
+ else !USE_SYSTEMD_DAEMON
+-	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < xdm.service.in > $@
++	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < ${srcdir}/xdm.service.in > $@
+ endif !USE_SYSTEMD_DAEMON
+ 
+ endif HAVE_SYSTEMD
+--
+cgit v0.9.0.2-2-gbebe
+From ad7a54288f62c0266540279dac775ebee68f092e Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Thu, 15 Dec 2011 21:14:23 +0000
+Subject: replace <varargs.h> by <stdarg.h>. Spotted my Marco Peereboom with clang.
+
+Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
+Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+---
+diff --git a/greeter/verify.c b/greeter/verify.c
+index 5d2ad17..1221874 100644
+--- a/greeter/verify.c
++++ b/greeter/verify.c
+@@ -48,7 +48,7 @@ from The Open Group.
+ # include	<errno.h>
+ #elif defined(USE_BSDAUTH)
+ # include	<login_cap.h>
+-# include	<varargs.h>
++# include	<stdarg.h>
+ # include	<bsd_auth.h>
+ #elif defined(USESECUREWARE)
+ # include       <sys/types.h>
+--
+cgit v0.9.0.2-2-gbebe
+From 78403f6a7420798bf24798811c8c6b936c9ccb34 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat, 07 Jan 2012 03:34:30 +0000
+Subject: Add some missing malloc failure checks
+
+Flagged by Solaris Studio 12.3 code analyzer
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/xdm/access.c b/xdm/access.c
+index 7035375..b16a066 100644
+--- a/xdm/access.c
++++ b/xdm/access.c
+@@ -304,6 +304,11 @@ tryagain:
+     if (!hostOrAlias)
+ 	return NULL;
+     h = malloc (sizeof (DisplayEntry));
++    if (!h)
++    {
++	LogOutOfMem ("ReadHostEntry: DisplayEntry\n");
++	return NULL;
++    }
+     h->hopCount = 1;
+     if (*hostOrAlias == ALIAS_CHARACTER)
+     {
+@@ -423,6 +428,11 @@ tryagain:
+     if (!displayOrAlias)
+ 	return NULL;
+     d = malloc (sizeof (DisplayEntry));
++    if (!d)
++    {
++	LogOutOfMem ("ReadDisplayEntry: DisplayEntry\n");
++	return NULL;
++    }
+     d->notAllowed = 0;
+     d->notBroadcast = 0;
+     d->chooser = 0;
+diff --git a/xdm/choose.c b/xdm/choose.c
+index 6f077eb..e5e003d 100644
+--- a/xdm/choose.c
++++ b/xdm/choose.c
+@@ -128,6 +128,11 @@ RememberIndirectClient (
+ 	    connectionType == i->connectionType)
+ 	    return 1;
+     i = malloc (sizeof (IndirectUsersRec));
++    if (!i)
++    {
++	LogOutOfMem ("RememberIndirectClient\n");
++	return 0;
++    }
+     if (!XdmcpCopyARRAY8 (clientAddress, &i->client))
+     {
+ 	free (i);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xorg-xfs/PKGBUILD b/extra/xorg-xfs/PKGBUILD
deleted file mode 100644
index aa5e4621a..000000000
--- a/extra/xorg-xfs/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 151783 2012-03-02 19:10:39Z andyrtr $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xorg-xfs
-pkgver=1.1.2
-pkgrel=1.1
-pkgdesc="X.Org X11 xfs font server"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://xorg.freedesktop.org/"
-license=('custom')
-backup=('etc/X11/fs/config')
-depends=('xorg-font-utils' 'libxfont>=1.4.5' 'libfs>=1.0.2' 'libx11>=1.2.2')
-makedepends=('pkgconfig' 'xtrans' 'xorg-util-macros')
-source=(${url}/releases/individual/app/xfs-${pkgver}.tar.bz2
-        ${url}/releases/individual/app/xfsinfo-1.0.3.tar.bz2
-        ${url}/releases/individual/app/fslsfonts-1.0.3.tar.bz2
-        ${url}/releases/individual/app/fstobdf-1.0.4.tar.bz2
-        ${url}/releases/individual/app/showfont-1.0.3.tar.bz2
-        xfs.rc)
-sha1sums=('d4a64e12f8a773bd0120977191586ca12baf1ace'
-          '21c5f544f34d9164797575da85727558f5e09d33'
-          '00177564597ac629207ca597f663b689902817df'
-          '5310493f53277fd196f93bbb7f2a204cad8997b7'
-          '161bf5f037db70dd75cb327648fbba559e821e76'
-          '21277375814e358ec16e8f8330f420e3d4df63e5')
-
-build() {
-  cd "${srcdir}"
-  pushd xfs-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make configdir=/etc/X11/fs
-  popd  
-    
-  for i in xfsinfo-* fslsfonts-* fstobdf-* showfont-*; do
-    if [ -d "${i}" ]; then
-      pushd "${i}"
-      ./configure --prefix=/usr
-      make
-      popd
-    fi
-  done
-}
-
-package() {
-  cd "${srcdir}"
-  pushd xfs-${pkgver}
-  make configdir=/etc/X11/fs DESTDIR="${pkgdir}" install
-  sed -i -e 's|/lib/X11/|/share/|g' "${pkgdir}/etc/X11/fs/config"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.xfs"
-  popd
-  
-  for i in xfsinfo-* fslsfonts-* fstobdf-* showfont-*; do
-    if [ -d "${i}" ]; then
-      pushd "${i}"
-      make DESTDIR="${pkgdir}" install
-      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${i%-*}"
-      popd
-    fi
-  done
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  install -m755 "${srcdir}/xfs.rc" "${pkgdir}/etc/rc.d/xfs"
-}
diff --git a/extra/xorg-xfs/xfs.rc b/extra/xorg-xfs/xfs.rc
deleted file mode 100644
index caac86106..000000000
--- a/extra/xorg-xfs/xfs.rc
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/xfs`
-case "$1" in
-  start)
-    stat_busy "Starting X.Org fontserver"
-    if [ -z "$PID" ]; then
-       /usr/bin/xfs -daemon &> /dev/null
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon xfs
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping X.Org fontserver"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon xfs
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  reload)
-    stat_busy "Reloading X.Org fontserver configuration"
-    [ ! -z "$PID" ]  && kill -HUP $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload}"  
-esac
diff --git a/extra/xorg-xinit/PKGBUILD b/extra/xorg-xinit/PKGBUILD
index 85ba64842..725a605ff 100644
--- a/extra/xorg-xinit/PKGBUILD
+++ b/extra/xorg-xinit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149821 2012-02-11 08:52:05Z andyrtr $
+# $Id: PKGBUILD 170012 2012-10-31 00:12:04Z thomas $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xorg-xinit
 pkgver=1.3.2
-pkgrel=1.1
+pkgrel=3
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -28,7 +28,7 @@ md5sums=('9c0943cbd83e489ad1b05221b97efd44'
          '73a597d3fb7f5b9487318ac8cfd4bedf'
          'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
          '7873d97db30d6c279ed37e3559e7c59d'
-         'c5baef10fdb7239594daee72a94ddab3')
+         '4deba1b7f2cc7f93b304b956023e65d6')
 
 build() {
   cd "${srcdir}/xinit-${pkgver}"
diff --git a/extra/xorg-xinit/xserverrc b/extra/xorg-xinit/xserverrc
index 6f746cdce..6b57eeba6 100644
--- a/extra/xorg-xinit/xserverrc
+++ b/extra/xorg-xinit/xserverrc
@@ -1 +1,6 @@
-exec /usr/bin/X -nolisten tcp "$@"
+#!/bin/sh
+if [ -z "$XDG_VTNR" ]; then
+  exec /usr/bin/X -nolisten tcp "$@"
+else
+  exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR
+fi
diff --git a/extra/xscreensaver/LICENSE b/extra/xscreensaver/LICENSE
deleted file mode 100644
index 4f587b5a3..000000000
--- a/extra/xscreensaver/LICENSE
+++ /dev/null
@@ -1,9 +0,0 @@
-/* xscreensaver, Copyright (c) 1993-2006 Jamie Zawinski <jwz@jwz.org>
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation.  No representations are made about the suitability of this
- * software for any purpose.  It is provided "as is" without express or 
- * implied warranty.
- */
diff --git a/extra/xscreensaver/PKGBUILD b/extra/xscreensaver/PKGBUILD
deleted file mode 100644
index 9c38f0f45..000000000
--- a/extra/xscreensaver/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 146796 2012-01-18 14:05:21Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xscreensaver
-pkgver=5.15
-pkgrel=3
-pkgdesc="Screen saver and locker for the X Window System"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.jwz.org/xscreensaver/"
-license=('BSD')
-depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-appres' 'libxmu' \
-         'perl-libwww' 'perl-http-message')
-makedepends=('bc' 'libxpm' 'gdm')
-optdepends=('gdm: for login manager support')
-backup=('etc/pam.d/xscreensaver')
-source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \
-        add-electricsheep.diff xscreensaver.pam LICENSE)
-sha1sums=('b5ce7caa19f4d57c3bac83377a36dddbe7095052'
-          '677496218b81a42d90bee400026e94dd87fb8ffb'
-          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
-          '4209ea586b204fd1d81c382a0522c654f9fd9134')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/add-electricsheep.diff"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \
-    --with-pam --with-login-manager --with-gtk --with-gl \
-    --without-gle --with-pixbuf --with-jpeg
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make install_prefix="${pkgdir}" install
-  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -D -m644 ../xscreensaver.pam "${pkgdir}/etc/pam.d/xscreensaver"
-  chmod 755 "${pkgdir}/usr/bin/xscreensaver"
-  echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop"
-}
diff --git a/extra/xscreensaver/add-electricsheep.diff b/extra/xscreensaver/add-electricsheep.diff
deleted file mode 100644
index 18b4dea97..000000000
--- a/extra/xscreensaver/add-electricsheep.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- driver/XScreenSaver.ad.in-orig	2009-10-17 02:19:06.000000000 -0400
-+++ driver/XScreenSaver.ad.in	2009-10-17 02:21:16.000000000 -0400
-@@ -347,7 +347,8 @@
- @GL_KLUDGE@ GL: 				rubikblocks -root			    \n\
- @GL_KLUDGE@ GL: 				companioncube -root			    \n\
- @GL_KLUDGE@ GL: 				hilbert -root				    \n\
--@GL_KLUDGE@ GL: 				tronbit -root				    \n
-+@GL_KLUDGE@ GL: 				tronbit -root				    \n\
-+				electricsheep --root 1				    \n
- 
- 
- 
diff --git a/extra/xscreensaver/xscreensaver.pam b/extra/xscreensaver/xscreensaver.pam
deleted file mode 100644
index b4d80c21f..000000000
--- a/extra/xscreensaver/xscreensaver.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth		required	pam_unix_auth.so
diff --git a/extra/xsp/PKGBUILD b/extra/xsp/PKGBUILD
index 88b3f9217..7c8a888c6 100644
--- a/extra/xsp/PKGBUILD
+++ b/extra/xsp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xsp
 pkgver=2.10.2
 pkgrel=4
 pkgdesc="A simple webserver based on mono - provides ASP.NET support"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 license=('custom')
 url="http://www.go-mono.com"
 depends=('mono>=2.10.2' 'sqlite')
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index d0f433cbe..dcb294250 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168924 2012-10-16 15:02:37Z andyrtr $
+# $Id: PKGBUILD 172019 2012-11-26 14:56:12Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
-pkgver=284
+pkgver=287
 pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz
         LICENSE)
-md5sums=('fa6bd90b91365f41c6bb895bee054c12'
+md5sums=('0e4385e66d40b5dd6017d02c3db2a4af'
          '10ecc3f8ee91e3189863a172f68282d2')
 
 build() {
diff --git a/extra/yajl/PKGBUILD b/extra/yajl/PKGBUILD
index 8cd912127..36ecb9538 100644
--- a/extra/yajl/PKGBUILD
+++ b/extra/yajl/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=yajl
 pkgver=2.0.4
 pkgrel=1
 pkgdesc='Yet Another JSON Library.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://lloyd.github.com/yajl/'
 license=('ISC')
 makedepends=('cmake')
diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD
index b1ff07df2..93fd97ac2 100644
--- a/extra/yelp/PKGBUILD
+++ b/extra/yelp/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 159197 2012-05-17 16:15:13Z ibiru $
+# $Id: PKGBUILD 170857 2012-11-12 20:06:11Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=yelp
-pkgver=3.4.2
+pkgver=3.6.2
 pkgrel=1
 pkgdesc="A help browser for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
-depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' 'xz' 'bzip2'
+depends=('webkitgtk3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'xz' 'bzip2'
          'desktop-file-utils' 'dconf')
 makedepends=('intltool' 'gtk-doc' 'itstool')
 groups=('gnome')
@@ -16,7 +16,7 @@ options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 install=yelp.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('33f573da4d0b766aba7ebfab14470694e3245dffb2b63153f34bf8240b13c3a3')
+sha256sums=('f83d10cb6dfbbaa7d3d5a9ff930edd4a0eef657de0e8aeeaaef0b187038681e1')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/zenity/PKGBUILD b/extra/zenity/PKGBUILD
index 982c1caaa..c9d4dd09b 100644
--- a/extra/zenity/PKGBUILD
+++ b/extra/zenity/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 157010 2012-04-23 09:11:09Z ibiru $
+# $Id: PKGBUILD 169963 2012-10-30 22:58:54Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=zenity
-pkgver=3.4.0
+pkgver=3.6.0
 pkgrel=1
 pkgdesc="Display graphical dialog boxes from shell scripts"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('gtk3' 'libnotify')
-makedepends=('intltool' 'gtk-doc')
+makedepends=('intltool' 'gtk-doc' 'itstool' 'docbook-xsl')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('5cf068597c649b5adee60c5948abdf383dbfb16a6c6d57c2ec42ced136730baf')
+sha256sums=('5de4ebbb6888ad4928fa9eebcd42dbe5bb282bee9dd7dd21475d9eaa854c74be')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD
index d594bcef6..0deda06b7 100644
--- a/extra/zsh/PKGBUILD
+++ b/extra/zsh/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 164038 2012-07-24 20:46:25Z pierre $
+# $Id: PKGBUILD 171491 2012-11-18 04:23:42Z eric $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=zsh
 pkgver=5.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.zsh.org/'
 license=('custom')
 depends=('pcre' 'libcap' 'gdbm')
+backup=('etc/zsh/zprofile')
 install=zsh.install
 source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2"
         'zprofile')
-backup=('etc/zsh/zprofile')
 md5sums=('e8484468925cec8d9a84b8b04797e764'
          '24a9335edf77252a7b5f52e079f7aef7')
 
@@ -51,7 +51,7 @@ build() {
 		--enable-pcre \
 		--enable-cap \
 		--enable-zsh-secure-free
-	make
+	make all info
 }
 
 check() {
@@ -61,7 +61,7 @@ check() {
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}/" install
+	make DESTDIR="${pkgdir}/" install install.info
 	install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile"
 	install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/zsh/zsh.install b/extra/zsh/zsh.install
index e2a53bea8..8e54d92ee 100644
--- a/extra/zsh/zsh.install
+++ b/extra/zsh/zsh.install
@@ -1,5 +1,12 @@
+infodir=usr/share/info
+filelist=(zsh.info zsh.info-1 zsh.info-2 zsh.info-3 zsh.info-4 zsh.info-5 zsh.info-6)
+
 post_install() {
 	grep -q '/bin/zsh' etc/shells || echo '/bin/zsh' >> etc/shells
+	[ -x usr/bin/install-info ] || return 0
+	for file in ${filelist[@]}; do
+	    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+	done
 }
 
 post_upgrade() {
@@ -8,4 +15,8 @@ post_upgrade() {
 
 pre_remove() {
 	sed -i '/^\/bin\/zsh/d' etc/shells
+	[ -x usr/bin/install-info ] || return 0
+	for file in ${filelist[@]}; do
+	    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+	done
 }