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

Conflicts: community/apitrace/PKGBUILD community/mksh/PKGBUILD community/net6/PKGBUILD community/xapian-core/PKGBUILD extra/garcon/PKGBUILD extra/mesa/PKGBUILD extra/scim/PKGBUILD extra/virtuoso/PKGBUILD extra/xfce4-appfinder/PKGBUILD extra/xfce4-panel/PKGBUILD extra/xfwm4/PKGBUILD
author: Michał Masłowski <mtjm@mtjm.eu> 2013-05-06 11:13:51 +0200
committer: Michał Masłowski <mtjm@mtjm.eu> 2013-05-06 11:13:51 +0200
commit: a86ff663185661ee304bb1f6d00d982102dd706d (patch)
tree: 06520d9024b40745b94f02d0d3419386e6496863 /extra
parent: ce32dcab8e4baa2afe51fd3b7a858a840372b0a5 (diff)
parent: ffb692bf2696e7ebedd19bcd55ba253e21cb732d (diff)
21 files changed, 88 insertions, 803 deletions
diff --git a/extra/garcon/PKGBUILD b/extra/garcon/PKGBUILD
index fbf467c1e..3369aa8b0 100644
--- a/extra/garcon/PKGBUILD
+++ b/extra/garcon/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 157817 2012-04-30 04:19:28Z foutrelis $
+# $Id: PKGBUILD 184284 2013-05-05 17:44:23Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>
 
 pkgname=garcon
-pkgver=0.2.0
+pkgver=0.2.1
 pkgrel=1
 pkgdesc="Implementation of the freedesktop.org menu specification"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://wiki.xfce.org/dev/garcon"
+url="http://www.xfce.org/"
 license=('LGPL')
 groups=('xfce4')
 depends=('glib2' 'libxfce4util')
@@ -15,7 +15,7 @@ makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools')
 replaces=('libxfce4menu')
 options=('!libtool' '!makeflags')
 source=(http://archive.xfce.org/src/xfce/garcon/0.2/garcon-$pkgver.tar.bz2)
-sha256sums=('02dea3edb9c0039eca4748e964c61b0e1cc10f2d7f9ce0c837287ac5fa9ef76c')
+sha256sums=('48b644b8b2ffe597974e2526ca1a5d2d7da6a09c2d434f008dec80e9152701f7')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD
index 894a2f870..876edb059 100644
--- a/extra/kdelibs3/PKGBUILD
+++ b/extra/kdelibs3/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 183291 2013-04-20 16:41:26Z heftig $
+# $Id: PKGBUILD 184257 2013-05-05 07:01:52Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kdelibs3
 pkgver=3.5.10
-pkgrel=17
+pkgrel=18
 pkgdesc='KDE3 Core Libraries'
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
 depends=('libxslt' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
          'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
-makedepends=('cups' 'hspell')
+makedepends=('cups' 'hspell' 'optipng')
 optdepends=('hspell: for Hebrew spell-checking support')
 options=('libtool' '!makeflags')
 install=kdelibs3.install
@@ -43,6 +43,11 @@ prepare() {
   patch -p1 -i "${srcdir}"/openssl.patch
   patch -p0 -i "$srcdir"/kdelibs3-missing-include.patch
   patch -p1 -i "${srcdir}"/kdelibs3-cups16.patch
+  pushd pics/crystalsvg
+  optipng -quiet -force -fix cr{16,22,32,48,64,128}-app-kttsd.png cr22-app-password.png \
+    cr16-filesys-folder_green{,_open}.png cr32-action-today.png
+  popd
+  optipng -quiet -force -fix interfaces/kimproxy/library/icons/cr48-action-presence_offline.png
 }
 
 build() {
diff --git a/extra/libxfce4util/PKGBUILD b/extra/libxfce4util/PKGBUILD
index 7d100380e..b8a6dee86 100644
--- a/extra/libxfce4util/PKGBUILD
+++ b/extra/libxfce4util/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157821 2012-04-30 04:19:32Z foutrelis $
+# $Id: PKGBUILD 184282 2013-05-05 17:43:38Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=libxfce4util
-pkgver=4.10.0
+pkgver=4.10.1
 pkgrel=1
 pkgdesc="Basic utility non-GUI functions for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('glib2')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc')
 options=('!libtool')
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
-sha256sums=('0979fee12880bb5f011ab38d6c7cc9afe5fd68eb96ccda895cb56dbc16e7608e')
+sha256sums=('e82cd1ad715c02a385b3cf6646cb89aa3c4724446dac1d7e424971df12f6cfbb')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 77e9ff5d1..83648b26f 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 180351 2013-03-20 16:48:21Z andyrtr $
+# $Id: PKGBUILD 184295 2013-05-05 17:57:33Z bpiotrowski $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('mesa' 'mesa-libgl')
-pkgver=9.1.1
+pkgver=9.1.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
-             'wayland')
+             'wayland' 'systemd')
 if [ "$CARCH" != "mips64el" ]; then
   pkgname+=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
   makedepends+=('libvdpau' 'llvm-amdgpu-snapshot')
@@ -17,11 +17,9 @@ url="http://mesa3d.sourceforge.net"
 license=('custom')
 options=('!libtool')
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-	    #ftp://ftp.freedesktop.org/pub/mesa/9.1/MesaLib-9.1-rc2.tar.bz2 # for RC testing
-	    git-fixes.patch
+	#ftp://ftp.freedesktop.org/pub/mesa/9.1/MesaLib-9.1-rc2.tar.bz2 # for RC testing
         LICENSE)
