[arch-commits] Commit in xfce4-settings/repos (12 files)

Evangelos Foutras foutrelis at nymeria.archlinux.org
Sun May 5 13:49:14 EDT 2013


    Date: Sunday, May 5, 2013 @ 19:49:14
  Author: foutrelis
Revision: 184292

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  xfce4-settings/repos/extra-i686/PKGBUILD
    (from rev 184291, xfce4-settings/trunk/PKGBUILD)
  xfce4-settings/repos/extra-i686/xfce4-settings-xml-4.10.0.patch
    (from rev 184291, xfce4-settings/trunk/xfce4-settings-xml-4.10.0.patch)
  xfce4-settings/repos/extra-x86_64/PKGBUILD
    (from rev 184291, xfce4-settings/trunk/PKGBUILD)
  xfce4-settings/repos/extra-x86_64/xfce4-settings-xml-4.10.0.patch
    (from rev 184291, xfce4-settings/trunk/xfce4-settings-xml-4.10.0.patch)
Deleted:
  xfce4-settings/repos/extra-i686/PKGBUILD
  xfce4-settings/repos/extra-i686/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
  xfce4-settings/repos/extra-i686/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch
  xfce4-settings/repos/extra-i686/xfce4-settings-xml-4.10.0.patch
  xfce4-settings/repos/extra-x86_64/PKGBUILD
  xfce4-settings/repos/extra-x86_64/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
  xfce4-settings/repos/extra-x86_64/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch
  xfce4-settings/repos/extra-x86_64/xfce4-settings-xml-4.10.0.patch

---------------------------------------------------------------------------------+
 /PKGBUILD                                                                       |  106 ++++++++++
 /xfce4-settings-xml-4.10.0.patch                                                |   52 ++++
 extra-i686/PKGBUILD                                                             |   60 -----
 extra-i686/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch   |   55 -----
 extra-i686/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch                 |   22 --
 extra-i686/xfce4-settings-xml-4.10.0.patch                                      |   26 --
 extra-x86_64/PKGBUILD                                                           |   60 -----
 extra-x86_64/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch |   55 -----
 extra-x86_64/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch               |   22 --
 extra-x86_64/xfce4-settings-xml-4.10.0.patch                                    |   26 --
 10 files changed, 158 insertions(+), 326 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-05-05 17:49:01 UTC (rev 184291)
