Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=ba2d39eea2cbdabf847c503519970455b8d4af7c

commit ba2d39eea2cbdabf847c503519970455b8d4af7c
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Wed Aug 31 17:06:00 2011 +0200

gnome-settings-daemon-3.1.90-2-x86_64
*Do not exit gnome-settings-daemon if upower fails to load

diff --git a/source/gnome/gnome-settings-daemon/FrugalBuild 
b/source/gnome/gnome-settings-daemon/FrugalBuild
index f071b08..3d56169 100644
--- a/source/gnome/gnome-settings-daemon/FrugalBuild
+++ b/source/gnome/gnome-settings-daemon/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=gnome-settings-daemon
pkgver=3.1.90
-pkgrel=1
+pkgrel=2
pkgdesc="Utility library for accessing gnome-settings-daemon over DBUS"
depends=('libxml2>=2.7.8' 'libgnomekbd>=3.0.0' 'esd' 
'gst-plugins-base>=0.10.22-2' 'libxxf86misc' \
'gnome-desktop>=3.1.90' 'alsa-lib' 'pulseaudio' 'gsettings-desktop-schemas' 
'libxtst' 'libnotify' \
@@ -16,7 +16,9 @@ _F_gnome_glib="y"
_F_gnome_scrollkeeper="y"
_F_gnome_iconcache="y"
Finclude gnome gnome-scriptlet
-sha1sums=('6d6dc3d7a6238546b0b863e19cc74d0a1ead5403')
+source=($source upower.diff)
+sha1sums=('6d6dc3d7a6238546b0b863e19cc74d0a1ead5403' \
+          '25ff7b6dd5872270b8331f05a153137e43c3c0ec')
Fconfopts="${Fconfopts[@]} --disable-static"

build() {
diff --git a/source/gnome/gnome-settings-daemon/upower.diff 
b/source/gnome/gnome-settings-daemon/upower.diff
new file mode 100644
index 0000000..7d641ab
--- /dev/null
+++ b/source/gnome/gnome-settings-daemon/upower.diff
@@ -0,0 +1,22 @@
+From 79acde1a8f402ffc1c0e1afec196928f8e1164f5 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <rich...@hughsie.com>
+Date: Tue, 30 Aug 2011 07:46:40 +0000
+Subject: power: Do not exit gnome-settings-daemon if upower fails to load
+
+---
+diff --git a/plugins/power/gsd-power-manager.c 
b/plugins/power/gsd-power-manager.c
+index ed88853..f983890 100644
+--- a/plugins/power/gsd-power-manager.c
++++ b/plugins/power/gsd-power-manager.c
+@@ -1079,7 +1079,7 @@ engine_coldplug (GsdPowerManager *manager)
+         /* get devices from UPower */
+         ret = up_client_enumerate_devices_sync (manager->priv->up_client, 
NULL, &error);
+         if (!ret) {
+-                g_error ("failed to get device list: %s", error->message);
++                g_warning ("failed to get device list: %s", error->message);
+                 g_error_free (error);
+                 goto out;
+         }
+--
+cgit v0.9.0.2
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to