[arch-commits] Commit in gnome-settings-daemon/trunk (PKGBUILD upower.patch)

[Jan Steffens]

    Date: Thursday, October 20, 2011 @ 02:43:33
  Author: heftig
Revision: 140966

fix media-keys

Added:
  gnome-settings-daemon/trunk/upower.patch
Modified:
  gnome-settings-daemon/trunk/PKGBUILD

--------------+
 PKGBUILD     |   12 +++++++++---
 upower.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-20 05:44:28 UTC (rev 140965)
+++ PKGBUILD	2011-10-20 06:43:33 UTC (rev 140966)
@@ -3,7 +3,7 @@
 
 pkgname=gnome-settings-daemon
 pkgver=3.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,11 +15,17 @@
 groups=('gnome')
 replaces=(gnome-settings-daemon-pulse)
 conflicts=(gnome-settings-daemon-pulse)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('1015b8a12483e91ddc67e891b66207a70339a341a051507aad9a6a15fbfcb78d')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+        upower.patch)
+sha256sums=('1015b8a12483e91ddc67e891b66207a70339a341a051507aad9a6a15fbfcb78d'
+            'f7a66e9ff7f415be34873fd6d03843a20732158bd65b382b114d100aaddeb223')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+
+  # Fix suspend via key
+  patch -Np1 -i "$srcdir/upower.patch"
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/gnome-settings-daemon --disable-static --enable-pulse \
       --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids

Added: upower.patch
===================================================================
--- upower.patch	                        (rev 0)
+++ upower.patch	2011-10-20 06:43:33 UTC (rev 140966)
@@ -0,0 +1,28 @@
+diff -u -r gnome-settings-daemon-3.2.1-orig/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-3.2.1/plugins/media-keys/gsd-media-keys-manager.c
+--- gnome-settings-daemon-3.2.1-orig/plugins/media-keys/gsd-media-keys-manager.c	2011-10-20 08:19:31.818642262 +0200
++++ gnome-settings-daemon-3.2.1/plugins/media-keys/gsd-media-keys-manager.c	2011-10-20 08:23:55.127492221 +0200
+@@ -2066,15 +2066,15 @@
+                           (GAsyncReadyCallback) power_keyboard_ready_cb,
+                           manager);
+ 
+-        g_dbus_proxy_new (manager->priv->connection,
+-                          G_DBUS_PROXY_FLAGS_NONE,
+-                          NULL,
+-                          "org.freedesktop.UPower",
+-                          "/org/freedesktop/UPower",
+-                          "org.freedesktop.UPower",
+-                          NULL,
+-                          (GAsyncReadyCallback) upower_ready_cb,
+-                          manager);
++        g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
++                                  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
++                                  NULL,
++                                  "org.freedesktop.UPower",
++                                  "/org/freedesktop/UPower",
++                                  "org.freedesktop.UPower",
++                                  NULL,
++                                  (GAsyncReadyCallback) upower_ready_cb,
++                                  manager);
+ }
+ 
+ static void