+++ extra-i686/PKGBUILD	2013-05-05 17:49:14 UTC (rev 184292)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-# Contributor: Corrado Primier <bardo at aur.archlinux.org>
-
-pkgname=xfce4-settings
-pkgver=4.10.0
-pkgrel=3
-pkgdesc="Settings manager for xfce"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-depends=('exo' 'garcon' 'libxfce4ui' 'libnotify' 'libxklavier'
-         'gnome-icon-theme' 'gtk-engines')
-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'
-            '78e68ef2cbf19760707ba24f3d57dd59fbf40a540d50d20e7cc62ba02196aaaa')
-
-build() {
-  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"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-static \
-    --enable-xrandr \
-    --enable-xcursor \
-    --enable-libnotify \
-    --enable-libxklavier \
-    --enable-pluggable-dialogs \
-    --enable-sound-settings \
-    --disable-debug
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: xfce4-settings/repos/extra-i686/PKGBUILD (from rev 184291, xfce4-settings/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-05-05 17:49:14 UTC (rev 184292)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+# Contributor: Corrado Primier <bardo at aur.archlinux.org>
+
+pkgname=xfce4-settings
+pkgver=4.10.1
+pkgrel=1
+pkgdesc="Settings manager for xfce"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('exo' 'garcon' 'libxfce4ui' 'libnotify' 'libxklavier'
+         'gnome-icon-theme' 'gtk-engines')
+makedepends=('intltool')
+optdepends=('libcanberra: for sound control')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
+        xfce4-settings-xml-4.10.0.patch)
+sha256sums=('118a6959ea50e3a533d7aa18ec5a878a47a30608b3ce9ce59a93c3888f4e13d5'
+            '78e68ef2cbf19760707ba24f3d57dd59fbf40a540d50d20e7cc62ba02196aaaa')
+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"
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-xrandr \
+    --enable-xcursor \
+    --enable-libnotify \
+    --enable-libxklavier \
+    --enable-pluggable-dialogs \
+    --enable-sound-settings \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: extra-i686/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
===================================================================
--- extra-i686/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch	2013-05-05 17:49:01 UTC (rev 184291)
+++ extra-i686/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch	2013-05-05 17:49:14 UTC (rev 184292)
@@ -1,55 +0,0 @@
-From 2ec636049b95d0c51286253813b5b1a074472afc Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <lionel at 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

Deleted: extra-i686/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch
===================================================================
--- extra-i686/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch	2013-05-05 17:49:01 UTC (rev 184291)
+++ extra-i686/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch	2013-05-05 17:49:14 UTC (rev 184292)
@@ -1,22 +0,0 @@
-From 8032dd77047329a93edd4c4a8b686ffc36d2f7a7 Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <lionel at 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

Deleted: extra-i686/xfce4-settings-xml-4.10.0.patch
===================================================================
--- extra-i686/xfce4-settings-xml-4.10.0.patch	2013-05-05 17:49:01 UTC (rev 184291)
+++ extra-i686/xfce4-settings-xml-4.10.0.patch	2013-05-05 17:49:14 UTC (rev 184292)
@@ -1,26 +0,0 @@
-diff -Nur xfce4-settings-4.9.4.orig/xfsettingsd/xsettings.xml xfce4-settings-4.9.4/xfsettingsd/xsettings.xml
---- xfce4-settings-4.9.4.orig/xfsettingsd/xsettings.xml	2012-04-01 03:58:17.000000000 -0600
-+++ xfce4-settings-4.9.4/xfsettingsd/xsettings.xml	2012-04-02 14:59:57.555572009 -0600
-@@ -6,8 +6,8 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <channel name="xsettings" version="1.0">
-   <property name="Net" type="empty">
--    <property name="ThemeName" type="empty"/>
--    <property name="IconThemeName" type="empty"/>
-+    <property name="ThemeName" type="string" value="Clearlooks"/>
-+    <property name="IconThemeName" type="string" value="gnome"/>
-     <property name="DoubleClickTime" type="int" value="250"/>
-     <property name="DoubleClickDistance" type="int" value="5"/>
-     <property name="DndDragThreshold" type="int" value="8"/>
-@@ -19,9 +19,9 @@
-   </property>
-   <property name="Xft" type="empty">
-     <property name="DPI" type="empty"/>
--    <property name="Antialias" type="int" value="-1"/>
-+    <property name="Antialias" type="int" value="1"/>
-     <property name="Hinting" type="int" value="-1"/>
--    <property name="HintStyle" type="string" value="hintnone"/>
-+    <property name="HintStyle" type="string" value="hintfull"/>
-     <property name="RGBA" type="string" value="none"/>
-     <!-- <property name="Lcdfilter" type="string" value="none"/> -->
-   </property>

Copied: xfce4-settings/repos/extra-i686/xfce4-settings-xml-4.10.0.patch (from rev 184291, xfce4-settings/trunk/xfce4-settings-xml-4.10.0.patch)
===================================================================
--- extra-i686/xfce4-settings-xml-4.10.0.patch	                        (rev 0)
+++ extra-i686/xfce4-settings-xml-4.10.0.patch	2013-05-05 17:49:14 UTC (rev 184292)
@@ -0,0 +1,26 @@
+diff -Nur xfce4-settings-4.9.4.orig/xfsettingsd/xsettings.xml xfce4-settings-4.9.4/xfsettingsd/xsettings.xml
+--- xfce4-settings-4.9.4.orig/xfsettingsd/xsettings.xml	2012-04-01 03:58:17.000000000 -0600
++++ xfce4-settings-4.9.4/xfsettingsd/xsettings.xml	2012-04-02 14:59:57.555572009 -0600
+@@ -6,8 +6,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <channel name="xsettings" version="1.0">
+   <property name="Net" type="empty">
+-    <property name="ThemeName" type="empty"/>
+-    <property name="IconThemeName" type="empty"/>
++    <property name="ThemeName" type="string" value="Clearlooks"/>
++    <property name="IconThemeName" type="string" value="gnome"/>
+     <property name="DoubleClickTime" type="int" value="250"/>
+     <property name="DoubleClickDistance" type="int" value="5"/>
+     <property name="DndDragThreshold" type="int" value="8"/>
+@@ -19,9 +19,9 @@
+   </property>
+   <property name="Xft" type="empty">
+     <property name="DPI" type="empty"/>
+-    <property name="Antialias" type="int" value="-1"/>
++    <property name="Antialias" type="int" value="1"/>
+     <property name="Hinting" type="int" value="-1"/>
+-    <property name="HintStyle" type="string" value="hintnone"/>
++    <property name="HintStyle" type="string" value="hintfull"/>
+     <property name="RGBA" type="string" value="none"/>
+     <!-- <property name="Lcdfilter" type="string" value="none"/> -->
+   </property>

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-05-05 17:49:01 UTC (rev 184291)
+++ extra-x86_64/PKGBUILD	2013-05-05 17:49:14 UTC (rev 184292)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-# Contributor: Corrado Primier <bardo at aur.archlinux.org>
-
-pkgname=xfce4-settings
-pkgver=4.10.0
-pkgrel=3
-pkgdesc="Settings manager for xfce"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-depends=('exo' 'garcon' 'libxfce4ui' 'libnotify' 'libxklavier'
-         'gnome-icon-theme' 'gtk-engines')
-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'
-            '78e68ef2cbf19760707ba24f3d57dd59fbf40a540d50d20e7cc62ba02196aaaa')
-
-build() {
-  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"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-static \
-    --enable-xrandr \
-    --enable-xcursor \
-    --enable-libnotify \
-    --enable-libxklavier \
-    --enable-pluggable-dialogs \
-    --enable-sound-settings \
-    --disable-debug
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: xfce4-settings/repos/extra-x86_64/PKGBUILD (from rev 184291, xfce4-settings/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-05-05 17:49:14 UTC (rev 184292)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+# Contributor: Corrado Primier <bardo at aur.archlinux.org>
+
+pkgname=xfce4-settings
+pkgver=4.10.1
+pkgrel=1
+pkgdesc="Settings manager for xfce"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('exo' 'garcon' 'libxfce4ui' 'libnotify' 'libxklavier'
+         'gnome-icon-theme' 'gtk-engines')
+makedepends=('intltool')
+optdepends=('libcanberra: for sound control')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
+        xfce4-settings-xml-4.10.0.patch)
+sha256sums=('118a6959ea50e3a533d7aa18ec5a878a47a30608b3ce9ce59a93c3888f4e13d5'
+            '78e68ef2cbf19760707ba24f3d57dd59fbf40a540d50d20e7cc62ba02196aaaa')
+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"
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-xrandr \
+    --enable-xcursor \
+    --enable-libnotify \
+    --enable-libxklavier \
+    --enable-pluggable-dialogs \
+    --enable-sound-settings \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: extra-x86_64/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
===================================================================
--- extra-x86_64/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch	2013-05-05 17:49:01 UTC (rev 184291)
+++ extra-x86_64/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch	2013-05-05 17:49:14 UTC (rev 184292)
@@ -1,55 +0,0 @@
-From 2ec636049b95d0c51286253813b5b1a074472afc Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <lionel at 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

Deleted: extra-x86_64/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch
===================================================================
--- extra-x86_64/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch	2013-05-05 17:49:01 UTC (rev 184291)
+++ extra-x86_64/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch	2013-05-05 17:49:14 UTC (rev 184292)
@@ -1,22 +0,0 @@
-From 8032dd77047329a93edd4c4a8b686ffc36d2f7a7 Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <lionel at 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

Deleted: extra-x86_64/xfce4-settings-xml-4.10.0.patch
===================================================================
--- extra-x86_64/xfce4-settings-xml-4.10.0.patch	2013-05-05 17:49:01 UTC (rev 184291)
+++ extra-x86_64/xfce4-settings-xml-4.10.0.patch	2013-05-05 17:49:14 UTC (rev 184292)
@@ -1,26 +0,0 @@
-diff -Nur xfce4-settings-4.9.4.orig/xfsettingsd/xsettings.xml xfce4-settings-4.9.4/xfsettingsd/xsettings.xml
---- xfce4-settings-4.9.4.orig/xfsettingsd/xsettings.xml	2012-04-01 03:58:17.000000000 -0600
-+++ xfce4-settings-4.9.4/xfsettingsd/xsettings.xml	2012-04-02 14:59:57.555572009 -0600
-@@ -6,8 +6,8 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <channel name="xsettings" version="1.0">
-   <property name="Net" type="empty">
--    <property name="ThemeName" type="empty"/>
--    <property name="IconThemeName" type="empty"/>
-+    <property name="ThemeName" type="string" value="Clearlooks"/>
-+    <property name="IconThemeName" type="string" value="gnome"/>
-     <property name="DoubleClickTime" type="int" value="250"/>
-     <property name="DoubleClickDistance" type="int" value="5"/>
-     <property name="DndDragThreshold" type="int" value="8"/>
-@@ -19,9 +19,9 @@
-   </property>
-   <property name="Xft" type="empty">
-     <property name="DPI" type="empty"/>
--    <property name="Antialias" type="int" value="-1"/>
-+    <property name="Antialias" type="int" value="1"/>
-     <property name="Hinting" type="int" value="-1"/>
--    <property name="HintStyle" type="string" value="hintnone"/>
-+    <property name="HintStyle" type="string" value="hintfull"/>
-     <property name="RGBA" type="string" value="none"/>
-     <!-- <property name="Lcdfilter" type="string" value="none"/> -->
-   </property>

Copied: xfce4-settings/repos/extra-x86_64/xfce4-settings-xml-4.10.0.patch (from rev 184291, xfce4-settings/trunk/xfce4-settings-xml-4.10.0.patch)
===================================================================
--- extra-x86_64/xfce4-settings-xml-4.10.0.patch	                        (rev 0)
+++ extra-x86_64/xfce4-settings-xml-4.10.0.patch	2013-05-05 17:49:14 UTC (rev 184292)
@@ -0,0 +1,26 @@
+diff -Nur xfce4-settings-4.9.4.orig/xfsettingsd/xsettings.xml xfce4-settings-4.9.4/xfsettingsd/xsettings.xml
+--- xfce4-settings-4.9.4.orig/xfsettingsd/xsettings.xml	2012-04-01 03:58:17.000000000 -0600
++++ xfce4-settings-4.9.4/xfsettingsd/xsettings.xml	2012-04-02 14:59:57.555572009 -0600
+@@ -6,8 +6,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <channel name="xsettings" version="1.0">
+   <property name="Net" type="empty">
+-    <property name="ThemeName" type="empty"/>
+-    <property name="IconThemeName" type="empty"/>
++    <property name="ThemeName" type="string" value="Clearlooks"/>
++    <property name="IconThemeName" type="string" value="gnome"/>
+     <property name="DoubleClickTime" type="int" value="250"/>
+     <property name="DoubleClickDistance" type="int" value="5"/>
+     <property name="DndDragThreshold" type="int" value="8"/>
+@@ -19,9 +19,9 @@
+   </property>
+   <property name="Xft" type="empty">
+     <property name="DPI" type="empty"/>
+-    <property name="Antialias" type="int" value="-1"/>
++    <property name="Antialias" type="int" value="1"/>
+     <property name="Hinting" type="int" value="-1"/>
+-    <property name="HintStyle" type="string" value="hintnone"/>
++    <property name="HintStyle" type="string" value="hintfull"/>
+     <property name="RGBA" type="string" value="none"/>
+     <!-- <property name="Lcdfilter" type="string" value="none"/> -->
+   </property>



More information about the arch-commits mailing list