Tue Nov 6 02:09:19 PST 2012

46 files changed, 1035 insertions, 94 deletions

diff --git a/community/account-plugins/PKGBUILD b/community/account-plugins/PKGBUILD
new file mode 100644
index 000000000..b5928821b
--- /dev/null
+++ b/community/account-plugins/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 79484 2012-11-06 04:10:50Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=account-plugins
+pkgver=0.9
+pkgrel=1
+pkgdesc="Account configuration plugins for credentials preferences"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/online-accounts-account-plugins"
+license=('GPL')
+depends=('credentials-preferences' 'signon-keyring-extension' 'signon-plugin-oauth2')
+makedepends=('gobject-introspection' 'vala' 'intltool')
+optdepends=('python-gobject: for account-console tool')
+options=('!libtool')
+install=$pkgname.install
+source=(https://launchpad.net/online-accounts-account-plugins/12.10/$pkgver/+download/$pkgname-$pkgver.tar.gz)
+md5sums=('58deed9e3305877bb4db426a51451ec0')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/account-plugins/account-plugins.install b/community/account-plugins/account-plugins.install
new file mode 100644
index 000000000..2c455e952
--- /dev/null
+++ b/community/account-plugins/account-plugins.install
@@ -0,0 +1,11 @@
+post_install() {
+  xdg-icon-resource forceupdate
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/community/blobwars/PKGBUILD b/community/blobwars/PKGBUILD
new file mode 100644
index 000000000..dd180f51c
--- /dev/null
+++ b/community/blobwars/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 57879 2011-11-04 08:01:07Z lcarlier $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
+# Contributor: geekitus
+
+pkgname=blobwars
+pkgver=1.19
+pkgrel=4
+pkgdesc="Platform action game featuring a blob wih lot of weapons"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/blobwars"
+license=('GPL')
+makedepends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'sdl_net')
+install=$pkgname.install
+source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('87e8aaa114b6e4742ea6ee28e7a7f984')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # fix building with gcc 4.6
+  sed -i -e 's/-Werror/-Werror -Wno-error=unused-result/g' makefile
+
+  RELEASE=1 make 
+}
+
+package() {
+  depends=('hicolor-icon-theme' 'sdl_image' 'sdl_mixer' 'sdl_ttf' 'sdl_net' 'blobwars-data>=1.19')
+
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make PREFIX="${pkgdir}/usr" BINDIR="${pkgdir}/usr/bin/" install
+
+  # We remove data files (See blobwars-data)
+  rm -r "${pkgdir}/usr/share/games"
+
+  chmod a+r "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  chmod a+r -R "${pkgdir}/usr/share/icons/hicolor/"
+  install -dm755 "${pkgdir}/usr/share/pixmaps"
+  install -m644 icons/blobwars.png "${pkgdir}/usr/share/pixmaps/"
+}
diff --git a/community/blobwars/blobwars.install b/community/blobwars/blobwars.install
new file mode 100644
index 000000000..b711352cb
--- /dev/null
+++ b/community/blobwars/blobwars.install
@@ -0,0 +1,11 @@
+post_install() {
+  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD
index 556bc8a97..6b2b58c2a 100644
--- a/community/cppcheck/PKGBUILD
+++ b/community/cppcheck/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 76074 2012-09-10 20:04:41Z stephane $
+# $Id: PKGBUILD 79443 2012-11-05 16:58:53Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=cppcheck
-pkgver=1.56
+pkgver=1.57
 pkgrel=1
 pkgdesc="A tool for static C/C++ code analysis"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('pcre' 'qt')
 makedepends=('docbook-xsl')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('63999e1a492f73408fcad87b4bef3c2775feb7e5')
+sha1sums=('4753472689fdcb4276fde55e6e984597c87921bd')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/credentials-preferences/PKGBUILD b/community/credentials-preferences/PKGBUILD
new file mode 100644
index 000000000..5b4290781
--- /dev/null
+++ b/community/credentials-preferences/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 79485 2012-11-06 04:10:55Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=credentials-preferences
+_pkgname=credentials-control-center
+pkgver=0.1.1
+pkgrel=1
+pkgdesc="Control panel for configuring online account credentials and settings"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/online-accounts-gnome-control-center"
+license=('GPL' 'LGPL')
+depends=('libaccounts-glib' 'libsignon-glib' 'gtk3')
+makedepends=('gobject-introspection' 'vala' 'intltool' 'itstool')
+options=('!libtool')
+install=$pkgname.install
+source=(https://launchpad.net/online-accounts-gnome-control-center/13.04/$pkgver/+download/$_pkgname-$pkgver.tar.bz2
+        http://pkgbuild.com/~bgyorgy/sources/$_pkgname-translations-20121018.tar.gz)
+md5sums=('4e42fb2350393c6f8661e38f07d0b765'
+         '702d6b39136e10ba6dfad0afd300b2af')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  # Install language files
+  echo 'af ar ast bn bs ca cy cs da de el en_AU en_GB eo es eu fa fi fr gd gl gu he hu it ja ko lt lv ms my nb nl oc pl pt pt_BR ro ru se sk sl sq sv tr ug uk vi zh_CN zh_HK zh_TW' >po/LINGUAS
+  rename $_pkgname- '' ../po/$_pkgname-*.po
+  mv -f -t po ../po/*
+
+  # Fix desktop file
+  sed -i 's/X-GNOME-Settings-Panel;//' data/credentials-preferences.desktop.in.in
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+              --disable-static
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/credentials-preferences/credentials-preferences.install b/community/credentials-preferences/credentials-preferences.install
new file mode 100644
index 000000000..2c455e952
--- /dev/null
+++ b/community/credentials-preferences/credentials-preferences.install
@@ -0,0 +1,11 @@
+post_install() {
+  xdg-icon-resource forceupdate
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/community/deja-dup/PKGBUILD b/community/deja-dup/PKGBUILD
index 1f9815897..d33e77dd1 100644
--- a/community/deja-dup/PKGBUILD
+++ b/community/deja-dup/PKGBUILD
@@ -1,25 +1,36 @@
-# $Id: PKGBUILD 77901 2012-10-15 17:33:17Z bgyorgy $
+# $Id: PKGBUILD 79462 2012-11-05 20:10:47Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=deja-dup
 pkgver=24.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/deja-dup"
 license=('GPL')
 depends=('duplicity' 'libgnome-keyring' 'libpeas' 'libnotify' 'python2-gobject2' 'dconf' 'xdg-utils')
 makedepends=('vala' 'intltool' 'itstool' 'nautilus')
-optdepends=('nautilus: backup extension')
+optdepends=('nautilus: backup extension'
+            'ubuntuone-client: backup into Ubuntu One storage')
 options=('!libtool')
 install=$pkgname.install
-source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz)
-md5sums=('335131d1f3c85615339fa8b212db50ae')
+source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz
+        new-u1backend-support.patch
+        not-check-ubuntuone-couch.patch)
+md5sums=('335131d1f3c85615339fa8b212db50ae'
+         '944a4c62f042b240feba98f8d9a893b2'
+         '8d59798638982c2bdb55b2e415087245')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' common/PythonChecker.vala
 
+  # Add support for the new Ubuntu One backend
+  patch -Np0 -i "$srcdir/new-u1backend-support.patch"
+
+  # Now we don't need ubuntuone-couch for Ubuntu One support
+  patch -Np1 -i "$srcdir/not-check-ubuntuone-couch.patch"
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
               --disable-static --disable-schemas-compile --without-unity
   make
diff --git a/community/deja-dup/new-u1backend-support.patch b/community/deja-dup/new-u1backend-support.patch
new file mode 100644
index 000000000..08b918cb9
--- /dev/null
+++ b/community/deja-dup/new-u1backend-support.patch
@@ -0,0 +1,50 @@
+=== modified file 'common/BackendU1.vala'
+--- common/BackendU1.vala	2012-08-06 22:41:13 +0000
++++ common/BackendU1.vala	2012-11-03 21:35:53 +0000
+@@ -212,21 +212,41 @@
+ 
+   public override async void get_envp() throws Error
+   {
+-    bool found = false;
+     var obj = get_creds_proxy();
+     if (obj.get_name_owner() == null) {
+       ask_password();
+       return;
+     }
+ 
++    var found = false;
++    var envp = new List<string>();
+     var listener = new Listener(obj, "find_credentials", null, (name, args) => {
+-      if (name == "CredentialsFound")
+-        found = true;
++      if (name == "CredentialsFound") {
++        VariantIter iter;
++        args.get("(a{ss})", out iter);
++        string key, val;
++        string consumer_key = null, consumer_secret = null, token = null, token_secret = null;
++        while (iter.next("{ss}", out key, out val)) {
++          if (key == "consumer_key")
++            consumer_key = val;
++          else if (key == "consumer_secret")
++            consumer_secret = val;
++          else if (key == "token")
++            token = val;
++          else if (key == "token_secret")
++            token_secret = val;
++        }
++        if (consumer_key != null && consumer_secret != null && token != null && token_secret != null) {
++          warning("appending: %s", "FTP_PASSWORD=%s:%s:%s:%s".printf(consumer_key, consumer_secret, token, token_secret));
++          envp.append("FTP_PASSWORD=%s:%s:%s:%s".printf(consumer_key, consumer_secret, token, token_secret));
++          found = true;
++        }
++      }
+     });
+     listener.run();
+ 
+     if (found)
+-      envp_ready(true, null);
++      envp_ready(true, envp);
+     else
+       ask_password();
+   }
+
diff --git a/community/deja-dup/not-check-ubuntuone-couch.patch b/community/deja-dup/not-check-ubuntuone-couch.patch
new file mode 100644
index 000000000..d7fb903a1
--- /dev/null
+++ b/community/deja-dup/not-check-ubuntuone-couch.patch
@@ -0,0 +1,45 @@
+diff -Naur deja-dup-24.0.orig/common/BackendU1.vala deja-dup-24.0/common/BackendU1.vala
+--- deja-dup-24.0.orig/common/BackendU1.vala	2012-08-07 00:20:51.000000000 +0200
++++ deja-dup-24.0/common/BackendU1.vala	2012-11-05 16:39:34.140104977 +0100
+@@ -75,11 +75,14 @@
+ 
+ class U1Checker : Checker
+ {
+-  PythonChecker pyu1;
+   construct {
+     try {
+       var proxy = BackendU1.get_creds_proxy();
+-      if (proxy.get_name_owner() == null) {
++      if (proxy.get_name_owner() != null) {
++        available = true;
++        complete = true;
++      }
++      else {
+         available = false;
+         complete = true;
+       }
+@@ -89,24 +92,6 @@
+       available = false;
+       complete = true;
+     }
+-
+-    if (!complete) {
+-      // A bit of abstraction leakage here; we have to keep these imports in
+-      // line with what duplicity uses.  Maybe we should add to duplicity a way
+-      // to ask 'can I use this backend?'
+-      pyu1 = PythonChecker.get_checker("ubuntuone.platform.credentials, ubuntuone.couch.auth");
+-      if (pyu1.complete) {
+-        available = pyu1.available;
+-        complete = pyu1.complete;
+-      }
+-      else {
+-        pyu1.notify["complete"].connect(() => {
+-          available = pyu1.available;
+-          complete = pyu1.complete;
+-          pyu1 = null;
+-        });
+-      }
+-    }
+   }
+ }
+ 
diff --git a/community/directfb/PKGBUILD b/community/directfb/PKGBUILD
index 618174393..b7dbf0323 100644
--- a/community/directfb/PKGBUILD
+++ b/community/directfb/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 74058 2012-07-19 05:01:17Z ebelanger $
+# $Id: PKGBUILD 79438 2012-11-05 08:05:20Z ebelanger $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=directfb
-pkgver=1.6.1
+pkgver=1.6.2
 pkgrel=1
 pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device"
 arch=('i686' 'x86_64')
@@ -11,14 +11,11 @@ url="http://www.directfb.org"
 license=('LGPL')
 depends=('gcc-libs' 'libjpeg' 'sdl' 'libpng' 'freetype2')
 options=('!libtool')
-source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz \
-        DirectFB-1.6.1-zlib-include.patch)
-sha1sums=('121c7fd1e81ccb41962986126e1d69f188c2f2c2'
-          'f2309edd87c772a7894d4b648d56197d91790cad')
+source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz)
+sha1sums=('a393a53130e6a80369b7081371cd23dd1cd5e192')
 
 build() {
   cd "${srcdir}/DirectFB-${pkgver}"
-  patch -p1 -i ../DirectFB-1.6.1-zlib-include.patch
   ./configure --prefix=/usr --sysconfdir=/etc --enable-static \
     --enable-zlib --enable-x11 --enable-sdl --disable-vnc --disable-osx \
     --enable-video4linux2 --enable-voodoo
diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD
index 080359ec7..654d1a743 100644
--- a/community/duplicity/PKGBUILD
+++ b/community/duplicity/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 79351 2012-11-03 14:29:23Z lfleischer $
+# $Id: PKGBUILD 79464 2012-11-05 20:16:41Z bgyorgy $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
 
 pkgname=duplicity
 pkgver=0.6.20
-pkgrel=1
+pkgrel=2
 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.'
 arch=('i686' 'x86_64')
 url='http://www.nongnu.org/duplicity/'
 license=('GPL')
 depends=('librsync' 'ncftp' 'python2' 'python2-boto' 'python2-gnupginterface' 'python2-paramiko')
-source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+        u1-ascii-error.patch)
 md5sums=('83a56c4c17fc50961c961943867deae4'
-         '2bd2d4a3a331ab728473f46963dc87da')
+         '2bd2d4a3a331ab728473f46963dc87da'
+         '7e19cc49547848ce847297b1880f5a8e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  # Fix ascii error in U1 backend
+  patch -Np0 -i "${srcdir}/u1-ascii-error.patch"
+
   # python2 fix
   for file in $(find . -name '*.py' -print); do
     sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
diff --git a/community/duplicity/u1-ascii-error.patch b/community/duplicity/u1-ascii-error.patch
new file mode 100644
index 000000000..0812653b9
--- /dev/null
+++ b/community/duplicity/u1-ascii-error.patch
@@ -0,0 +1,13 @@
+=== modified file 'duplicity/backends/u1backend.py'
+--- duplicity/backends/u1backend.py	2012-10-27 12:16:19 +0000
++++ duplicity/backends/u1backend.py	2012-11-03 21:39:23 +0000
+@@ -207,7 +207,7 @@
+                    "Content-Type": content_type}
+         resp, content = self.client.request(remote_full,
+                                             method="PUT",
+-                                            body=str(data),
++                                            body=bytearray(data),
+                                             headers=headers)
+ 
+     def get(self, filename, local_path):
+
diff --git a/community/freeorion/PKGBUILD b/community/freeorion/PKGBUILD
index aba0ba331..f81715361 100644
--- a/community/freeorion/PKGBUILD
+++ b/community/freeorion/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 78495 2012-10-19 23:54:49Z arodseth $
+# $Id: PKGBUILD 79478 2012-11-06 02:15:41Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: guini <sidtrun@googlemail.com>
 # Contributor: Forrest Loomis <cybercyst _ at _ gmail dot com>
@@ -7,7 +7,7 @@
 
 pkgname=freeorion
 pkgver=0.4.1
-pkgrel=3
+pkgrel=4
 pkgdesc='Turn-based galactic conquest game inspired by Master of Orion'
 arch=('x86_64' 'i686')
 url='http://www.freeorion.org/'
@@ -32,18 +32,23 @@ sha256sums=('111532e460aec847ff455ee67dd64f46e2fa5ceba39a0349d25a84b69c646eaf'
             '3dbe8df9c3a4a0d6451f42727ebf9bcb21fed41a08d1181d1cf77ef4ab5ee81a')
 _svnrepo='https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/'
 _pyversion=2.7
+_revision=5379
 
 build() {
   cd "$srcdir"
   gendesk -n
 
   msg2 'Looking up revision from version number...'
-  _fixedrevision=`curl --progress-bar -o- ${url}index.php/Compile | grep "$pkgver" | cut -d':' -f2 | cut -d' ' -f10 | tail -1`
-  msg2 "Checking out svn revision $_fixedrevision..."
+  _releaserevision=`curl --progress-bar -o- ${url}index.php/Compile | grep "$pkgver" | cut -d':' -f2 | cut -d' ' -f10 | tail -1`
+  msg2 "The revision for the latest official release is $_releaserevision"
+  # _revision=$_releaserevision
+  msg2 "Compiling with revision $_revision"
+
+  msg2 "Checking out svn revision $_revision..."
   if [[ -d "$pkgname/.svn" ]]; then
-    (cd "$pkgname" && svn up -r "$_fixedrevision")
+    (cd "$pkgname" && svn up -r "$_revision")
   else
-    svn co "$_svnrepo" --config-dir ./ -r "$_fixedrevision" "$pkgname"
+    svn co "$_svnrepo" --config-dir ./ -r "$_revision" "$pkgname"
   fi
 
   msg2 "Setting up build directory..."
@@ -64,8 +69,8 @@ build() {
   setconf CMakeCache.txt CMAKE_CXX_FLAGS:STRING \
     "'-march=x86-64 -mtune=generic -O2 -fno-var-tracking -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -lGL -lGLU '"
 
-  msg2 "Boost fix..."
-  sed -i 's:TIME_UTC:TIME_UTC_:' util/MultiplayerCommon.cpp
+  #msg2 "Boost fix..."
+  #sed -i 's:TIME_UTC:TIME_UTC_:' util/MultiplayerCommon.cpp
   
   msg2 "Compiling..."
   make -j1
diff --git a/community/frei0r-plugins/PKGBUILD b/community/frei0r-plugins/PKGBUILD
index f248043ba..090bab212 100644
--- a/community/frei0r-plugins/PKGBUILD
+++ b/community/frei0r-plugins/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 76620 2012-09-25 09:17:06Z spupykin $
+# $Id: PKGBUILD 79445 2012-11-05 18:29:55Z schiv $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=frei0r-plugins
 pkgver=1.3
-pkgrel=4
-pkgdesc="frei0r is a minimalistic plugin API for video sources and filters."
+pkgrel=5
+pkgdesc="A minimalistic plugin API for video sources and filters"
 arch=(i686 x86_64)
 url="http://www.piksel.org/frei0r"
 license=('GPL')
-depends=('gcc-libs' 'gavl>=1.0.0' 'opencv')
+depends=('gcc-libs' 'gavl>=1.0.0' 'opencv>=2.4.3')
 makedepends=('graphviz')
 options=('!emptydirs')
 source=(http://ftp.dyne.org/frei0r/releases/frei0r-plugins-$pkgver.tar.gz)
diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD
index 31647d1de..436c21d8a 100644
--- a/community/gtranslator/PKGBUILD
+++ b/community/gtranslator/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 74570 2012-07-30 18:54:46Z jlichtblau $
+# $Id: PKGBUILD 79447 2012-11-05 19:27:31Z bgyorgy $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Contributor: Christer Solskogen (solskogen@carebears.mine.nu)
 
 pkgname=gtranslator
 pkgver=2.91.5
-pkgrel=1
+pkgrel=2
 pkgdesc="An enhanced gettext po file editor for the GNOME"
 arch=('i686' 'x86_64')
 url="http://projects.gnome.org/gtranslator/"
@@ -17,12 +17,17 @@ optdepends=('gucharmap: for charmap plugin'
 options=('!libtool')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz)
-sha256sums=('7dcdabd5c2156bef98f35d2ec31798287d1721e400ea738fb3ccc2ff2ef186e6')
+source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz
+        disable-dockbar.patch)
+sha256sums=('7dcdabd5c2156bef98f35d2ec31798287d1721e400ea738fb3ccc2ff2ef186e6'
+            '04647eb198291024e5a65564ad6be239b7af4472421a44c2d57ed5d6a8bb4384')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
+  # Tempolary disable dockbar, because layout loading is completely broken with gdl 3.6
+  patch -Np1 -i ${srcdir}/disable-dockbar.patch
+
   ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile
   make
 }
diff --git a/community/gtranslator/disable-dockbar.patch b/community/gtranslator/disable-dockbar.patch
new file mode 100644
index 000000000..aa8de6c60
--- /dev/null
+++ b/community/gtranslator/disable-dockbar.patch
@@ -0,0 +1,76 @@
+diff -Naur gtranslator-2.91.5.orig/src/gtr-tab.c gtranslator-2.91.5/src/gtr-tab.c
+--- gtranslator-2.91.5.orig/src/gtr-tab.c	2012-06-07 13:48:56.000000000 +0200
++++ gtranslator-2.91.5/src/gtr-tab.c	2012-11-05 19:18:01.899014670 +0100
+@@ -149,9 +149,6 @@
+   g_return_if_fail (GTR_IS_TAB (tab));
+   g_return_if_fail (filename != NULL);
+ 
+-  gdl_dock_layout_save_layout (tab->priv->layout_manager, name);
+-  if (!gdl_dock_layout_save_to_file (tab->priv->layout_manager, filename))
+-    g_warning ("Saving dock layout to '%s' failed!", filename);
+ }
+ 
+ static void
+@@ -160,23 +157,6 @@
+                      const gchar *name)
+ {
+   g_return_if_fail (GTR_IS_TAB (tab));
+-
+-  if (!layout_filename ||
+-      !gdl_dock_layout_load_from_file (tab->priv->layout_manager,
+-                                       layout_filename))
+-    {
+-      gchar *path;
+-
+-      path = gtr_dirs_get_ui_file ("layout.xml");
+-
+-      if (!gdl_dock_layout_load_from_file (tab->priv->layout_manager,
+-                                           path))
+-        g_warning ("Loading layout from '%s' failed!!", path);
+-      g_free (path);
+-    }
+-
+-  if (!gdl_dock_layout_load_layout (tab->priv->layout_manager, name))
+-    g_warning ("Loading layout failed!!");
+ }
+ 
+ static void
+@@ -702,7 +682,6 @@
+   GtkWidget *vertical_box;
+   GtkWidget *msgid_label;
+   GtkWidget *scroll;
+-  GtkWidget *dockbar;
+   GtrTabPrivate *priv;
+ 
+   tab->priv = GTR_TAB_GET_PRIVATE (tab);
+@@ -727,22 +706,6 @@
+   gtk_widget_show (priv->dock);
+   gtk_box_pack_end (GTK_BOX (hbox), priv->dock, TRUE, TRUE, 0);
+ 
+-  dockbar = gdl_dock_bar_new (GDL_DOCK (priv->dock));
+-  gtk_widget_show (dockbar);
+-  gtk_box_pack_start (GTK_BOX (hbox), dockbar, FALSE, FALSE, 0);
+-
+-  priv->layout_manager = gdl_dock_layout_new (GDL_DOCK (priv->dock));
+-  g_signal_connect (priv->layout_manager->master,
+-                    "layout-changed",
+-                    G_CALLBACK (on_layout_changed),
+-                    tab);
+-
+-  g_settings_bind (priv->ui_settings,
+-                   GTR_SETTINGS_PANEL_SWITCHER_STYLE,
+-                   priv->layout_manager->master,
+-                   "switcher-style",
+-                   G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+-
+   /* Message table */
+   priv->message_table = gtr_message_table_new (GTK_WIDGET (tab));
+   gtk_widget_show (priv->message_table);
+@@ -904,7 +867,6 @@
+   g_clear_object (&priv->files_settings);
+   g_clear_object (&priv->editor_settings);
+   g_clear_object (&priv->state_settings);
+-  g_clear_object (&priv->layout_manager);
+ 
+   G_OBJECT_CLASS (gtr_tab_parent_class)->dispose (object);
+ }
diff --git a/community/gtranslator/gtranslator.changelog b/community/gtranslator/gtranslator.changelog
index 49dbfa714..7187196b4 100644
--- a/community/gtranslator/gtranslator.changelog
+++ b/community/gtranslator/gtranslator.changelog
@@ -1,3 +1,8 @@
+2012-11-05 Balló György <ballogyor+arch at gmail dot com>
+	* gtranslator 2.91.5-2
+	rebuild for gdl 3.6
+	tempolary disable dockbar, because layout loading is completely broken with gdl 3.6
+
 2012-07-30 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
 	* gtranslator 2.91.5-1
 
diff --git a/community/gwibber/PKGBUILD b/community/gwibber/PKGBUILD
index dcb0e0c78..d990ce73d 100644
--- a/community/gwibber/PKGBUILD
+++ b/community/gwibber/PKGBUILD
@@ -1,25 +1,32 @@
-# $Id: PKGBUILD 78193 2012-10-17 10:24:07Z allan $
+# $Id: PKGBUILD 79486 2012-11-06 04:11:00Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=gwibber
-pkgver=3.4.2
-pkgrel=2
-pkgdesc="Microblogging client for GNOME, which supports Twitter, Identi.ca, StatusNet, Facebook, Flickr, Digg, FriendFeed and Qaiku"
+pkgver=3.6.0
+pkgrel=1
+pkgdesc="Microblogging client for GNOME, which supports Facebook, Identi.ca, Twitter, Flickr, Foursquare, Sina and Sohu"
 arch=('i686' 'x86_64')
 url="http://gwibber.com/"
 license=('GPL')
-depends=('libgee' 'libnotify' 'dee>=1.0.0' 'json-glib' 'gtkspell3' 'python2-gobject' 'libwnck3' 'libwebkit3' 'libgnome-keyring>=3.3' 'python2-dbus' 'python2-httplib2' 'python2-egenix-mx-base' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('intltool' 'vala>=0.15.0')
+depends=('libgee' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf')
+makedepends=('intltool' 'vala')
 options=('!libtool')
 install=$pkgname.install
 source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('0ac544f8e626547312b9d0da0b57358e')
+md5sums=('5988e36e9f592c6eca6537ba6878307a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+  # Use the standalone accounts configuration panel
+  sed -i 's/"gnome-control-center", "credentials", "application=gwibber"/"credentials-preferences"/' client/gwibber-client.vala
+  sed -i 's/"gnome-control-center", "credentials"/"credentials-preferences"/' gwibber/microblog/dispatcher.py
+
+  # Remove unneeded dependency on libdbusmenu
+  sed -i '/Dbusmenu-0.4/ d' client/Makefile.{am,in}
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
               --disable-static --disable-schemas-compile --disable-unity
   make
 }
diff --git a/community/libaccounts-glib/PKGBUILD b/community/libaccounts-glib/PKGBUILD
new file mode 100644
index 000000000..191a1ccf5
--- /dev/null
+++ b/community/libaccounts-glib/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 79487 2012-11-06 04:11:07Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=libaccounts-glib
+pkgver=1.3
+pkgrel=1
+pkgdesc="Glib-based client library for accessing the online accounts database"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/accounts-sso/"
+license=('LGPL')
+depends=('dbus-glib' 'libxml2' 'sqlite3')
+makedepends=('python2-gobject')
+options=('!libtool')
+source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz
+        fix-docdir.patch
+        make-tests-optional.patch)
+sha1sums=('a2bd07082e9e9235103051f6574b154182745aee'
+          '94291a58dbbd36f524538adbf6d0c5a55024a34c'
+          '35732dc134c32af6ad1684d6388bad8ffe3f4dcc')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Use the standard docdir location
+  # http://code.google.com/p/accounts-sso/issues/detail?id=123
+  patch -Np1 -i "$srcdir/fix-docdir.patch"
+
+  # Build tests optionally
+  # http://code.google.com/p/accounts-sso/issues/detail?id=124
+  patch -Np1 -i "$srcdir/make-tests-optional.patch"
+
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static \
+              PYTHON=python2
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  # Install GI overrides for python 3 as well
+  install -dm755 "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides"
+  ln -s ../../../../python2.7/site-packages/gi/overrides/Accounts.py "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides/Accounts.py"
+
+  # We don't have Backup Framework on Arch Linux
+  rm -r "$pkgdir/usr/share/backup-framework"
+}
diff --git a/community/libaccounts-glib/fix-docdir.patch b/community/libaccounts-glib/fix-docdir.patch
new file mode 100644
index 000000000..a535000ec
--- /dev/null
+++ b/community/libaccounts-glib/fix-docdir.patch
@@ -0,0 +1,12 @@
+diff -Naur -i libaccounts-glib-1.3.orig/Makefile.am libaccounts-glib-1.3/Makefile.am
+--- libaccounts-glib-1.3.orig/Makefile.am	2012-03-13 15:18:32.000000000 +0100
++++ libaccounts-glib-1.3/Makefile.am	2012-10-16 21:38:42.156352344 +0200
+@@ -12,7 +12,7 @@
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libaccounts-glib.pc
+ 
+-libaccountsdocdir = ${prefix}/doc/reference
++libaccountsdocdir = ${docdir}
+ libaccountsdoc_DATA= README COPYING AUTHORS ChangeLog INSTALL NEWS
+ 
+ backupconfdir = ${prefix}/share/backup-framework/applications
diff --git a/community/libaccounts-glib/make-tests-optional.patch b/community/libaccounts-glib/make-tests-optional.patch
new file mode 100644
index 000000000..a5c3d1ba5
--- /dev/null
+++ b/community/libaccounts-glib/make-tests-optional.patch
@@ -0,0 +1,68 @@
+commit c34f64423776d214fc5a24b76c7c606119988d7e
+Author: David King <david.king@canonical.com>
+Date:   Mon Oct 22 08:12:40 2012 +0100
+
+    Make tests optional at configure time
+    
+    http://code.google.com/p/accounts-sso/issues/detail?id=124
+
+diff --git a/Makefile.am b/Makefile.am
+index 97979a6..358a923 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,10 @@
+-SUBDIRS = libaccounts-glib docs tests tools
++SUBDIRS = libaccounts-glib docs tools
+ if ENABLE_PYTHON
+ SUBDIRS += pygobject
+ endif
++if ENABLE_TESTS
++SUBDIRS += tests
++endif
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+diff --git a/configure.ac b/configure.ac
+index cbaf8d5..50b95ea 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,7 +22,25 @@ PKG_CHECK_MODULES(
+ AC_SUBST(LIBACCOUNTS_CFLAGS)
+ AC_SUBST(LIBACCOUNTS_LIBS)
+ 
+-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
++# Build tests.
++
++CHECK_REQUIRED="check >= 0.9.4"
++
++AC_ARG_ENABLE([tests],
++  [AS_HELP_STRING([--disable-tests], [build with testing support disabled])])
++
++AS_IF([test "x$enable_tests" != "xno"],
++  [PKG_CHECK_EXISTS([$CHECK_REQUIRED], [have_check=yes], [have_check=no])],
++  [have_check=no])
++
++AS_IF([test "x$have_check" = "xyes"],
++  [PKG_CHECK_MODULES([CHECK], [$CHECK_REQUIRED])
++   AC_SUBST([CHECK_CFLAGS])
++   AC_SUBST([CHECK_LIBS])],
++  [AS_IF([test "x$enable_tests" = "xyes"],
++      [AC_MSG_ERROR([tests enabled but required dependencies were not found])])])
++
++AM_CONDITIONAL([ENABLE_TESTS], [test "x$have_check" = "xyes"])
+ 
+ AC_ISC_POSIX
+ AC_PROG_CC
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index db5aa3f..f6c8dbf 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -7,7 +7,7 @@ dist_check_SCRIPTS = \
+ check_SCRIPTS = accounts-glib-test.sh
+ 
+ accounts_glib_testsuite_SOURCES = check_ag.c
+-accounts_glib_testsuite_CFLAGS = $(CHECK_FLAGS) -I$(top_srcdir)
++accounts_glib_testsuite_CFLAGS = $(CHECK_CFLAGS) -I$(top_srcdir)
+ accounts_glib_testsuite_LDADD = \
+ 	$(CHECK_LIBS) \
+ 	$(LIBACCOUNTS_LIBS) \
diff --git a/community/libaccounts-qt/PKGBUILD b/community/libaccounts-qt/PKGBUILD
new file mode 100644
index 000000000..863f1726e
--- /dev/null
+++ b/community/libaccounts-qt/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 79488 2012-11-06 04:11:10Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgbase=libaccounts-qt
+_pkgbase=accounts-qt
+pkgname=('libaccounts-qt' 'libaccounts-qt-doc')
+pkgver=1.2
+pkgrel=1
+pkgdesc="Qt-based client library for accessing the online accounts database"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/accounts-sso/"
+license=('LGPL')
+depends=('qt' 'libaccounts-glib')
+makedepends=('doxygen' 'graphviz' 'ttf-dejavu')
+source=(http://accounts-sso.googlecode.com/files/$_pkgbase-$pkgver.tar.bz2)
+sha1sums=('5824847558ffea57cafbeb7963595dd80366ad82')
+
+build() {
+  cd "$srcdir/$_pkgbase-$pkgver"
+
+  # Do not install tests
+  echo 'INSTALLS =' >>tests/accountstest.pro
+
+  qmake PREFIX=/usr LIBDIR=/usr/lib
+  make
+}
+
+package_libaccounts-qt() {
+  cd "$srcdir/$_pkgbase-$pkgver"
+
+  make INSTALL_ROOT="$pkgdir" install
+
+  # Split out documentation
+  mv "$pkgdir/usr/share/doc" "$srcdir"
+}
+
+package_libaccounts-qt-doc() {
+  pkgdesc="Developer documention of signon"
+  depends=()
+  options=('!emptydirs')
+
+  mkdir -p "$pkgdir/usr/share"
+  mv "$srcdir/doc" "$pkgdir/usr/share"
+}
diff --git a/community/libsignon-glib/PKGBUILD b/community/libsignon-glib/PKGBUILD
new file mode 100644
index 000000000..752d0b0c1
--- /dev/null
+++ b/community/libsignon-glib/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 79489 2012-11-06 04:11:17Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=libsignon-glib
+pkgver=1.7
+pkgrel=1
+pkgdesc="GLib-based client library for applications handling account authentication through the Online Accounts Single Sign-On service"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/accounts-sso/"
+license=('LGPL')
+depends=('signon')
+makedepends=('python2-gobject')
+options=('!libtool')
+source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz
+        fix-docdir.patch
+        make-tests-optional.patch)
+sha1sums=('e461c952c015e5b375ca3f12fac5a8ae1ba4646e'
+          '56ffd1502dcb754797dc95c0eb80ab23374aee2d'
+          '327dde1944c8adc27d8bd413399a4366b3560901')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Use the standard docdir location
+  # http://code.google.com/p/accounts-sso/issues/detail?id=123
+  patch -Np1 -i "$srcdir/fix-docdir.patch"
+
+  # Build tests optionally
+  # http://code.google.com/p/accounts-sso/issues/detail?id=124
+  patch -Np1 -i "$srcdir/make-tests-optional.patch"
+
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static \
+              PYTHON=python2
+  make -j1
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  # Install GI overrides for python 3 as well
+  install -dm755 "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides"
+  ln -s ../../../../python2.7/site-packages/gi/overrides/Signon.py "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides/Signon.py"
+}
diff --git a/community/libsignon-glib/fix-docdir.patch b/community/libsignon-glib/fix-docdir.patch
new file mode 100644
index 000000000..b42c7faf8
--- /dev/null
+++ b/community/libsignon-glib/fix-docdir.patch
@@ -0,0 +1,12 @@
+diff -Naur libsignon-glib-1.6.orig/Makefile.am libsignon-glib-1.6/Makefile.am
+--- libsignon-glib-1.6.orig/Makefile.am	2012-08-13 10:09:23.000000000 +0200
++++ libsignon-glib-1.6/Makefile.am	2012-10-16 22:04:28.805736477 +0200
+@@ -11,7 +11,7 @@
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libsignon-glib.pc
+ 
+-libsignondocdir = ${prefix}/doc/reference
++libsignondocdir = ${docdir}
+ libsignondoc_DATA= README COPYING AUTHORS ChangeLog INSTALL NEWS
+ 
+ EXTRA_DIST = \
diff --git a/community/libsignon-glib/make-tests-optional.patch b/community/libsignon-glib/make-tests-optional.patch
new file mode 100644
index 000000000..cc1e72848
--- /dev/null
+++ b/community/libsignon-glib/make-tests-optional.patch
@@ -0,0 +1,61 @@
+commit 65e1948097695f26aa13f4104336a8a76a678b87
+Author: David King <david.king@canonical.com>
+Date:   Tue Oct 30 09:24:27 2012 +0000
+
+    Make tests optional at configure time
+    
+    http://code.google.com/p/accounts-sso/issues/detail?id=124
+
+diff --git a/Makefile.am b/Makefile.am
+index 86b3a55..5740d45 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,12 +2,16 @@ ACLOCAL_AMFLAGS = -I m4
+ DISTCHECK_CONFIGURE_FLAGS = \
+ 	--enable-gtk-doc \
+ 	--enable-introspection=yes
+-SUBDIRS = libsignon-glib docs tests
++SUBDIRS = libsignon-glib docs
+ 
+ if ENABLE_PYTHON
+ SUBDIRS += pygobject
+ endif
+ 
++if ENABLE_TESTS
++SUBDIRS += tests
++endif
++
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libsignon-glib.pc
+ 
+diff --git a/configure.ac b/configure.ac
+index af5e663..d09661e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,7 +19,25 @@ PKG_CHECK_MODULES(
+ AC_SUBST(DEPS_CFLAGS)
+ AC_SUBST(DEPS_LIBS)
+ 
+-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
++# Build tests.
++
++CHECK_REQUIRED="check >= 0.9.4"
++
++AC_ARG_ENABLE([tests],
++  [AS_HELP_STRING([--disable-tests], [build with testing support disabled])])
++
++AS_IF([test "x$enable_tests" != "xno"],
++  [PKG_CHECK_EXISTS([$CHECK_REQUIRED], [have_check=yes], [have_check=no])],
++  [have_check=no])
++
++AS_IF([test "x$have_check" = "xyes"],
++  [PKG_CHECK_MODULES([CHECK], [$CHECK_REQUIRED])
++   AC_SUBST([CHECK_CFLAGS])
++   AC_SUBST([CHECK_LIBS])],
++  [AS_IF([test "x$enable_tests" = "xyes"],
++    [AC_MSG_ERROR([tests enabled but required dependencies were not found])])])
++
++AM_CONDITIONAL([ENABLE_TESTS], [test "x$have_check" = "xyes"])
+ 
+ AC_ISC_POSIX
+ AC_PROG_CC
diff --git a/community/nautilus-sound-converter/PKGBUILD b/community/nautilus-sound-converter/PKGBUILD
index c4b6f142c..fa6923e0b 100644
--- a/community/nautilus-sound-converter/PKGBUILD
+++ b/community/nautilus-sound-converter/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 68972 2012-04-06 16:41:18Z bgyorgy $
+# $Id: PKGBUILD 79481 2012-11-06 03:41:36Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=nautilus-sound-converter
 pkgver=3.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Nautilus extension to convert audio files formats"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/nautilus-sound-converter/"
@@ -14,6 +14,7 @@ optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
             'gstreamer0.10-ugly-plugins: Extra media codecs'
             'gstreamer0.10-bad-plugins: Extra media codecs'
             'gstreamer0.10-ffmpeg: Extra media codecs')
+conflicts=('totem>=3.6.0')
 options=('!libtool')
 install=$pkgname.install
 source=(http://nautilus-sound-converter.googlecode.com/files/$pkgname-$pkgver.tar.xz)
diff --git a/community/pyzy/PKGBUILD b/community/pyzy/PKGBUILD
new file mode 100644
index 000000000..ec57c7f84
--- /dev/null
+++ b/community/pyzy/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Kerrick Staley <mail@kerrickstaley.com>
+
+pkgname=pyzy
+pkgver=1.0
+_commit="d7747466562cb8b4bc2934708e29b7643c7bedbc"
+pkgrel=1
+pkgdesc='The Chinese PinYin and Bopomofo conversion library'
+arch=('i686' 'x86_64')
+url='https://github.com/pyzy/pyzy'
+license=('LGPL')
+depends=('glib2' 'sqlite' 'util-linux')
+makedepends=('git' 'doxygen' 'gnome-common' 'python2')
+options=('!libtool')
+
+__gitroot=git://github.com/pyzy/pyzy.git
+__gitname=$pkgname
+
+build() {
+  cd "$srcdir"
+  msg "Connecting to GIT server...."
+
+  if [ -d $__gitname ] ; then
+    cd $__gitname && git pull origin
+    msg "The local files are updated."
+  else
+    git clone $__gitroot
+  fi
+
+  msg "GIT checkout done or server timeout"
+  msg "Starting make..."
+
+  rm -rf "$srcdir/$__gitname-build"
+  git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build"
+  cd "$srcdir/$__gitname-build"
+  git checkout "$_commit"	   
+
+  # replace python with python2; see https://github.com/hsumita/libpyzy/issues/1
+  find . -name '*.py' -exec sed -ri '1s#(bin/|env )python#\1python2#' '{}' \;
+  
+  ./autogen.sh --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$__gitname-build"
+
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/signon-keyring-extension/PKGBUILD b/community/signon-keyring-extension/PKGBUILD
new file mode 100644
index 000000000..ea0d03b3e
--- /dev/null
+++ b/community/signon-keyring-extension/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 79491 2012-11-06 04:11:27Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=signon-keyring-extension
+_pkgname=keyring
+pkgver=0.4
+pkgrel=1
+pkgdesc="GNOME keyring extension for signond"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/online-accounts-keyring-extension"
+license=('LGPL')
+depends=('signon' 'libgnome-keyring')
+source=(https://launchpad.net/online-accounts-keyring-extension/trunk/$pkgver/+download/$_pkgname-$pkgver.tar.bz2)
+md5sums=('4bbe5840cf0d5cfd142ba5ef262a38ed')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  # Do not install tests
+  echo 'INSTALLS =' >>tests/tests.pro
+
+  qmake PREFIX=/usr LIBDIR=/usr/lib
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  make INSTALL_ROOT="$pkgdir" install
+}
diff --git a/community/signon-plugin-oauth2/PKGBUILD b/community/signon-plugin-oauth2/PKGBUILD
new file mode 100644
index 000000000..af96bee39
--- /dev/null
+++ b/community/signon-plugin-oauth2/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 79492 2012-11-06 04:11:30Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=signon-plugin-oauth2
+_pkgname=signon-oauth2
+pkgver=0.11
+pkgrel=1
+pkgdesc="OAuth 2 plugin for signon"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/accounts-sso/"
+license=('LGPL')
+depends=('signon-ui' 'qjson')
+makedepends=('signon')
+source=(http://accounts-sso.googlecode.com/files/$_pkgname-$pkgver.tar.bz2)
+sha1sums=('e67a5997bf9666108776de6a95d98c11815e6790')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  # Do not install tests and example
+  echo 'INSTALLS =' >>tests/tests.pro
+  echo 'INSTALLS =' >>example/example.pro
+
+  qmake PREFIX=/usr LIBDIR=/usr/lib
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  make INSTALL_ROOT="$pkgdir" install
+}
diff --git a/community/signon-ui/PKGBUILD b/community/signon-ui/PKGBUILD
new file mode 100644
index 000000000..7aad2158f
--- /dev/null
+++ b/community/signon-ui/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 79493 2012-11-06 04:11:33Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=signon-ui
+pkgver=0.11
+pkgrel=1
+pkgdesc="UI component that responsible for handling the user interactions which can happen during the login process of an online account"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/online-accounts-signon-ui"
+license=('GPL')
+depends=('libaccounts-qt' 'qtwebkit' 'libproxy')
+makedepends=('signon' 'libnotify')
+source=(https://launchpad.net/online-accounts-signon-ui/12.10/$pkgver/+download/$pkgname-$pkgver.tar.bz2)
+md5sums=('b0359c61523f7b0df241bd3c21dbb2b2')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Do not install tests
+  echo 'INSTALLS =' >>tests/unit/unit.pro
+
+  qmake PREFIX=/usr LIBDIR=/usr/lib
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make INSTALL_ROOT="$pkgdir" install
+}
diff --git a/community/signon/PKGBUILD b/community/signon/PKGBUILD
new file mode 100644
index 000000000..108db80ee
--- /dev/null
+++ b/community/signon/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 79490 2012-11-06 04:11:24Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgbase=signon
+pkgname=('signon' 'signon-doc')
+pkgver=8.43
+pkgrel=2
+pkgdesc="Framework to provide credential storage and authentication service"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/accounts-sso/"
+license=('LGPL')
+depends=('qt' 'libproxy')
+makedepends=('doxygen' 'graphviz' 'ttf-dejavu')
+backup=(etc/signond.conf)
+source=(http://accounts-sso.googlecode.com/files/$pkgbase-$pkgver.tar.bz2
+        cryptsetup-optional.patch
+        use_keyring.patch)
+sha1sums=('8ffc7ded10f0de6324dcd96c9d3db9ab1e16725f'
+          '81897fc68aa8948223fcada08f8d426590325ebc'
+          'cfdd48b494ad267654ceba23f1b81bcb8f56b9a1')
+
+build() {
+  cd "$srcdir/$pkgbase-$pkgver"
+
+  # Build cryptsetup extension optionally
+  # http://code.google.com/p/accounts-sso/issues/detail?id=114
+  patch -Np1 -i "$srcdir/cryptsetup-optional.patch"
+
+  # Use gnome-keyring secrets storage if signon-keyring-extension is available
+  patch -Np1 -i "$srcdir/use_keyring.patch"
+
+  qmake PREFIX=/usr LIBDIR=/usr/lib
+  make
+}
+
+package_signon() {
+  cd "$srcdir/$pkgbase-$pkgver"
+
+  make INSTALL_ROOT="$pkgdir" install
+
+  # Split out documentation
+  mv "$pkgdir/usr/share/doc" "$srcdir"
+}
+
+package_signon-doc() {
+  pkgdesc="Developer documention of signon"
+  depends=()
+  options=('!emptydirs')
+  backup=()
+
+  mkdir -p "$pkgdir/usr/share"
+  mv "$srcdir/doc" "$pkgdir/usr/share"
+}
diff --git a/community/signon/cryptsetup-optional.patch b/community/signon/cryptsetup-optional.patch
new file mode 100644
index 000000000..d6293e598
--- /dev/null
+++ b/community/signon/cryptsetup-optional.patch
@@ -0,0 +1,12 @@
+diff -Naur signon-8.43.orig/src/extensions/extensions.pro signon-8.43/src/extensions/extensions.pro
+--- signon-8.43.orig/src/extensions/extensions.pro	2012-09-18 14:59:58.000000000 +0200
++++ signon-8.43/src/extensions/extensions.pro	2012-10-17 20:02:52.846790974 +0200
+@@ -1,7 +1,7 @@
+ TEMPLATE = subdirs
+ SUBDIRS =
+ 
+-system(pkg-config --exists libcryptsetup) {
++CONFIG(cryptsetup) {
+     SUBDIRS += cryptsetup
+ }
+ 
diff --git a/community/signon/use_keyring.patch b/community/signon/use_keyring.patch
new file mode 100644
index 000000000..55b593a26
--- /dev/null
+++ b/community/signon/use_keyring.patch
@@ -0,0 +1,12 @@
+=== modified file 'src/signond/signond.conf'
+--- old/src/signond/signond.conf	2012-07-25 14:57:50 +0000
++++ new/src/signond/signond.conf	2012-07-25 19:27:16 +0000
+@@ -17,6 +17,7 @@
+ FileSystemName=signonfs
+ Size=8
+ FileSystemType=ext2
++SecretsStorage=gnome-keyring
+ 
+ [ObjectTimeouts]
+ IdentityTimeout=300
+
diff --git a/community/tuxpaint-config/PKGBUILD b/community/tuxpaint-config/PKGBUILD
new file mode 100644
index 000000000..26c9ae9c8
--- /dev/null
+++ b/community/tuxpaint-config/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 79472 2012-11-06 00:37:14Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: royrocks <royrocks13@gmail.com>
+
+pkgname=tuxpaint-config
+pkgver=0.0.12
+pkgrel=2
+pkgdesc='Tux Paint configuration tool'
+arch=('x86_64' 'i686')
+url='http://www.tuxpaint.org'
+license='GPL'
+depends=('tuxpaint' 'fltk' 'libxft' 'libxext')
+source=("http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz")
+sha256sums=('9395a1c92e52c3420cabaa0c781b607e6832b5d9b6180902615f102216e1c8fd')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ make PREFIX=/usr
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ install -d -m755 $pkgdir/usr/bin/
+ install -d -m644 $pkgdir/opt/kde/share/icons/hicolor/48x48/apps/
+ install -d -m644 $pkgdir/opt/kde/share/icons/hicolor/32x32/apps/
+ install -d -m644 $pkgdir/opt/kde/share/icons/hicolor/16x16/apps/
+
+ make PREFIX=$pkgdir/usr DESTDIR=$pkgdir KDE_PREFIX=$pkgdir/opt/kde \
+   KDE_ICON_PREFIX=$pkgdir/opt/kde/share/icons install
+
+ install -D -m644 src/tuxpaint-config.desktop \
+   $pkgdir/usr/share/applications/tuxpaint-config.desktop
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD
index 5052a5c65..ff3329342 100644
--- a/core/perl/PKGBUILD
+++ b/core/perl/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 169818 2012-10-30 11:27:57Z bluewind $
+# $Id: PKGBUILD 170239 2012-11-05 22:39:18Z bluewind $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: kevin <kevin.archlinux.org>
 # Contributor: judd <jvinet.zeroflux.org>
 # Contributor: francois <francois.archlinux.org> 
 pkgname=perl
-pkgver=5.16.1
-pkgrel=2
+pkgver=5.16.2
+pkgrel=1
 pkgdesc="A highly capable, feature-rich programming language"
 arch=(i686 x86_64)
 license=('GPL' 'PerlArtistic')
@@ -17,14 +17,12 @@ changelog=ChangeLog
 source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 
 perlbin.sh
 perlbin.csh
-cve-2012-5195.patch
 provides.pl)
 install=perl.install
 options=('makeflags' '!purge')
-md5sums=('b87358e2c461a898cfd7c334e7dd8993'
+md5sums=('2818ab01672f005a4e552a713aa27b08'
          '5ed2542fdb9a60682f215bd33701e61a'
          '1f0cbbee783e8a6d32f01be5118e0d5e'
-         'ba61b3b393b763b4f0b9e2f06757815a'
          '999c3eea6464860704abbb055a0f0896')
 
 # workaround to let the integrity check find the correct provides array
@@ -35,8 +33,6 @@ fi
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  patch -i "$srcdir/cve-2012-5195.patch" -p1
-
   if [ "${CARCH}" = "x86_64" ]; then
     # for x86_64
     arch_opts="-Dcccdlflags='-fPIC'"
diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD
index 9f275feb5..3079ba025 100644
--- a/extra/cairo/PKGBUILD
+++ b/extra/cairo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170057 2012-10-31 10:24:44Z andyrtr $
+# $Id: PKGBUILD 170234 2012-11-05 16:24:33Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Brice Carpentier <brice@daknet.org>
 
 pkgname=cairo
-pkgver=1.12.6
-pkgrel=2
+pkgver=1.12.8
+pkgrel=1
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -15,23 +15,11 @@ 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
-        cairo-1.10.0-buggy_gradients.patch
-        git_fixes.diff)
-sha1sums=('a383c6cb4495e18848ea43e1031c294aa9417a43'
-          '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04'
-          '31b3179cda0afa2e2f037d6850fd8607383cb95a')
+source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz)
+sha1sums=('56a10bf3b804367c97734d655c23a9f652d5c297')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-#  patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch
-
-  # status: http://cgit.freedesktop.org/cairo/commit/?id=66625cb46c985321c46b79d2163a4d676d6700ba
-  # 2012-10-30 12:40:41 (GMT)
-  # xlib: Apply the image offsets to the destination rather the source
-  patch -Np1 -i ${srcdir}/git_fixes.diff
-
-#  autoreconf -vfi
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
@@ -45,7 +33,7 @@ build() {
 
 #check() {
 #  cd "$srcdir/$pkgname-$pkgver"
-#  make -k check || /bin/true # 161 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped
+#  make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped
 #}
 
 package() {
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index a8aa3b571..96f7ac061 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 166907 2012-09-21 14:30:04Z andyrtr $
+# $Id: PKGBUILD 170236 2012-11-05 18:50:40Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
@@ -6,7 +6,7 @@
 
 pkgname=dovecot
 pkgver=2.1.10
-pkgrel=1
+pkgrel=2
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64')
 url="http://dovecot.org/"
@@ -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/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD
index b27ed16b5..725d2e28c 100644
--- a/extra/glibmm/PKGBUILD
+++ b/extra/glibmm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169883 2012-10-30 22:25:57Z 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.34.0
+pkgver=2.34.1
 pkgrel=1
 arch=('i686' 'x86_64')
 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=('ae5b8221fdace1771d2ae401b52afdca8b64ee12bd0f956fb4e92d482ddc1cbf')
+sha256sums=('b425a52c7e178aeaaaffd02c5497bfd68d0cb8be56cef3620558a80dd5d692c4')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD
index a70272fc4..3ff1544fd 100644
--- a/extra/gtksourceview3/PKGBUILD
+++ b/extra/gtksourceview3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169939 2012-10-30 22:45:58Z heftig $
+# $Id: PKGBUILD 170209 2012-11-05 11:49:55Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtksourceview3
 _pkgbasename=gtksourceview
-pkgver=3.6.0
+pkgver=3.6.1
 pkgrel=1
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
 arch=('i686' 'x86_64')
@@ -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=('7d268618fbe8c2960300a305d38255294c9f497fcbc0e53a1da1bf9bda0d1c7a')
+sha256sums=('a9d31df02acc6e9a9547b5ebaee19d1dc4c87b216eb561ee19da69bd1bb1bd0d')
 
 build() {
   cd "$_pkgbasename-$pkgver"
diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD
index 74632215d..ace0b2486 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)
 license=('LGPL')
diff --git a/extra/libxml++/PKGBUILD b/extra/libxml++/PKGBUILD
index 198544cbb..8e7c83e0d 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=('libxml++' 'libxml++-docs')
-pkgver=2.34.2
+pkgver=2.36.0
 pkgrel=1
 arch=('i686' 'x86_64')
 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/tdb/PKGBUILD b/extra/tdb/PKGBUILD
index 1f19f4400..bc04c1c9c 100644
--- a/extra/tdb/PKGBUILD
+++ b/extra/tdb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 169553 2012-10-23 13:47:25Z 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.10
-pkgrel=1
+pkgrel=2
 pkgdesc="A Trivial Database similar to GDBM but allows simultaneous commits"
 arch=(i686 x86_64)
 license=('GPL3')
@@ -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=('cc28048309df19782b04359282e9f98b')
diff --git a/extra/testdisk/PKGBUILD b/extra/testdisk/PKGBUILD
index 46b88cecf..5070e266c 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')
 url="http://www.cgsecurity.org/index.html?testdisk.html"
diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD
index f7c4a4b59..eb747321b 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 170243 2012-11-05 22:45:59Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfdesktop
 pkgver=4.10.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A desktop manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -17,9 +17,11 @@ replaces=('xfce4-menueditor')
 options=('!libtool')
 install=xfdesktop.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
-        add-backgrounds-xfce-to-search-path.patch)
+        add-backgrounds-xfce-to-search-path.patch
+        avoid-duplicating-volume-icons.patch)
 sha256sums=('897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b'
-            'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5')
+            'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5'
+            'f2ad30fe8fed9e2f5a65c214f03b65353527d285a4ea0ec22a1feac5c452446b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -28,6 +30,11 @@ build() {
   # https://bugzilla.xfce.org/show_bug.cgi?id=8799
   patch -Np1 -i "$srcdir/add-backgrounds-xfce-to-search-path.patch"
 
+  # Workaround for GVFS 1.14.0 which emits volume-added signals for
+  # pre-existing volumes.
+  # https://bugzilla.xfce.org/show_bug.cgi?id=9464
+  patch -Np1 -i "$srcdir/avoid-duplicating-volume-icons.patch"
+
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
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
+