Mon Apr 28 03:48:05 UTC 2014

21 files changed, 162 insertions, 640 deletions

diff --git a/community/haskell-syb/PKGBUILD b/community/haskell-syb/PKGBUILD
deleted file mode 100644
index 2aff699a1..000000000
--- a/community/haskell-syb/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Rémy Oudompheng <remy@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=syb
-pkgname=haskell-syb
-pkgver=0.4.1
-pkgrel=1
-pkgdesc="A library for client-side HTTP"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-options=('staticlibs')
-md5sums=('28df3b70cef652fa6c04e6353c580a7a')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname}
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-
diff --git a/community/haskell-syb/haskell-syb.install b/community/haskell-syb/haskell-syb.install
deleted file mode 100644
index 080055165..000000000
--- a/community/haskell-syb/haskell-syb.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-syb
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/libgdamm/PKGBUILD b/community/libgdamm/PKGBUILD
index 537768215..f70a72fa2 100644
--- a/community/libgdamm/PKGBUILD
+++ b/community/libgdamm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99839 2013-10-31 02:01:06Z allan $
+# $Id: PKGBUILD 110239 2014-04-27 16:47:58Z heftig $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Jan de Groot <jan@jgc.homeip.net>
 
 pkgbase=libgdamm
 pkgname=(libgdamm libgdamm-docs)
-pkgver=4.99.7
+pkgver=4.99.8
 pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('libgda' 'libsigc++' 'glibmm' 'glibmm-docs')
@@ -13,7 +13,7 @@ url="http://www.gtkmm.org/"
 license=('LGPL')
 options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgbase/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5b864ddc7d5555c6c2d7fb5c6a3856c690911d12837148511a7b9f85100ca06c')
+sha256sums=('bdd355351a60ec7d21730b403389a9f51ef1a91bd58582a09cdc0eab639f8b9b')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/community/libgexiv2/PKGBUILD b/community/libgexiv2/PKGBUILD
index d90f65601..08aea8acc 100644
--- a/community/libgexiv2/PKGBUILD
+++ b/community/libgexiv2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 109607 2014-04-16 17:10:16Z arodseth $
+# $Id: PKGBUILD 110240 2014-04-27 16:48:38Z heftig $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libgexiv2
-pkgver=0.10.0
+pkgver=0.10.1
 pkgrel=1
 pkgdesc='GObject-based wrapper around the Exiv2 library'
 url='https://wiki.gnome.org/Projects/gexiv2'
@@ -11,8 +11,8 @@ arch=('x86_64' 'i686')
 license=('GPL2')
 depends=('exiv2' 'glib2')
 makedepends=('python-gobject' 'python2-gobject')
