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

[Ionut Biru]

    Date: Wednesday, November 9, 2011 @ 02:27:40
  Author: ibiru
Revision: 142416

update to 3.2.2

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-09 06:37:09 UTC (rev 142415)
+++ PKGBUILD	2011-11-09 07:27:40 UTC (rev 142416)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-settings-daemon
-pkgver=3.2.1
-pkgrel=2
+pkgver=3.2.2
+pkgrel=1
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,17 +15,12 @@
 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
-        upower.patch)
-sha256sums=('1015b8a12483e91ddc67e891b66207a70339a341a051507aad9a6a15fbfcb78d'
-            'f7a66e9ff7f415be34873fd6d03843a20732158bd65b382b114d100aaddeb223')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('d91cac869e23f36942720485f04c3029fd5286fafb6ad12b07377e527b1f6884')
 
 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

Deleted: upower.patch
===================================================================
--- upower.patch	2011-11-09 06:37:09 UTC (rev 142415)
+++ upower.patch	2011-11-09 07:27:40 UTC (rev 142416)
@@ -1,28 +0,0 @@
-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