Mon May 6 00:08:59 PDT 2013

3 files changed, 8 insertions, 92 deletions

diff --git a/extra/xfce4-settings/PKGBUILD b/extra/xfce4-settings/PKGBUILD
index 5724cabe6..d3ff38d8b 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')
 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