-source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname/lib/}/${pkgver%.0}/${pkgname/lib/}-$pkgver.tar.xz")
-sha256sums=('9c8c97b36a0d4ca6656488b88908e4c94efb0dfc1b0e3e0850e38b90a9a30031')
+source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname/lib/}/${pkgver%.*}/${pkgname/lib/}-$pkgver.tar.xz")
+sha256sums=('7675752a59c2f091560be1f39514ef492ec705b9fdea5f52281672e6b3eba2c7')
 
 build() {
   cd "${pkgname/lib/}-$pkgver"
diff --git a/community/openstack-guest-agents-unix/PKGBUILD b/community/openstack-guest-agents-unix/PKGBUILD
new file mode 100644
index 000000000..d73614752
--- /dev/null
+++ b/community/openstack-guest-agents-unix/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+pkgname=openstack-guest-agents-unix
+pkgver=1.39.0
+epoch=1
+pkgrel=2
+pkgdesc="This is the Unix Guest Agent for Openstack"
+arch=('i686' 'x86_64')
+url="https://github.com/rackerlabs/openstack-guest-agents-unix"
+license=('GPL')
+depends=('python2-simplejson' 'python2-crypto' 'patchelf' 'python2-xenstore')
+makedepends=('git')
+source=("$pkgname::git://github.com/rackerlabs/${pkgname%-git}#tag=v$pkgver")
+md5sums=('SKIP')
+
+prepare(){
+  cd "$srcdir/$pkgname"
+  find . -name \*.py -exec sed -i '1s/python$/&2/' {} +
+  git cherry-pick -n 387d4e77695598a07be9e4593c5b236b81a1aeea
+  git cherry-pick -n f9a365e7a9543d407ca9d75164688faa0ff53528
+}
+
+build() {
+  cd "$srcdir/$pkgname"
+  sh autogen.sh
+  ./configure CC=gcc --sbindir=/usr/bin
+  make
+}
+
+package() {
+  make -C "$srcdir/$pkgname" bintar
+  tar -C "$pkgdir" -xf $srcdir/$pkgname/nova-agent-Linux-$CARCH-${pkgver}.tar.gz
+  install -Dm644 $pkgname/scripts/systemd/nova-agent.service \
+    $pkgdir/usr/lib/systemd/system/nova-agent.service
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/patchelf/PKGBUILD b/community/patchelf/PKGBUILD
new file mode 100644
index 000000000..f4d3db980
--- /dev/null
+++ b/community/patchelf/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 110205 2014-04-26 22:57:34Z dwallace $
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: xduugu
+
+pkgname=patchelf
+pkgver=0.8
+pkgrel=1
+pkgdesc="A small utility to modify the dynamic linker and RPATH of ELF executables"
+arch=('i686' 'x86_64')
+url="http://nixos.org/patchelf.html"
+license=('GPL3')
+depends=('gcc-libs')
+source=("http://releases.nixos.org/patchelf/patchelf-0.8/patchelf-0.8.tar.gz")
+md5sums=('407b229e6a681ffb0e2cdd5915cb2d01')
+sha256sums=('14af06a2da688d577d64ff8dac065bb8903bbffbe01d30c62df7af9bf4ce72fe')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/python2-xenstore/PKGBUILD b/community/python2-xenstore/PKGBUILD
new file mode 100644
index 000000000..dcf03ca55
--- /dev/null
+++ b/community/python2-xenstore/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 110210 2014-04-26 23:41:32Z dwallace $
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+pkgname=python2-xenstore
+pkgver=0.0.2
+pkgrel=4
+pkgdesc="Python XenStore Module"
+arch=('x86_64' 'i686')
+url="https://pypi.python.org/pypi/pyxenstore"
+license=('GPL')
+depends=('python2' 'xenstore')
+makedepends=('python2-distribute')
+replaces=('python2-pyxenstore')
+provides=('python2-pyxenstore')
+source=("https://pypi.python.org/packages/source/p/py${pkgname#*-}/py${pkgname#*-}-$pkgver.tar.gz")
+md5sums=('4da2524ed0ec9439afc5c9a46ac21c6c')
+
+build() {
+  cd "$srcdir/py${pkgname#*-}-$pkgver"
+  python2 setup.py build
+}
+
+package() {
+  cd "$srcdir/py${pkgname#*-}-$pkgver"
+  python2 setup.py install --root="$pkgdir/"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/ratpoison/PKGBUILD b/community/ratpoison/PKGBUILD
index 77de302ee..5aa8c001c 100644
--- a/community/ratpoison/PKGBUILD
+++ b/community/ratpoison/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 105159 2014-02-02 00:22:45Z kkeen $
+# $Id: PKGBUILD 110250 2014-04-27 19:40:50Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: juergen <juergen@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=ratpoison
-pkgver=1.4.6
-pkgrel=2
+pkgver=1.4.7
+pkgrel=1
 pkgdesc="A simple keystroke-driven window manager"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('libxinerama' 'readline' 'bash' 'perl' 'libxtst' 'libxft' 'texinfo')
 url="http://www.nongnu.org/ratpoison/"
 install="${pkgname}.install"
-source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.xz"
         "${pkgname}.desktop")
-md5sums=('5fbaab737cf7fcc8e5eb2d619aaa0eab'
+md5sums=('c26b798f4d50942e5807985adfb5b39f'
          '29c3cb9be59758e39d8471391231a74a')
 
 build() {
@@ -46,7 +46,4 @@ package() {
 
   install -Dm644 "${srcdir}/${pkgname}.desktop" \
     "${pkgdir}/etc/X11/sessions/${pkgname}.desktop"
-
-  install -Dm644 "${pkgdir}/usr/share/ratpoison/ratpoison.el" \
-    "${pkgdir}/usr/share/emacs/site-lisp/ratpoison.el"
 }
diff --git a/community/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD
index 731fe586f..b25f68b16 100644
--- a/community/the_silver_searcher/PKGBUILD
+++ b/community/the_silver_searcher/PKGBUILD
@@ -1,33 +1,34 @@
-# $Id: PKGBUILD 107984 2014-03-20 12:49:08Z arodseth $
+# $Id: PKGBUILD 110246 2014-04-27 19:31:42Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jeff Horelick <jdhore1@gmail.com>
 # Contributor: skydrome <skydrome@i2pmail.org>
 
 pkgname=the_silver_searcher
-pkgver=0.21.0
+pkgver=0.21.1
 pkgrel=1
 pkgdesc='Code searching tool similar to Ack, but faster'
 url='https://github.com/ggreer/the_silver_searcher'
 license=('Apache')
 depends=('pcre' 'zlib' 'xz')
+makedepends=('git')
 arch=('x86_64' 'i686')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/ggreer/$pkgname/archive/$pkgver.tar.gz")
-sha256sums=('ee921373e2bb1a25c913b0098ab946d137749b166d340a8ae6d88a554940a793')
+source=("git://github.com/ggreer/$pkgname.git#commit=ac1e7e4b0cdd37e64f9af7256b8a4568c5546ec2")
+md5sums=('SKIP')
 
 prepare() {
-  cd "$pkgname-$pkgver"
+  cd "$pkgname"
   
   sed -i 's:configure:configure --prefix=/usr:' build.sh
 }
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd "$pkgname"
 
   ./build.sh
 }
 
 package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+  make -C "$pkgname" DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD
index ffa388d7c..46b164773 100644
--- a/extra/gnome-terminal/PKGBUILD
+++ b/extra/gnome-terminal/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 210486 2014-04-14 20:06:51Z jgc $
+# $Id: PKGBUILD 211830 2014-04-27 16:59:53Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-terminal
-pkgver=3.12.0
+pkgver=3.12.1
 pkgrel=1
 pkgdesc="The GNOME Terminal Emulator"
 arch=(i686 x86_64)
 license=(GPL)
 depends=(vte3 gsettings-desktop-schemas dconf)
 makedepends=(gnome-doc-utils intltool itstool docbook-xsl desktop-file-utils gconf
-             libnautilus-extension appdata-tools)
+             libnautilus-extension appdata-tools gnome-shell)
 optdepends=('gconf: settings migration when upgrading from older version')
 options=('!emptydirs')
 url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-terminal.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ce690ed798a3e940f2f3a173a7946181e48d899214048d3282c671535c87cea7')
+sha256sums=('7b68714c63ea6bb6eeeeed574b61f1328a7f7dc34a294d0911e9129d888d56c6')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/mtdev/PKGBUILD b/extra/mtdev/PKGBUILD
index ef5b96abc..6d756ec61 100644
--- a/extra/mtdev/PKGBUILD
+++ b/extra/mtdev/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198330 2013-10-30 14:12:39Z allan $
+# $Id: PKGBUILD 211808 2014-04-27 10:39:21Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 
 pkgname=mtdev
-pkgver=1.1.4
+pkgver=1.1.5
 pkgrel=1
 pkgdesc="A stand-alone library which transforms all variants of kernel MT events to the slotted type B protocol"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="http://bitmath.org/code/mtdev/"
 license=('custom:MIT')
 depends=('glibc')
 source=("$url$pkgname-$pkgver.tar.bz2")
-md5sums=('73a915d6075b31db4f08ab8c6d314695')
+md5sums=('52c9610b6002f71d1642dc1a1cca5ec1')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD
index 1db75fefd..1318c0284 100644
--- a/extra/network-manager-applet/PKGBUILD
+++ b/extra/network-manager-applet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 211582 2014-04-21 10:21:28Z jgc $
+# $Id: PKGBUILD 211828 2014-04-27 16:58:19Z 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.8.9
+pkgver=0.9.8.10
 pkgrel=1
 pkgdesc="GNOME frontends to NetWorkmanager"
 arch=(i686 x86_64)
@@ -18,7 +18,7 @@ makedepends=(intltool gobject-introspection modemmanager)
 options=('!emptydirs')
 install=network-manager-applet.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz)
-sha256sums=('b93d7bf49456b7932e233f562bf9531a3f3ff10946c942126159b92b3dda25c3')
+sha256sums=('46fee9a1e667d1826e6a94bb6bd2e6bdbde535fc995e534542f5f7e8b8dae0cb')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index e13de6afd..68950f5a5 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 211581 2014-04-21 10:21:27Z jgc $
+# $Id: PKGBUILD 211827 2014-04-27 16:57:26Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -8,7 +8,7 @@
 
 pkgname=networkmanager
 _pkgname=NetworkManager
-pkgver=0.9.8.9
+pkgver=0.9.8.10
 pkgrel=1
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64')
@@ -26,7 +26,7 @@ install=networkmanager.install
 #source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
         NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('65fca0d4f5cbd3d75843ef3062bbdbee5175ad08ae38da6569dbd8422bf8c27a'
+sha256sums=('064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
             '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
 
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index 9c658ee23..56a86041f 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -1,12 +1,13 @@
-# $Id: PKGBUILD 208835 2014-03-27 14:43:22Z fyan $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# $Id: PKGBUILD 211814 2014-04-27 16:13:15Z fyan $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=python
 pkgver=3.4.0
-pkgrel=2
+pkgrel=3
 _pybasever=3.4
 pkgdesc="Next generation of the python high-level scripting language"
 arch=('i686' 'x86_64')
@@ -24,9 +25,11 @@ options=('!makeflags')
 provides=('python3')
 replaces=('python3')
 source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz
-        python3.4-test_sqlite.patch::http://hg.python.org/cpython/raw-rev/4d626a9df062)
+        python3.4-test_sqlite.patch::http://hg.python.org/cpython/raw-rev/4d626a9df062
+        issue21207.patch::http://hg.python.org/cpython/raw-rev/a66524ce9551)
 sha1sums=('f54d7cf6af5dbd9bddbe31cf4772f39711381dbe'
-          'b13a0b728d8e1fe1d81dea501b064cb1032f183b')
+          'b13a0b728d8e1fe1d81dea501b064cb1032f183b'
+          '67486ae413698d6bd3c32de10a9a1e885d0097b8')
 
 prepare() {
   cd "${srcdir}/Python-${pkgver}"
@@ -37,6 +40,10 @@ prepare() {
   # http://bugs.python.org/issue20901
   patch -p1 -i "$srcdir/python3.4-test_sqlite.patch"
 
+  # http://bugs.python.org/issue21207 FS#40108
+  sed -i "62,74d" "$srcdir/issue21207.patch" # Remove conflicting NEWS part
+  patch -p1 -i "$srcdir/issue21207.patch"
+
   # Ensure that we are using the system copy of various libraries (expat, zlib, libffi, and libmpdec),
   # rather than copies shipped in the tarball
   rm -r Modules/expat
diff --git a/extra/sushi/PKGBUILD b/extra/sushi/PKGBUILD
index 63917fdad..91e1c321c 100644
--- a/extra/sushi/PKGBUILD
+++ b/extra/sushi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 210531 2014-04-14 20:07:29Z jgc $
+# $Id: PKGBUILD 211820 2014-04-27 16:42:59Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=sushi
-pkgver=3.11.90
+pkgver=3.12.0
 pkgrel=1
 pkgdesc="A quick previewer for Nautilus"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz5' 'webkitgtk' 'gtksou
 install=sushi.install
 makedepends=('intltool' 'gobject-introspection')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b461720e51c79a60db04f8f7f56d3fd1cbb69b03f8df122a9fc9f29717a269fd')
+sha256sums=('78594a858371b671671205e7b2518e7eb82ed8c2540b62f45a657aaabdf1a9ff')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD
index 1a407c28c..e79a6cdfe 100644
--- a/extra/vte3/PKGBUILD
+++ b/extra/vte3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 210543 2014-04-14 20:07:39Z jgc $
+# $Id: PKGBUILD 211829 2014-04-27 16:58:59Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=vte3
 pkgname=(vte3 vte-common)
-pkgver=0.36.0
+pkgver=0.36.1
 pkgrel=1
 pkgdesc="Virtual Terminal Emulator widget for use with GTK3"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ options=('!emptydirs')
 makedepends=('intltool' 'gobject-introspection' 'gtk3')
 url="http://www.gnome.org"
 source=(http://download.gnome.org/sources/vte/${pkgver::4}/vte-$pkgver.tar.xz)
-sha256sums=('faa036e5a89fd658f5c62e16a57c493d2107d840a0e918b9f8acb547471a85f7')
+sha256sums=('2b1d30d12a9c0074f80938f4bcb0d510cf3f105b28939b0d5aaddf95222bc3dd')
 
 build() {
   cd "vte-$pkgver"
diff --git a/extra/xfce4-power-manager/PKGBUILD b/extra/xfce4-power-manager/PKGBUILD
index 265b6f284..ff9ecca15 100644
--- a/extra/xfce4-power-manager/PKGBUILD
+++ b/extra/xfce4-power-manager/PKGBUILD
@@ -1,48 +1,31 @@
-# $Id: PKGBUILD 198563 2013-10-30 15:37:43Z allan $
+# $Id: PKGBUILD 211804 2014-04-27 09:35:08Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
 
 pkgname=xfce4-power-manager
-pkgver=1.2.0
-pkgrel=6
+pkgver=1.2.0.198.g76d1f4f
+pkgrel=1
 pkgdesc="Power manager for Xfce desktop"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
 depends=('xfce4-panel' 'upower' 'udisks' 'libnotify' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool')
+makedepends=('intltool' 'xfce4-dev-tools' 'git')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/apps/$pkgname/1.2/$pkgname-$pkgver.tar.bz2
-        xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch
-        xfce4-power-manager-1.2.0-change-brightness-level-from-glong-to-gint32.patch
-        xfce4-power-manager-1.2.0-sync-en-gb-translation.patch)
-sha256sums=('d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9'
-            '4166f61234abfcd385d43b1e7f7ab5b73711bcb7335ef0f6b217ac799dc9266b'
-            '689751b6369fd8ade6337713283f5ef3dd40715bbbe69e4a8723c9cbe56e7465'
-            'c8e1dfafd685c2abf1fcc2b3682f5b1eb2e7f1d4fa557f11a7478437eef9a933')
+source=(git://git.xfce.org/xfce/xfce4-power-manager)
+sha256sums=('SKIP')
 
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
+pkgver() {
+  cd "$srcdir/$pkgname"
 
-  # Use logind interfaces for suspend and hibernate
-  # https://bugzilla.xfce.org/show_bug.cgi?id=9963
-  patch -Np1 -i "$srcdir/xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch"
-
-  # Fix brightness level handling
-  # https://bugzilla.xfce.org/show_bug.cgi?id=8840
-  patch -Np1 -i "$srcdir/xfce4-power-manager-1.2.0-change-brightness-level-from-glong-to-gint32.patch"
-
-  # Fix en_GB translation
-  # https://bugs.archlinux.org/task/30055
-  patch -d po -Np0 -i \
-    "$srcdir/xfce4-power-manager-1.2.0-sync-en-gb-translation.patch"
+  git describe --long | sed 's/^xfce4-power-manager-//;s/-/./g'
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname"
 
-  ./configure \
+  ./autogen.sh \
     --prefix=/usr \
     --sysconfdir=/etc \
     --sbindir=/usr/bin \
@@ -56,7 +39,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname"
   make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-change-brightness-level-from-glong-to-gint32.patch b/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-change-brightness-level-from-glong-to-gint32.patch
deleted file mode 100644
index 5cb4fdb0b..000000000
--- a/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-change-brightness-level-from-glong-to-gint32.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-From 05d12e12596512f7a31d3cdb4845a69dc2d4c611 Mon Sep 17 00:00:00 2001
-From: Martin Matuska <martin@matuska.org>
-Date: Tue, 23 Jul 2013 09:27:41 +0000
-Subject: Change brightness level from glong to gint32
-
-The "Backlight" RandR property is a 32-bit integer. This means that the int32 (gint32) type should be used to represent brightness levels. The attached patch does nothing else than changing the brightness level representation from glong to gint32. This fixes the screen auto-dimming issue and brightness panel plugin issue.
----
-diff --git a/common/xfpm-brightness.c b/common/xfpm-brightness.c
-index aa1ef33..f1524cb 100644
---- a/common/xfpm-brightness.c
-+++ b/common/xfpm-brightness.c
-@@ -92,11 +92,11 @@ out:
- }
- 
- static gboolean
--xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, long *current)
-+xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, gint32 *current)
- {
-     unsigned long nitems;
-     unsigned long bytes_after;
--    long *prop;
-+    gint32 *prop;
-     Atom actual_type;
-     int actual_format;
-     gboolean ret = FALSE;
-@@ -124,7 +124,7 @@ xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, l
- }
- 
- static gboolean
--xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, long level)
-+xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, gint32 level)
- {
-     gboolean ret = TRUE;
- 
-@@ -137,7 +137,7 @@ xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, l
-     
-     if ( gdk_error_trap_pop () ) 
-     {
--	    g_warning ("failed to XRRChangeOutputProperty for brightness %li", level);
-+	    g_warning ("failed to XRRChangeOutputProperty for brightness %d", level);
- 	    ret = FALSE;
-     }
-     
-@@ -225,11 +225,11 @@ xfpm_brightness_setup_xrandr (XfpmBrightness *brightness)
- }
- 
- static gboolean
--xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
-+xfpm_brightness_xrand_up (XfpmBrightness *brightness, gint32 *new_level)
- {
--    long hw_level;
-+    gint32 hw_level;
-     gboolean ret = FALSE;
--    long set_level;
-+    gint32 set_level;
-     
-     ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level);
-     
-@@ -250,14 +250,14 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
-     
-     if ( !ret )
-     {
--	g_warning ("xfpm_brightness_xrand_up failed for %li", set_level);
-+	g_warning ("xfpm_brightness_xrand_up failed for %d", set_level);
- 	return FALSE;
-     }
- 	
-     /* Nothing changed in the hardware*/
-     if ( *new_level == hw_level )
-     {
--	g_warning ("xfpm_brightness_xrand_up did not change the hw level to %li", set_level);
-+	g_warning ("xfpm_brightness_xrand_up did not change the hw level to %d", set_level);
- 	return FALSE;
-     }
-     
-@@ -265,11 +265,11 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
- }
- 
- static gboolean
--xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level)
-+xfpm_brightness_xrand_down (XfpmBrightness *brightness, gint32 *new_level)
- {
--    long hw_level;
-+    gint32 hw_level;
-     gboolean ret;
--    long set_level;
-+    gint32 set_level;
-     
-     ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level);
-     
-@@ -290,14 +290,14 @@ xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level)
-     
-     if ( !ret )
-     {
--	g_warning ("xfpm_brightness_xrand_down failed for %li", set_level);
-+	g_warning ("xfpm_brightness_xrand_down failed for %d", set_level);
- 	return FALSE;
-     }
-     
-     /* Nothing changed in the hardware*/
-     if ( *new_level == hw_level )
-     {
--	g_warning ("xfpm_brightness_xrand_down did not change the hw level to %li", set_level);
-+	g_warning ("xfpm_brightness_xrand_down did not change the hw level to %d", set_level);
- 	return FALSE;
-     }
-     
-@@ -361,7 +361,7 @@ xfpm_brightness_setup_helper (XfpmBrightness *brightness)
- }
- 
- static gboolean
--xfpm_brightness_helper_get_level (XfpmBrightness *brg, glong *level)
-+xfpm_brightness_helper_get_level (XfpmBrightness *brg, gint32 *level)
- {
-     int ret;
- 
-@@ -406,11 +406,11 @@ out:
- }
- 
- static gboolean
--xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level)
-+xfpm_brightness_helper_up (XfpmBrightness *brightness, gint32 *new_level)
- {
--    glong hw_level;
-+    gint32 hw_level;
-     gboolean ret = FALSE;
--    gint set_level;
-+    gint32 set_level;
-     
-     ret = xfpm_brightness_helper_get_level (brightness, &hw_level);
-     
-@@ -446,11 +446,11 @@ xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level)
- }
- 
- static gboolean
--xfpm_brightness_helper_down (XfpmBrightness *brightness, glong *new_level)
-+xfpm_brightness_helper_down (XfpmBrightness *brightness, gint32 *new_level)
- {
--    glong hw_level;
-+    gint32 hw_level;
-     gboolean ret;
--    gint set_level;
-+    gint32 set_level;
-     
-     ret = xfpm_brightness_helper_get_level (brightness, &hw_level);
-     
-@@ -572,7 +572,7 @@ xfpm_brightness_setup (XfpmBrightness *brightness)
-     return FALSE;
- }
- 
--gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level)
-+gboolean xfpm_brightness_up (XfpmBrightness *brightness, gint32 *new_level)
- {
-     gboolean ret = FALSE;
-     
-@@ -589,7 +589,7 @@ gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level)
-     return ret;
- }
- 
--gboolean xfpm_brightness_down (XfpmBrightness *brightness, glong *new_level)
-+gboolean xfpm_brightness_down (XfpmBrightness *brightness, gint32 *new_level)
- {
-     gboolean ret = FALSE;
-     
-@@ -618,7 +618,7 @@ gint xfpm_brightness_get_max_level (XfpmBrightness *brightness)
-     return brightness->priv->max_level;
- }
- 
--gboolean xfpm_brightness_get_level	(XfpmBrightness *brightness, glong *level)
-+gboolean xfpm_brightness_get_level	(XfpmBrightness *brightness, gint32 *level)
- {
-     gboolean ret = FALSE;
-     
-@@ -632,7 +632,7 @@ gboolean xfpm_brightness_get_level	(XfpmBrightness *brightness, glong *level)
-     return ret;
- }
- 
--gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, glong level)
-+gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, gint32 level)
- {
-     gboolean ret = FALSE;
-     
-diff --git a/common/xfpm-brightness.h b/common/xfpm-brightness.h
-index 0c4e3ed..26b3dbe 100644
---- a/common/xfpm-brightness.h
-+++ b/common/xfpm-brightness.h
-@@ -51,20 +51,20 @@ XfpmBrightness       	       *xfpm_brightness_new             (void);
- gboolean			xfpm_brightness_setup 		(XfpmBrightness *brightness);
- 
- gboolean			xfpm_brightness_up		(XfpmBrightness *brightness,
--								 glong *new_level);
-+								 gint32 *new_level);
- 
- gboolean			xfpm_brightness_down		(XfpmBrightness *brightness,
--								 glong *new_level);
-+								 gint32 *new_level);
- 
- gboolean			xfpm_brightness_has_hw 		(XfpmBrightness *brightness);
- 
- gint 				xfpm_brightness_get_max_level   (XfpmBrightness *brightness);
- 
- gboolean			xfpm_brightness_get_level	(XfpmBrightness *brightness,
--								 glong *level);
-+								 gint32 *level);
- 
- gboolean			xfpm_brightness_set_level	(XfpmBrightness *brightness,
--								 glong level);
-+								 gint32 level);
- 
- gboolean			xfpm_brightness_dim_down	(XfpmBrightness *brightness);
- 
-diff --git a/panel-plugins/brightness/brightness-button.c b/panel-plugins/brightness/brightness-button.c
-index 6e60c29..bd466c9 100644
---- a/panel-plugins/brightness/brightness-button.c
-+++ b/panel-plugins/brightness/brightness-button.c
-@@ -186,7 +186,7 @@ static gboolean
- brightness_button_popup_win (GtkWidget *widget, GdkEvent *ev, guint32 ev_time)
- {
-     gint x, y;
--    glong current_level = 0;
-+    gint32 current_level = 0;
-     GdkDisplay *display;
-     GdkScreen *screen;
-     BrightnessButton *button;
-@@ -342,7 +342,7 @@ plus_clicked (GtkWidget *widget, BrightnessButton *button)
- static void
- range_value_changed (GtkWidget *widget, BrightnessButton *button)
- {
--    glong range_level, hw_level;
-+    gint32 range_level, hw_level;
-     
-     range_level = (gint) gtk_range_get_value (GTK_RANGE (button->priv->range));
-     
-@@ -428,8 +428,8 @@ brightness_button_create_popup (BrightnessButton *button)
- static void
- brightness_button_up (BrightnessButton *button)
- {
--    glong level;
--    glong max_level;
-+    gint32 level;
-+    gint32 max_level;
-     
-     xfpm_brightness_get_level (button->priv->brightness, &level);
-     max_level = xfpm_brightness_get_max_level (button->priv->brightness);
-@@ -443,7 +443,7 @@ brightness_button_up (BrightnessButton *button)
- static void
- brightness_button_down (BrightnessButton *button)
- {
--    glong level;
-+    gint32 level;
-     xfpm_brightness_get_level (button->priv->brightness, &level);
-     
-     if ( level != 0 )
-diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c
-index baeeb43..45c990f 100644
---- a/src/xfpm-backlight.c
-+++ b/src/xfpm-backlight.c
-@@ -63,8 +63,8 @@ struct XfpmBacklightPrivate
-     gboolean	    has_hw;
-     gboolean	    on_battery;
-     
--    glong            last_level;
--    glong 	    max_level;
-+    gint32          last_level;
-+    gint32 	    max_level;
-     
-     gboolean        dimmed;
-     gboolean	    block;
-@@ -79,7 +79,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
-     
-     if (xfpm_power_get_mode (backlight->priv->power) == XFPM_POWER_MODE_NORMAL )
-     {
--	glong dim_level;
-+	gint32 dim_level;
- 	
- 	g_object_get (G_OBJECT (backlight->priv->conf),
- 		      backlight->priv->on_battery ? BRIGHTNESS_LEVEL_ON_BATTERY : BRIGHTNESS_LEVEL_ON_AC, &dim_level,
-@@ -101,7 +101,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
- 	 **/
- 	if (backlight->priv->last_level > dim_level)
- 	{
--	    XFPM_DEBUG ("Current brightness level before dimming : %li, new %li", backlight->priv->last_level, dim_level);
-+	    XFPM_DEBUG ("Current brightness level before dimming : %d, new %d", backlight->priv->last_level, dim_level);
- 	    backlight->priv->dimmed = xfpm_brightness_set_level (backlight->priv->brightness, dim_level);
- 	}
-     }
-@@ -182,7 +182,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight)
-     {
- 	if ( !backlight->priv->block)
- 	{
--	    XFPM_DEBUG ("Alarm reset, setting level to %li", backlight->priv->last_level);
-+	    XFPM_DEBUG ("Alarm reset, setting level to %d", backlight->priv->last_level);
- 	    xfpm_brightness_set_level (backlight->priv->brightness, backlight->priv->last_level);
- 	}
- 	backlight->priv->dimmed = FALSE;
-@@ -192,7 +192,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight)
- static void
- xfpm_backlight_button_pressed_cb (XfpmButton *button, XfpmButtonKey type, XfpmBacklight *backlight)
- {
--    glong level;
-+    gint32 level;
-     gboolean ret = TRUE;
-     
-     gboolean enable_brightness, show_popup;
---
-cgit v0.9.2
diff --git a/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch b/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch
deleted file mode 100644
index 431489588..000000000
--- a/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From 244d0f09561eace29cbef819c2deb55b13701e25 Mon Sep 17 00:00:00 2001
-From: Mikhail Efremov <sem@altlinux.org>
-Date: Mon, 8 Apr 2013 21:04:30 +0400
-Subject: [PATCH] Add systemd-logind support for suspend/hibernate.
-
----
- configure.ac.in         | 20 +++++++++++++++++
- src/xfpm-power-common.h |  8 +++++++
- src/xfpm-power.c        | 57 ++++++++++++++++++++++++++++++++++++++++++++++++-
- 3 files changed, 84 insertions(+), 1 deletion(-)
-
-diff --git a/src/xfpm-power-common.h b/src/xfpm-power-common.h
-index 1040aed..11eaedc 100644
---- a/src/xfpm-power-common.h
-+++ b/src/xfpm-power-common.h
-@@ -33,9 +33,17 @@
- #define UPOWER_PATH_WAKEUPS   "/org/freedesktop/UPower/Wakeups"
- #define UPOWER_IFACE_WAKEUPS  "org.freedesktop.UPower.Wakeups"
- 
-+#ifdef WITH_SLEEP_MANAGER_UPOWER
- #define POLKIT_AUTH_SUSPEND   "org.freedesktop.upower.suspend"
- #define	POLKIT_AUTH_HIBERNATE "org.freedesktop.upower.hibernate"
-+#else
-+#define LOGIND_NAME 	      "org.freedesktop.login1"
-+#define LOGIND_PATH 	      "/org/freedesktop/login1"
-+#define LOGIND_IFACE 	      "org.freedesktop.login1.Manager"
- 
-+#define POLKIT_AUTH_SUSPEND   "org.freedesktop.login1.suspend"
-+#define	POLKIT_AUTH_HIBERNATE "org.freedesktop.login1.hibernate"
-+#endif
- 
- GPtrArray 	*xfpm_power_enumerate_devices		(DBusGProxy *proxy);
- 
-diff --git a/src/xfpm-power.c b/src/xfpm-power.c
-index 796bef8..4a91e33 100644
---- a/src/xfpm-power.c
-+++ b/src/xfpm-power.c
-@@ -72,7 +72,10 @@ struct XfpmPowerPrivate
-     
-     DBusGProxy      *proxy;
-     DBusGProxy      *proxy_prop;
--    
-+#ifndef WITH_SLEEP_MANAGER_UPOWER
-+    DBusGProxy      *proxy_logind;
-+#endif
-+
-     GHashTable      *hash;
-     
-     XfpmConsoleKit  *console;
-@@ -153,6 +156,7 @@ xfpm_power_check_polkit_auth (XfpmPower *power)
- }
- #endif
- 
-+#ifdef WITH_SLEEP_MANAGER_UPOWER
- static void
- xfpm_power_check_pm (XfpmPower *power, GHashTable *props)
- {
-@@ -186,6 +190,32 @@ xfpm_power_check_pm (XfpmPower *power, GHashTable *props)
- 	power->priv->can_hibernate = ret;
-     }
- }
-+#else
-+static gboolean
-+xfpm_power_can_sleep_method (XfpmPower *power, const char *method)
-+{
-+    GError *error = NULL;
-+    char *retstr = NULL;
-+    gboolean ret = FALSE;
-+
-+    if (!dbus_g_proxy_call (power->priv->proxy_logind, method, &error,
-+            G_TYPE_INVALID,
-+            G_TYPE_STRING, &retstr,
-+            G_TYPE_INVALID))
-+    {
-+        g_warning ("Unable to check %s method: %s", method, error->message);
-+        g_error_free (error);
-+
-+        return FALSE;
-+    }
-+
-+	if (retstr && !strcmp (retstr, "yes"))
-+			ret = TRUE;
-+	g_free (retstr);
-+
-+    return ret;
-+}
-+#endif
- 
- static void
- xfpm_power_check_power (XfpmPower *power, GHashTable *props)
-@@ -276,7 +306,12 @@ xfpm_power_get_properties (XfpmPower *power)
-     
-     props = xfpm_power_get_interface_properties (power->priv->proxy_prop, UPOWER_IFACE);
-     
-+#ifdef WITH_SLEEP_MANAGER_UPOWER
-     xfpm_power_check_pm (power, props);
-+#else
-+    power->priv->can_suspend = xfpm_power_can_sleep_method (power, "CanSuspend");
-+    power->priv->can_hibernate = xfpm_power_can_sleep_method (power, "CanHibernate");
-+#endif
-     xfpm_power_check_lid (power, props);
-     xfpm_power_check_power (power, props);
- 
-@@ -347,9 +382,16 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
- 	xfpm_lock_screen ();
-     }
-     
-+#ifdef WITH_SLEEP_MANAGER_UPOWER
-     dbus_g_proxy_call (power->priv->proxy, sleep_time, &error,
- 		       G_TYPE_INVALID,
- 		       G_TYPE_INVALID);
-+#else
-+    dbus_g_proxy_call (power->priv->proxy_logind, sleep_time, &error,
-+		       G_TYPE_BOOLEAN, TRUE,
-+		       G_TYPE_INVALID,
-+		       G_TYPE_INVALID);
-+#endif
-     
-     if ( error )
-     {
-@@ -1360,12 +1402,20 @@ xfpm_power_init (XfpmPower *power)
- 							 UPOWER_NAME,
- 							 UPOWER_PATH,
- 							 DBUS_INTERFACE_PROPERTIES);
-+
-     if (power->priv->proxy_prop == NULL) 
-     {
- 	g_critical ("Unable to create proxy for %s", UPOWER_NAME);
- 	goto out;
-     }
-     
-+#ifndef WITH_SLEEP_MANAGER_UPOWER
-+    power->priv->proxy_logind = dbus_g_proxy_new_for_name (power->priv->bus,
-+						    LOGIND_NAME,
-+						    LOGIND_PATH,
-+						    LOGIND_IFACE);
-+#endif
-+
-     xfpm_power_get_power_devices (power);
-     xfpm_power_get_properties (power);
- #ifdef ENABLE_POLKIT
-@@ -1467,6 +1517,11 @@ xfpm_power_finalize (GObject *object)
-     if ( power->priv->proxy_prop )
- 	g_object_unref (power->priv->proxy_prop);
- 
-+#ifndef WITH_SLEEP_MANAGER_UPOWER
-+    if ( power->priv->proxy_logind )
-+	g_object_unref (power->priv->proxy_logind);
-+#endif
-+
-     g_hash_table_destroy (power->priv->hash);
- 
- #ifdef ENABLE_POLKIT
--- 
-1.8.1.5
-
diff --git a/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-sync-en-gb-translation.patch b/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-sync-en-gb-translation.patch
deleted file mode 100644
index ca7a3dc31..000000000
--- a/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-sync-en-gb-translation.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- en_GB.po.orig	2012-05-31 20:18:09.000000000 +0300
-+++ en_GB.po	2012-05-31 20:25:09.000000000 +0300
-@@ -345,9 +345,8 @@ msgid ""
- "An application is currently disabling the automatic sleep. Doing this action "
- "now may damage the working state of this application."
- msgstr ""
--"An application is currently disabling the automatic sleep, doing this action "
--"now may damage the working state of this application, are you sure you want "
--"to hibernate the system?"
-+"An application is currently disabling the automatic sleep. Doing this action "
-+"now may damage the working state of this application."
- 
- #: ../src/xfpm-power.c:331
- msgid "Are you sure you want to hibernate the system?"
-@@ -548,8 +547,7 @@ msgid ""
- "%s (%i%%)\n"
- "%s until is fully charged."
- msgstr ""
--"%s\n"
--"Your %s is charging (%i%%)\n"
-+"%s (%i%%)\n"
- "%s until is fully charged."
- 
- #: ../src/xfpm-battery.c:232 ../src/xfpm-battery.c:268
-@@ -568,8 +566,7 @@ msgid ""
- "%s (%i%%)\n"
- "Estimated time left is %s."
- msgstr ""
--"%s\n"
--"Your %s is discharging (%i%%)\n"
-+"%s (%i%%)\n"
- "Estimated time left is %s."
- 
- #: ../src/xfpm-battery.c:250 ../src/xfpm-battery.c:271
diff --git a/extra/zenity/PKGBUILD b/extra/zenity/PKGBUILD
index 6827a00ae..375d1f373 100644
--- a/extra/zenity/PKGBUILD
+++ b/extra/zenity/PKGBUILD
@@ -1,31 +1,26 @@
-# $Id: PKGBUILD 201378 2013-12-10 10:09:05Z heftig $
+# $Id: PKGBUILD 211826 2014-04-27 16:56:12Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=zenity
-pkgver=3.10.2
+pkgver=3.12.1
 pkgrel=1
 pkgdesc="Display graphical dialog boxes from shell scripts"
 arch=(i686 x86_64)
 license=(LGPL)
 depends=(gtk3 libnotify)
-makedepends=(intltool gtk-doc itstool docbook-xsl git gnome-common yelp-tools)
+makedepends=(intltool gtk-doc itstool docbook-xsl yelp-tools)
 url="http://www.gnome.org"
-source=(git://git.gnome.org/zenity#tag=ZENITY_${pkgver//./_})
-sha256sums=('SKIP')
-
-prepare() {
-  cd $pkgname
-  git cherry-pick -n 80bc8ce643979fec201c4ebd5cd6405b6310357f
-}
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('a59705cdd1ea5318fdae3075c1cedcbead479230e9bead204391566d973dae11')
 
 build() {
-  cd $pkgname
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var
   make
 }
 
 package() {
-  cd $pkgname
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
 }