| 1 |
commit: 9c13b094f3cb7caa1c393812b9ce60333a4516c9 |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Oct 4 05:58:02 2011 +0000 |
| 4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Oct 4 08:02:34 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9c13b094 |
| 7 |
|
| 8 |
gnome-base/gnome-settings-daemon: do not treat DPMS failure as fatal |
| 9 |
|
| 10 |
Do not fail to start power plugin if clearing DPMS timeouts failed |
| 11 |
(clearing the timeouts appears to always fail under nvidia-drivers). |
| 12 |
|
| 13 |
Upstream bug filed at https://bugzilla.gnome.org/show_bug.cgi?id=660859 |
| 14 |
|
| 15 |
--- |
| 16 |
.../gnome-settings-daemon-3.2.0-dpms-failure.patch | 30 ++++++++++++++++++++ |
| 17 |
...build => gnome-settings-daemon-3.2.0-r3.ebuild} | 4 ++ |
| 18 |
2 files changed, 34 insertions(+), 0 deletions(-) |
| 19 |
|
| 20 |
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-dpms-failure.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-dpms-failure.patch |
| 21 |
new file mode 100644 |
| 22 |
index 0000000..01bd093 |
| 23 |
--- /dev/null |
| 24 |
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-dpms-failure.patch |
| 25 |
@@ -0,0 +1,30 @@ |
| 26 |
+From a8d56d910350346008aca54b98e10c318f29050f Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Alexandre Rostovtsev <tetromino@×××××.com> |
| 28 |
+Date: Tue, 4 Oct 2011 00:45:17 -0400 |
| 29 |
+Subject: [PATCH] Power: failing to clear DPMS timeouts should not be fatal |
| 30 |
+ |
| 31 |
+https://bugzilla.gnome.org/show_bug.cgi?id=660859 |
| 32 |
+--- |
| 33 |
+ plugins/power/gsd-power-manager.c | 6 ++++-- |
| 34 |
+ 1 files changed, 4 insertions(+), 2 deletions(-) |
| 35 |
+ |
| 36 |
+diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c |
| 37 |
+index ae7cfb3..56934d5 100644 |
| 38 |
+--- a/plugins/power/gsd-power-manager.c |
| 39 |
++++ b/plugins/power/gsd-power-manager.c |
| 40 |
+@@ -3446,8 +3446,10 @@ gsd_power_manager_start (GsdPowerManager *manager, |
| 41 |
+ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, |
| 42 |
+ GNOME_RR_DPMS_ON, |
| 43 |
+ error); |
| 44 |
+- if (!ret) |
| 45 |
+- return FALSE; |
| 46 |
++ if (!ret) { |
| 47 |
++ g_warning ("Failed set DPMS mode: %s", (*error)->message); |
| 48 |
++ g_clear_error (error); |
| 49 |
++ } |
| 50 |
+ |
| 51 |
+ /* coldplug the engine */ |
| 52 |
+ engine_coldplug (manager); |
| 53 |
+-- |
| 54 |
+1.7.7 |
| 55 |
+ |
| 56 |
|
| 57 |
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.0-r2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.0-r3.ebuild |
| 58 |
similarity index 95% |
| 59 |
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.0-r2.ebuild |
| 60 |
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.0-r3.ebuild |
| 61 |
index 9dc285c..efffa70 100644 |
| 62 |
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.0-r2.ebuild |
| 63 |
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.0-r3.ebuild |
| 64 |
@@ -107,6 +107,10 @@ src_prepare() { |
| 65 |
# fixing loading color profiles at startup |
| 66 |
epatch "${FILESDIR}/${PN}-3.2.0-color-unbreak-loading-profiles.patch" |
| 67 |
|
| 68 |
+ # Do not fail to start the power plugin if clearing DPMS timeouts failed |
| 69 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=660859 |
| 70 |
+ epatch "${FILESDIR}/${PN}-3.2.0-dpms-failure.patch" |
| 71 |
+ |
| 72 |
# https://bugzilla.gnome.org/show_bug.cgi?id=621836 |
| 73 |
# Apparently this change severely affects touchpad usability for some |
| 74 |
# people, so revert it if USE=short-touchpad-timeout. |
Archives