-md5sums=('6ea2bdc3b7ecfb4257b39814b4182580'
-         'c3e45fe7287bbf8f620c209a872330dc'
+md5sums=('df2aab86ff4a510ce5b0d074caa0a59f'
          '5c65a0fe315dd347e09b1f2826a1df5a')
 
 build() {
@@ -36,7 +34,7 @@ build() {
     # pick 2 commits from master to
     # fix a nouveau crash: http://cgit.freedesktop.org/mesa/mesa/commit/?id=17f1cb1d99e66227d1e05925ef937643f5c1089a
     # and intel kwin slowness http://cgit.freedesktop.org/mesa/mesa/commit/?id=e062a4187d8ea518a39c913ae7562cf1d8ac3205
-    patch -Np1 -i ${srcdir}/git-fixes.patch
+    #patch -Np1 -i ${srcdir}/git-fixes.patch
 
     autoreconf -vfi # our automake is far too new for their build system :)
 
diff --git a/extra/mesa/git-fixes.patch b/extra/mesa/git-fixes.patch
deleted file mode 100644
index 84efe610e..000000000
--- a/extra/mesa/git-fixes.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 17f1cb1d99e66227d1e05925ef937643f5c1089a Mon Sep 17 00:00:00 2001
-From: Jan de Groot <jan@jgc.homeip.net>
-Date: Thu, 07 Mar 2013 18:48:13 +0000
-Subject: dri/nouveau: fix crash in nouveau_flush
-
-https://bugs.freedesktop.org/show_bug.cgi?id=61947
-
-Note: this is a candidate for the stable branches
----
-diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.c b/src/mesa/drivers/dri/nouveau/nouveau_driver.c
-index f56b3b2..6c119d5 100644
---- a/src/mesa/drivers/dri/nouveau/nouveau_driver.c
-+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.c
-@@ -69,7 +69,8 @@ nouveau_flush(struct gl_context *ctx)
- 		__DRIdri2LoaderExtension *dri2 = screen->dri2.loader;
- 		__DRIdrawable *drawable = nctx->dri_context->driDrawablePriv;
- 
--		dri2->flushFrontBuffer(drawable, drawable->loaderPrivate);
-+		if (drawable && drawable->loaderPrivate)
-+			dri2->flushFrontBuffer(drawable, drawable->loaderPrivate);
- 	}
- }
- 
---
-cgit v0.9.0.2-2-gbebe
-From e062a4187d8ea518a39c913ae7562cf1d8ac3205 Mon Sep 17 00:00:00 2001
-From: Tapani Pälli <tapani.palli@intel.com>
-Date: Mon, 28 Jan 2013 06:53:56 +0000
-Subject: intel: Fix regression in intel_create_image_from_name stride handling
-
-Strangely, the DRIimage interface we have passes the pitch in pixels
-instead of bytes, which anholt missed in the change to using bytes for
-region pitch.
-
-Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
-Reviewed-by: Eric Anholt <eric@anholt.net>
----
-diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
-index defcd73..d223a0b 100644
---- a/src/mesa/drivers/dri/intel/intel_screen.c
-+++ b/src/mesa/drivers/dri/intel/intel_screen.c
-@@ -377,7 +377,7 @@ intel_create_image_from_name(__DRIscreen *screen,
-        cpp = _mesa_get_format_bytes(image->format);
-     image->region = intel_region_alloc_for_handle(intelScreen,
- 						  cpp, width, height,
--						  pitch, name, "image");
-+						  pitch * cpp, name, "image");
-     if (image->region == NULL) {
-        free(image);
-        return NULL;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD
index 571f37fdc..d232dfb91 100644
--- a/extra/scim/PKGBUILD
+++ b/extra/scim/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 162185 2012-06-23 07:47:16Z bisson $
+# $Id: PKGBUILD 184249 2013-05-05 00:06:28Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Gan Lu <rhythm.gan@gmail.com>
 
 pkgname=scim
 pkgver=1.4.14
-pkgrel=1
+pkgrel=2
 pkgdesc='Input method user interface and development platform'
 url='http://www.scim-im.org/projects/scim'
 license=('LGPL')
 options=('!libtool')
 arch=('i686' 'x86_64' 'mips64el')
-makedepends=('intltool')
 depends=('libltdl' 'gtk2')
+makedepends=('intltool' 'optipng')
 backup=('etc/scim/config' 'etc/scim/global')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('73391be371dd7ef9f9af8b3a211e2bedec0cf71b')
@@ -21,7 +21,6 @@ install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -32,6 +31,6 @@ build() {
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	make DESTDIR="${pkgdir}" install
+	find "${pkgdir}" -name *.png -exec optipng {} \; # libpng-1.6 has higher standards
 }
diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD
index de4a198f9..0a67af680 100644
--- a/extra/thunar/PKGBUILD
+++ b/extra/thunar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173900 2012-12-27 13:11:31Z foutrelis $
+# $Id: PKGBUILD 184280 2013-05-05 17:42:44Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
 pkgname=thunar
-pkgver=1.6.2
+pkgver=1.6.3
 pkgrel=1
 pkgdesc="Modern file manager for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
@@ -23,7 +23,7 @@ optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems
 options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2)
-sha256sums=('7dbd172ae396e7a2533f47dc1ff703a9ea1a61af3edfdc6f4877b9b9331abd85')
+sha256sums=('9a2706f6881ac29cda9f0b0325d179153bc09e37bcbafcab9823c1c1ec89579d')
 
 build() {
   cd "$srcdir/Thunar-$pkgver"
diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD
index 4e66ccc20..3636f2cc4 100644
--- a/extra/virtuoso/PKGBUILD
+++ b/extra/virtuoso/PKGBUILD
@@ -1,21 +1,31 @@
-# $Id: PKGBUILD 164689 2012-08-02 16:10:25Z andrea $
+# $Id: PKGBUILD 184267 2013-05-05 08:27:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
 pkgbase=virtuoso
 pkgname=('virtuoso' 'virtuoso-base')
 pkgver=6.1.6
-pkgrel=1.1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://virtuoso.openlinksw.com/wiki/main/Main/'
 license=('GPL')
-makedepends=('libldap' 'bison' 'flex' 'gperf' 'net-tools' 'libxml2')
+makedepends=('libldap' 'bison' 'flex' 'gperf' 'net-tools' 'libxml2' 'optipng')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz")
-md5sums=('3991149c570f3738c3e819ce603e487f')
+source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz"
+        'automake113.patch')
+md5sums=('3991149c570f3738c3e819ce603e487f'
+         '570043e1b5f4acd9826732f002941c12')
+
+prepare() {
+  cd ${pkgbase}-opensource-${pkgver}
+
+  optipng -quiet -force -fix appsrc/ODS-Wiki/http/images/opts_16.png
+
+  patch -p1 -i "${srcdir}"/automake113.patch
+}
 
 build() {
-  cd ${srcdir}/${pkgbase}-opensource-${pkgver}
+  cd ${pkgbase}-opensource-${pkgver}
 
   ./configure --with-layout=debian \
     --program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/' \
@@ -28,7 +38,7 @@ package_virtuoso-base() {
   depends=('libldap')
 
   # install server
-  cd ${srcdir}/${pkgbase}-opensource-${pkgver}/binsrc/virtuoso
+  cd ${pkgbase}-opensource-${pkgver}/binsrc/virtuoso
   make DESTDIR=${pkgdir} install
 
   # install driver
@@ -46,7 +56,7 @@ package_virtuoso() {
   pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality'
   depends=('virtuoso-base' 'libxml2')
 
-  cd ${srcdir}/${pkgbase}-opensource-${pkgver}
+  cd ${pkgbase}-opensource-${pkgver}
   make DESTDIR=${pkgdir} install
 
   # remove conflicts with virtuoso-base
diff --git a/extra/virtuoso/automake113.patch b/extra/virtuoso/automake113.patch
new file mode 100644
index 000000000..5f84b49bc
--- /dev/null
+++ b/extra/virtuoso/automake113.patch
@@ -0,0 +1,12 @@
++++ a/configure.in
+--- b/configure.in
+@@ -36,7 +36,7 @@ 
+ AC_INIT([Virtuoso Open Source Edition],
+ AC_CONFIG_SRCDIR([libsrc/Dk.h])
+ AC_CONFIG_AUX_DIR([binsrc/config])
+ AC_CONFIG_MACRO_DIR([binsrc/config])
+-AM_CONFIG_HEADER([libsrc/Dk/config.h])
++AC_CONFIG_HEADER([libsrc/Dk/config.h])
+ 
+ dnl
+ dnl You may need to change the next macro for older versions of automake: 
diff --git a/extra/xfce4-appfinder/PKGBUILD b/extra/xfce4-appfinder/PKGBUILD
index 428a497b8..997245e6a 100644
--- a/extra/xfce4-appfinder/PKGBUILD
+++ b/extra/xfce4-appfinder/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 157837 2012-04-30 04:20:00Z foutrelis $
+# $Id: PKGBUILD 184286 2013-05-05 17:45:12Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-appfinder
-pkgver=4.10.0
+pkgver=4.10.1
 pkgrel=1
 pkgdesc="An application finder for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.xfce.org/projects/xfce4-appfinder"
+url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
 depends=('libxfce4ui' 'garcon' 'hicolor-icon-theme')
@@ -16,7 +16,7 @@ makedepends=('intltool')
 replaces=('xfce-utils')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
-sha256sums=('042aae7e366428a6a92b6353b3f2727d64823076a7752b8e0a15f1f8f3645439')
+sha256sums=('65ee74ffa76334d273e4c9ae501ec7f81f7de028813849f7d1441cbf7788eb77')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xfce4-panel/PKGBUILD b/extra/xfce4-panel/PKGBUILD
index aecec58ed..a4abe0b2a 100644
--- a/extra/xfce4-panel/PKGBUILD
+++ b/extra/xfce4-panel/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 157875 2012-04-30 04:20:56Z foutrelis $
+# $Id: PKGBUILD 184288 2013-05-05 17:46:17Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-panel
-pkgver=4.10.0
-pkgrel=1.1
+pkgver=4.10.1
+pkgrel=1
 pkgdesc="Panel for the Xfce desktop environment"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
-depends=('exo' 'garcon' 'libxfce4ui' 'libwnck' 'libsm' 'hicolor-icon-theme'
+depends=('exo' 'garcon' 'libxfce4ui' 'libwnck' 'hicolor-icon-theme'
          'desktop-file-utils')
 makedepends=('intltool' 'gtk-doc')
 options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
-sha256sums=('3321f998af2bbd14ba68654a8881774f6ea2ec4f1a3544598e7f47d3ed0009b9')
+sha256sums=('573052ed1b65e247415f92df120c8a78f9e4152c2636d38c923f82e32b8475d6')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD
index 2f55ba71c..b12f31c7f 100644
--- a/extra/xfce4-session/PKGBUILD
+++ b/extra/xfce4-session/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183871 2013-04-29 05:43:04Z foutrelis $
+# $Id: PKGBUILD 184294 2013-05-05 17:50:37Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-session
-pkgver=4.10.0
-pkgrel=7
+pkgver=4.10.1
+pkgrel=1
 pkgdesc="A session manager for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
@@ -20,29 +20,8 @@ optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enab
 replaces=('xfce-utils')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
-        xfce4-session-4.10.0-add-systemd-support.patch
-        xfce4-session-4.10.0-use-the-async-spawn-function-of-glib.patch
-        xfce4-session-4.10.0-store-the-watch-function-id.patch)
-sha256sums=('bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce'
-            'ffae61c48a4bd0cb51d422cb93f2de9567abaf29085370c455ef349b6a10234b'
-            '18ed175dd4242e39161a093045c6c6aebf9a408350652bde1454fe07411cdf3c'
-            '5eb5319a38f58a2d518d0e3d24b6d01c487871711fb36b55cb03a10a4591cdcf')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # https://bugzilla.xfce.org/show_bug.cgi?id=8729
-  patch -Np1 -i "$srcdir/xfce4-session-4.10.0-add-systemd-support.patch"
-
-  # https://bugzilla.xfce.org/show_bug.cgi?id=9709
-  patch -Np1 -i "$srcdir/xfce4-session-4.10.0-use-the-async-spawn-function-of-glib.patch"
-  patch -Np1 -i "$srcdir/xfce4-session-4.10.0-store-the-watch-function-id.patch"
-
-  sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
-
-  xdt-autogen
-}
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch b/extra/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch
deleted file mode 100644
index 7ab637b26..000000000
--- a/extra/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-diff --git a/xfce4-session/xfsm-systemd.c b/xfce4-session/xfsm-systemd.c
-index 4076586..90e7873 100644
---- /dev/null
-+++ b/xfce4-session/xfsm-systemd.c
-@@ -0,0 +1,123 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2012 Christian Hesse
-+ *
-+ * Licensed under the GNU General Public License Version 2
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+#include <config.h>
-+
-+#include <gio/gio.h>
-+#include <polkit/polkit.h>
-+
-+#include "xfsm-systemd.h"
-+
-+#define SYSTEMD_DBUS_NAME       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE  "org.freedesktop.login1.Manager"
-+#define SYSTEMD_REBOOT_ACTION   "org.freedesktop.login1.reboot"
-+#define SYSTEMD_SHUTDOWN_ACTION "org.freedesktop.login1.power-off"
-+
-+struct _SystemdProxy {
-+        PolkitAuthority *authority;
-+        PolkitSubject *subject;
-+};
-+
-+SystemdProxy *
-+systemd_proxy_new (void)
-+{
-+        SystemdProxy *proxy;
-+
-+        proxy = g_new0 (SystemdProxy, 1);
-+
-+        proxy->authority = polkit_authority_get_sync (NULL, NULL);
-+        proxy->subject = polkit_unix_process_new (getpid());
-+
-+        return proxy;
-+}
-+
-+void
-+systemd_proxy_free (SystemdProxy *proxy)
-+{
-+        g_object_unref (proxy->authority);
-+        g_object_unref (proxy->subject);
-+
-+        g_free (proxy);
-+}
-+
-+gboolean systemd_proxy_can_method (SystemdProxy *proxy, gboolean *can_method, const gchar *method, GError **error)
-+{
-+        PolkitAuthorizationResult *res;
-+        GError *local_error = NULL;
-+
-+        *can_method = FALSE;
-+        res = polkit_authority_check_authorization_sync (proxy->authority,
-+                                                         proxy->subject,
-+                                                         method,
-+                                                         NULL,
-+                                                         POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE,
-+                                                         NULL,
-+                                                         &local_error);
-+        if (res == NULL) {
-+                g_propagate_error (error, local_error);
-+                return FALSE;
-+        }
-+
-+        *can_method = polkit_authorization_result_get_is_authorized (res) ||
-+                       polkit_authorization_result_get_is_challenge (res);
-+
-+        g_object_unref (res);
-+
-+        return TRUE;
-+}
-+
-+gboolean systemd_proxy_can_restart (SystemdProxy *proxy, gboolean *can_restart, GError **error)
-+{
-+	return systemd_proxy_can_method(proxy, can_restart, SYSTEMD_REBOOT_ACTION, error);
-+}
-+
-+gboolean systemd_proxy_can_shutdown (SystemdProxy *proxy, gboolean *can_shutdown, GError **error)
-+{
-+	return systemd_proxy_can_method(proxy, can_shutdown, SYSTEMD_SHUTDOWN_ACTION, error);
-+}
-+
-+gboolean systemd_proxy_method (SystemdProxy *proxy, const gchar *method, GError **error)
-+{
-+        GDBusConnection *bus;
-+
-+        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
-+        g_dbus_connection_call_sync (bus,
-+                                     SYSTEMD_DBUS_NAME,
-+                                     SYSTEMD_DBUS_PATH,
-+                                     SYSTEMD_DBUS_INTERFACE,
-+                                     method,
-+                                     g_variant_new ("(b)", TRUE),
-+                                     NULL, 0, G_MAXINT, NULL, NULL);
-+        g_object_unref (bus);
-+
-+        return TRUE;
-+}
-+
-+gboolean systemd_proxy_restart (SystemdProxy *proxy, GError **error)
-+{
-+	return systemd_proxy_method(proxy, "Reboot", error);
-+}
-+
-+gboolean systemd_proxy_shutdown (SystemdProxy *proxy, GError **error)
-+{
-+	return systemd_proxy_method(proxy, "PowerOff", error);
-+}
-diff --git a/xfce4-session/xfsm-systemd.h b/xfce4-session/xfsm-systemd.h
-index 3fa8317..2c4d868 100644
---- /dev/null
-+++ b/xfce4-session/xfsm-systemd.h
-@@ -0,0 +1,42 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2012 Christian Hesse
-+ *
-+ * Licensed under the GNU General Public License Version 2
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+#ifndef __SYSTEMD_PROXY_H__
-+#define __SYSTEMD_PROXY_H__
-+
-+#include <glib.h>
-+
-+G_BEGIN_DECLS
-+
-+typedef struct _SystemdProxy SystemdProxy;
-+
-+SystemdProxy *systemd_proxy_new (void);
-+void          systemd_proxy_free (SystemdProxy *proxy);
-+gboolean      systemd_proxy_can_method (SystemdProxy *proxy, gboolean *can_method, const char *method, GError **error);
-+gboolean      systemd_proxy_can_restart (SystemdProxy *proxy, gboolean *can_restart, GError **error);
-+gboolean      systemd_proxy_can_shutdown (SystemdProxy *proxy, gboolean *can_shutdown, GError **error);
-+gboolean      systemd_proxy_method (SystemdProxy *proxy, const char *method, GError **error);
-+gboolean      systemd_proxy_restart (SystemdProxy *proxy, GError **error);
-+gboolean      systemd_proxy_shutdown (SystemdProxy *proxy, GError **error);
-+
-+G_END_DECLS
-+
-+#endif  /* __SYSTEMD_PROXY_H__ */
-
-commit 518a28c23f110617aad36e64c02cdab6a36adf37
-Author: Christian Hesse <eworm@leda.eworm.de>
-Date:   Fri Jul 27 14:21:14 2012 +0200
-
-    ...
-
-diff --git a/configure.in.in b/configure.in.in
-index 9aa4f8f..aa0b8bb 100644
---- a/configure.in
-+++ b/configure.in
-@@ -96,6 +96,33 @@ XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.1.0])
- XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84])
- XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0])
- 
-+dnl systemd integration
-+AC_ARG_ENABLE([systemd],
-+              AS_HELP_STRING([--enable-systemd], [Use systemd]),
-+              [with_systemd=$enableval],
-+              [with_systemd=auto])
-+PKG_CHECK_MODULES(SYSTEMD,
-+                  [libsystemd-login polkit-gobject-1],
-+                  [have_systemd=yes], [have_systemd=no])
-+AC_MSG_CHECKING([whether to use systemd])
-+if test x$with_systemd = xauto ; then
-+        if test x$have_systemd = xno ; then
-+                with_systemd=no
-+        else
-+                with_systemd=yes
-+        fi
-+fi
-+AC_MSG_RESULT($with_systemd)
-+if test x$with_systemd = xyes; then
-+        if test x$have_systemd = xno; then
-+                AC_MSG_ERROR([Systemd support explicitly required, but systemd not found])
-+        fi
-+        AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
-+fi
-+AC_SUBST(SYSTEMD_CFLAGS)
-+AC_SUBST(SYSTEMD_LIBS)
-+AM_CONDITIONAL(WITH_SYSTEMD, [test "$with_systemd" = "yes"], [Using systemd])
-+
- dnl Check for debugging support
- XDT_FEATURE_DEBUG([xfsm_debug_default])
- 
-
-commit f1279eba9452f027a2037be77388767437161d51
-Author: Christian Hesse <eworm@leda.eworm.de>
-Date:   Fri Jul 27 14:18:16 2012 +0200
-
-    ...
-
-diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
-index 1429abd..077cdf3 100644
---- a/xfce4-session/xfsm-shutdown.c
-+++ b/xfce4-session/xfsm-shutdown.c
-@@ -96,7 +96,11 @@ struct _XfsmShutdown
- {
-   GObject __parent__;
- 
-+#ifdef HAVE_SYSTEMD
-+  SystemdProxy   *systemd_proxy;
-+#else
-   XfsmConsolekit *consolekit;
-+#endif
-   XfsmUPower     *upower;
- 
-   /* kiosk settings */
-@@ -134,7 +138,11 @@ xfsm_shutdown_init (XfsmShutdown *shutdown)
- {
-   XfceKiosk *kiosk;
- 
-+#ifdef HAVE_SYSTEMD
-+  shutdown->systemd_proxy = systemd_proxy_new ();
-+#else
-   shutdown->consolekit = xfsm_consolekit_get ();
-+#endif
-   shutdown->upower = xfsm_upower_get ();
-   shutdown->helper_state = SUDO_NOT_INITIAZED;
-   shutdown->helper_require_password = FALSE;
-@@ -153,7 +161,11 @@ xfsm_shutdown_finalize (GObject *object)
- {
-   XfsmShutdown *shutdown = XFSM_SHUTDOWN (object);
- 
-+#ifdef HAVE_SYSTEMD
-+  systemd_proxy_free (shutdown->systemd_proxy);
-+#else
-   g_object_unref (G_OBJECT (shutdown->consolekit));
-+#endif
-   g_object_unref (G_OBJECT (shutdown->upower));
- 
-   /* close down helper */
-@@ -644,7 +656,11 @@ xfsm_shutdown_try_restart (XfsmShutdown  *shutdown,
-   if (shutdown->helper_state == SUDO_AVAILABLE)
-     return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_RESTART, error);
-   else
-+#ifdef HAVE_SYSTEMD
-+    return systemd_proxy_restart (shutdown->systemd_proxy, error);
-+#else
-     return xfsm_consolekit_try_restart (shutdown->consolekit, error);
-+#endif
- }
- 
- 
-@@ -661,7 +677,11 @@ xfsm_shutdown_try_shutdown (XfsmShutdown  *shutdown,
-   if (shutdown->helper_state == SUDO_AVAILABLE)
-     return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_SHUTDOWN, error);
-   else
-+#ifdef HAVE_SYSTEMD
-+    return systemd_proxy_shutdown (shutdown->systemd_proxy, error);
-+#else
-     return xfsm_consolekit_try_shutdown (shutdown->consolekit, error);
-+#endif
- }
- 
- 
-@@ -701,7 +721,11 @@ xfsm_shutdown_can_restart (XfsmShutdown  *shutdown,
-       return TRUE;
-     }
- 
-+#ifdef HAVE_SYSTEMD
-+  if (systemd_proxy_can_restart (shutdown->systemd_proxy, can_restart, error))
-+#else
-   if (xfsm_consolekit_can_restart (shutdown->consolekit, can_restart, error))
-+#endif
-     return TRUE;
- 
-   if (xfsm_shutdown_sudo_init (shutdown, error))
-@@ -728,7 +752,11 @@ xfsm_shutdown_can_shutdown (XfsmShutdown  *shutdown,
-       return TRUE;
-     }
- 
-+#ifdef HAVE_SYSTEMD
-+  if (systemd_proxy_can_shutdown (shutdown->systemd_proxy, can_shutdown, error))
-+#else
-   if (xfsm_consolekit_can_shutdown (shutdown->consolekit, can_shutdown, error))
-+#endif
-     return TRUE;
- 
-   if (xfsm_shutdown_sudo_init (shutdown, error))
-
-commit 5aea3fb853683246a537a67423cf5b32076b8dfb
-Author: Christian Hesse <eworm@leda.eworm.de>
-Date:   Fri Jul 27 14:03:27 2012 +0200
-
-    ...
-
-diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
-index c015154..7e3b311 100644
---- a/xfce4-session/Makefile.am
-+++ b/xfce4-session/Makefile.am
-@@ -38,8 +38,6 @@ xfce4_session_SOURCES =							\
- 	xfsm-compat-gnome.h						\
- 	xfsm-compat-kde.c						\
- 	xfsm-compat-kde.h						\
--	xfsm-consolekit.c						\
--	xfsm-consolekit.h						\
- 	xfsm-dns.c							\
- 	xfsm-dns.h							\
- 	xfsm-error.c							\
-@@ -65,6 +63,16 @@ xfce4_session_SOURCES =							\
- 	xfsm-upower.c							\
- 	xfsm-upower.h
- 
-+if WITH_SYSTEMD
-+xfce4_session_SOURCES +=						\
-+	xfsm-systemd.c							\
-+	xfsm-systemd.h
-+else
-+xfce4_session_SOURCES +=						\
-+	xfsm-consolekit.c						\
-+	xfsm-consolekit.h
-+endif
-+
- xfce4_session_CFLAGS =							\
- 	$(LIBSM_CFLAGS)							\
- 	$(LIBX11_CFLAGS)						\
-@@ -72,6 +80,7 @@ xfce4_session_CFLAGS =							\
- 	$(DBUS_CFLAGS)							\
- 	$(DBUS_GLIB_CFLAGS)						\
- 	$(LIBWNCK_CFLAGS)						\
-+	$(SYSTEMD_CFLAGS)						\
- 	$(XFCONF_CFLAGS)						\
- 	$(GMODULE_CFLAGS)						\
- 	$(PLATFORM_CFLAGS)
-@@ -91,6 +100,7 @@ xfce4_session_LDADD =							\
- 	$(DBUS_LIBS)							\
- 	$(DBUS_GLIB_LIBS)						\
- 	$(LIBWNCK_LIBS)							\
-+	$(SYSTEMD_LIBS)							\
- 	$(XFCONF_LIBS)							\
- 	-lm
- 
-diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
-index d8757a8..1429abd 100644
---- a/xfce4-session/xfsm-shutdown.c
-+++ b/xfce4-session/xfsm-shutdown.c
-@@ -66,10 +66,13 @@
- #include <xfce4-session/xfsm-fadeout.h>
- #include <xfce4-session/xfsm-global.h>
- #include <xfce4-session/xfsm-legacy.h>
--#include <xfce4-session/xfsm-consolekit.h>
- #include <xfce4-session/xfsm-upower.h>
- 
--
-+#ifdef HAVE_SYSTEMD
-+#include <xfce4-session/xfsm-systemd.h>
-+#else
-+#include <xfce4-session/xfsm-consolekit.h>
-+#endif
- 
- static void xfsm_shutdown_finalize  (GObject      *object);
- static void xfsm_shutdown_sudo_free (XfsmShutdown *shutdown);
diff --git a/extra/xfce4-session/xfce4-session-4.10.0-store-the-watch-function-id.patch b/extra/xfce4-session/xfce4-session-4.10.0-store-the-watch-function-id.patch
deleted file mode 100644
index 1b86997ff..000000000
--- a/extra/xfce4-session/xfce4-session-4.10.0-store-the-watch-function-id.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ab391138cacc62ab184a338e237c4430356b41f9 Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick@xfce.org>
-Date: Fri, 26 Apr 2013 18:05:10 +0000
-Subject: Store the watch function id to avoid possible double free (bug #9709).
-
----
-diff --git a/xfce4-session/xfsm-startup.c b/xfce4-session/xfsm-startup.c
-index e43c53c..c621397 100644
---- a/xfce4-session/xfsm-startup.c
-+++ b/xfce4-session/xfsm-startup.c
-@@ -903,9 +903,10 @@ xfsm_startup_start_properties (XfsmProperties *properties,
-   child_watch_data = g_new0 (XfsmStartupData, 1);
-   child_watch_data->manager = g_object_ref (manager);
-   child_watch_data->properties = properties;
--  g_child_watch_add_full (G_PRIORITY_LOW, properties->pid,
--                          xfsm_startup_child_watch, child_watch_data,
--                          (GDestroyNotify) xfsm_startup_data_free);
-+  child_watch_data->properties->child_watch_id =
-+      g_child_watch_add_full (G_PRIORITY_LOW, properties->pid,
-+                              xfsm_startup_child_watch, child_watch_data,
-+                              (GDestroyNotify) xfsm_startup_data_free);
- 
-   /* set a timeout -- client must register in a a certain amount of time
-    * or it's assumed to be broken/have issues. */
---
-cgit v0.9.1
diff --git a/extra/xfce4-session/xfce4-session-4.10.0-use-the-async-spawn-function-of-glib.patch b/extra/xfce4-session/xfce4-session-4.10.0-use-the-async-spawn-function-of-glib.patch
deleted file mode 100644
index beffd0524..000000000
--- a/extra/xfce4-session/xfce4-session-4.10.0-use-the-async-spawn-function-of-glib.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From dee0200fa5dc4de064f288281ddd13199ba7fcde Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick@xfce.org>
-Date: Fri, 26 Apr 2013 17:46:29 +0000
-Subject: Use the async spawn function of glib.
-
----
-diff --git a/xfce4-session/xfsm-startup.c b/xfce4-session/xfsm-startup.c
-index 911eec6..e43c53c 100644
---- a/xfce4-session/xfsm-startup.c
-+++ b/xfce4-session/xfsm-startup.c
-@@ -864,6 +864,7 @@ xfsm_startup_start_properties (XfsmProperties *properties,
-   gint             n;
-   const gchar     *current_directory;
-   GPid             pid;
-+  GError          *error = NULL;
- 
-   /* release any possible old resources related to a previous startup */
-   xfsm_properties_set_default_child_watch (properties);
-@@ -878,44 +879,28 @@ xfsm_startup_start_properties (XfsmProperties *properties,
- 
-   current_directory = xfsm_properties_get_string (properties, SmCurrentDirectory);
- 
--  /* fork a new process for the application */
--#ifdef HAVE_VFORK
--  /* vfork() doesn't allow you to do anything but call exec*() or _exit(),
--   * so if we need to set the working directory, we can't use vfork() */
--  if (current_directory == NULL)
--    pid = vfork ();
--  else
--#endif
--    pid = fork ();
--
--  /* handle the child process */
--  if (pid == 0)
-+  if (!g_spawn_async (current_directory,
-+                      argv, NULL,
-+                      G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH,
-+                      NULL, NULL,
-+                      &pid, &error))
-     {
--      /* execute the application here */
--      if (current_directory)
--        {
--          if (chdir (current_directory))
--            g_warning ("Unable to chdir to \"%s\": %s", current_directory, strerror (errno));
--        }
--      execvp (argv[0], argv);
--      _exit (127);
--    }
--
--  /* cleanup */
--  g_strfreev (argv);
-+      g_warning ("Unable to launch \"%s\": %s",
-+                 *argv, error->message);
-+      g_error_free (error);
-+      g_strfreev (argv);
- 
--  /* check if we failed to fork */
--  if (G_UNLIKELY (pid < 0))
--    {
--      /* tell the user that we failed to fork */
--      perror ("Failed to fork new process");
-       return FALSE;
-     }
- 
-+  xfsm_verbose ("Launched command \"%s\" with PID %dn", *argv, (gint) pid);
-+
-+  g_strfreev (argv);
-+
-   properties->pid = pid;
- 
-   /* set a watch to make sure the child doesn't quit before registering */
--  child_watch_data = g_new (XfsmStartupData, 1);
-+  child_watch_data = g_new0 (XfsmStartupData, 1);
-   child_watch_data->manager = g_object_ref (manager);
-   child_watch_data->properties = properties;
-   g_child_watch_add_full (G_PRIORITY_LOW, properties->pid,
---
-cgit v0.9.1
diff --git a/extra/xfce4-settings/PKGBUILD b/extra/xfce4-settings/PKGBUILD
index 4fce8caab..c83a4a3d6 100644
--- a/extra/xfce4-settings/PKGBUILD
+++ b/extra/xfce4-settings/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 169428 2012-10-21 04:01:39Z foutrelis $
+# $Id: PKGBUILD 184292 2013-05-05 17:49:14Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 
 pkgname=xfce4-settings
-pkgver=4.10.0
-pkgrel=3
+pkgver=4.10.1
+pkgrel=1
 pkgdesc="Settings manager for xfce"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
@@ -16,26 +16,19 @@ depends=('exo' 'garcon' 'libxfce4ui' 'libnotify' 'libxklavier'
 makedepends=('intltool')
 optdepends=('libcanberra: for sound control')
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
-        xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch
-        xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
         xfce4-settings-xml-4.10.0.patch)
-sha256sums=('0843f09ba9673f1d1b5df8dce4a17b63c183a9ba3be75fb6ef99a67fc8c1f77e'
-            '28482a3410d587fe051b84080ab5366b4fbe2af8684ee46384ff899b73d3f349'
-            '5be974f8fba6ba9dc14e136762cf752fe46eac99f71511d77d910610b5401244'
+sha256sums=('118a6959ea50e3a533d7aa18ec5a878a47a30608b3ce9ce59a93c3888f4e13d5'
             '78e68ef2cbf19760707ba24f3d57dd59fbf40a540d50d20e7cc62ba02196aaaa')
-
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # enable gnome icon theme, clearlooks theme and font hinting by default
   # (taken from Fedora)
   patch -Np1 -i "$srcdir/xfce4-settings-xml-4.10.0.patch"
+}
 
-  # https://bugzilla.xfce.org/show_bug.cgi?id=9272
-  patch -Np1 -i "$srcdir/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch"
-
-  # https://bugzilla.xfce.org/show_bug.cgi?id=9273
-  patch -Np1 -i "$srcdir/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch"
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
 
   ./configure \
     --prefix=/usr \
diff --git a/extra/xfce4-settings/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch b/extra/xfce4-settings/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
deleted file mode 100644
index 1d271476e..000000000
--- a/extra/xfce4-settings/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 2ec636049b95d0c51286253813b5b1a074472afc Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <lionel@lefolgoc.net>
-Date: Sun, 09 Sep 2012 09:50:19 +0000
-Subject: Xfsettingsd: Check service name of NameOwnerChanged (bug #9273).
-
-In some conditions, the dbus spawn of xfconf leads to the
-shutdown of xfsettingsd because it "thinks" another instance
-is taking over... After some debugging I found that it
-receives a NameOwnerChanged signal describing the launch
-of Xfconf (name=org.xfce.Xfconf, old=, new=:1.11 for example).
-
-(cherry picked from commit c17fe35e6f2ff673bab102e736a327fa7bcc1d73)
----
-diff --git a/xfsettingsd/main.c b/xfsettingsd/main.c
-index 0f3a68d..55c4183 100644
---- a/xfsettingsd/main.c
-+++ b/xfsettingsd/main.c
-@@ -93,15 +93,29 @@ signal_handler (gint signum,
- 
- 
- static DBusHandlerResult
--dbus_connection_filter_func (DBusConnection     *connection,
--                             DBusMessage        *message,
--                             void               *user_data)
-+dbus_connection_filter_func (DBusConnection *connection,
-+                             DBusMessage    *message,
-+                             void           *user_data)
- {
-+    gchar *name, *old, *new;
-+
-     if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
-     {
--        g_printerr (G_LOG_DOMAIN ": %s\n", "Another instance took over. Leaving...");
--        gtk_main_quit ();
--        return DBUS_HANDLER_RESULT_HANDLED;
-+        /* double check if it is really org.xfce.SettingsDaemon
-+         * being replaced, see bug 9273 */
-+        if (dbus_message_get_args (message, NULL,
-+                                   DBUS_TYPE_STRING, &name,
-+                                   DBUS_TYPE_STRING, &old,
-+                                   DBUS_TYPE_STRING, &new,
-+                                   DBUS_TYPE_INVALID))
-+        {
-+            if (g_strcmp0 (name, XFSETTINGS_DBUS_NAME) == 0)
-+            {
-+                g_printerr (G_LOG_DOMAIN ": %s\n", "Another instance took over. Leaving...");
-+                gtk_main_quit ();
-+                return DBUS_HANDLER_RESULT_HANDLED;
-+            }
-+        }
-     }
- 
-     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
---
-cgit v0.9.0.3
diff --git a/extra/xfce4-settings/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch b/extra/xfce4-settings/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch
deleted file mode 100644
index ebd270bd9..000000000
--- a/extra/xfce4-settings/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 8032dd77047329a93edd4c4a8b686ffc36d2f7a7 Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <lionel@lefolgoc.net>
-Date: Sun, 09 Sep 2012 09:41:18 +0000
-Subject: Appearance: Fix gtk3 theme detection in install script (bug #9272).
-
-(cherry picked from commit e3c6db6f57e72cdbdf0e293bba7d6ca650d7521b)
----
-diff --git a/dialogs/appearance-settings/appearance-install-theme b/dialogs/appearance-settings/appearance-install-theme
-index 13f61ae..6dc1e17 100755
---- a/dialogs/appearance-settings/appearance-install-theme
-+++ b/dialogs/appearance-settings/appearance-install-theme
-@@ -140,7 +140,7 @@ if test "$retval" -eq 0; then
-     detectthemes "gtk-2.0/gtkrc"
- 
-     # install gtk-3.0 themes
--    detectthemes "gtk-3.0/gtkrc"
-+    detectthemes "gtk-3.0/gtk.css"
- 
-     # install xfwm4 themes
-     detectthemes "xfwm4/themerc"
---
-cgit v0.9.0.3
diff --git a/extra/xfce4-terminal/PKGBUILD b/extra/xfce4-terminal/PKGBUILD
index f55feba33..9c9f197f2 100644
--- a/extra/xfce4-terminal/PKGBUILD
+++ b/extra/xfce4-terminal/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 174007 2013-01-01 12:50:48Z foutrelis $
+# $Id: PKGBUILD 184303 2013-05-05 19:21:38Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-terminal
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ replaces=('terminal')
 options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/apps/$pkgname/0.6/$pkgname-$pkgver.tar.bz2)
-sha256sums=('61346427e55af79e86511572bfabb2e025cb13720879226ea1b98a92f0bcd4c8')
+sha256sums=('3d92422288d26311880af694bb4e02c9235997ca307a5e85001bf6bef65c3b35')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xfwm4/PKGBUILD b/extra/xfwm4/PKGBUILD
index a5b731a4f..6791aed95 100644
--- a/extra/xfwm4/PKGBUILD
+++ b/extra/xfwm4/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163772 2012-07-19 16:30:24Z foutrelis $
+# $Id: PKGBUILD 184290 2013-05-05 17:47:29Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfwm4
-pkgver=4.10.0
-pkgrel=2.1
+pkgver=4.10.1
+pkgrel=1
 pkgdesc="Xfce window manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
@@ -14,17 +14,12 @@ depends=('libxfce4ui' 'libwnck' 'hicolor-icon-theme')
 makedepends=('intltool')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
-        xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch)
-sha256sums=('492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c'
-            'f088a56cc05d1856af8d68dae9e40bc53b724d9dde4d8c2b78a88922c0ee6d1d')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('380c44fba6eb779e34be0fe94f3726cfa131803014d6073c45aec8a1257fa740')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Fix https://bugzilla.xfce.org/show_bug.cgi?id=8949 (FS#29970)
-  patch -Np1 -i "$srcdir/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch"
-
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/extra/xfwm4/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch b/extra/xfwm4/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch
deleted file mode 100644
index f01b554ce..000000000
--- a/extra/xfwm4/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 099614e3f045e06db7ab509e174510ea74857adb Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <fourdan@xfce.org>
-Date: Wed, 18 Jul 2012 20:12:07 +0000
-Subject: Implement NET_WM_MOVERESIZE_CANCEL message (bug #8949)
-
-as gtk+-3.4 now uses it.
----
-diff --git a/src/display.h b/src/display.h
-index 1ad2ef8..8797237 100644
---- a/src/display.h
-+++ b/src/display.h
-@@ -163,7 +163,8 @@ enum
-     NET_WM_MOVERESIZE_SIZE_LEFT,
-     NET_WM_MOVERESIZE_MOVE,
-     NET_WM_MOVERESIZE_SIZE_KEYBOARD,
--    NET_WM_MOVERESIZE_MOVE_KEYBOARD
-+    NET_WM_MOVERESIZE_MOVE_KEYBOARD,
-+    NET_WM_MOVERESIZE_CANCEL
- };
- 
- enum
-diff --git a/src/moveresize.c b/src/moveresize.c
-index 9893c30..a98bdf7 100644
---- a/src/moveresize.c
-+++ b/src/moveresize.c
-@@ -827,7 +827,7 @@ clientMoveEventFilter (XEvent * xevent, gpointer data)
-     eventFilterStatus status = EVENT_FILTER_STOP;
-     MoveResizeData *passdata = (MoveResizeData *) data;
-     Client *c = NULL;
--    gboolean moving = TRUE;
-+    gboolean moving;
-     XWindowChanges wc;
-     int prev_x, prev_y;
- 
-@@ -840,6 +840,12 @@ clientMoveEventFilter (XEvent * xevent, gpointer data)
-     display_info = screen_info->display_info;
-     configure_flags = NO_CFG_FLAG;
- 
-+    /*
-+     * Clients may choose to end the move operation,
-+     * we use XFWM_FLAG_MOVING_RESIZING for that.
-+     */
-+    moving = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
-+
-     /* Update the display time */
-     myDisplayUpdateCurrentTime (display_info, xevent);
- 
-@@ -1294,7 +1300,12 @@ clientResizeEventFilter (XEvent * xevent, gpointer data)
-     screen_info = c->screen_info;
-     display_info = screen_info->display_info;
-     status = EVENT_FILTER_STOP;
--    resizing = TRUE;
-+
-+    /*
-+     * Clients may choose to end the resize operation,
-+     * we use XFWM_FLAG_MOVING_RESIZING for that.
-+     */
-+    resizing = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
- 
-     frame_x = frameX (c);
-     frame_y = frameY (c);
-diff --git a/src/netwm.c b/src/netwm.c
-index 545e64a..1352f08 100644
---- a/src/netwm.c
-+++ b/src/netwm.c
-@@ -695,10 +695,15 @@ clientNetMoveResize (Client * c, XClientMessageEvent * ev)
-             resize = TRUE; /* Resize */
-             break;
-         case NET_WM_MOVERESIZE_MOVE:
--        default:
-             event->type = ButtonPress;
-             resize = FALSE; /* Move */
-             break;
-+        case NET_WM_MOVERESIZE_CANCEL:
-+            FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
-+            /* Walk through */
-+        default: /* Do nothing */
-+            return;
-+            break;
-     }
- 
-     if (!FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
---
-cgit v0.9.0.3
author	Michał Masłowski <mtjm@mtjm.eu>	2013-05-06 11:13:51 +0200
committer	Michał Masłowski <mtjm@mtjm.eu>	2013-05-06 11:13:51 +0200
commit	a86ff663185661ee304bb1f6d00d982102dd706d (patch)
tree	06520d9024b40745b94f02d0d3419386e6496863 /extra
parent	ce32dcab8e4baa2afe51fd3b7a858a840372b0a5 (diff)
parent	ffb692bf2696e7ebedd19bcd55ba253e21cb732d (diff)