[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     e62c70681e4ce3215f79860befcc518e5df17046
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Oct  5 07:58:32 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Oct  5 07:58:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e62c7068

gnome-base/gnome-desktop: fix DPMS timeout and mode setting

This is required for clearing DPMS timeouts and setting DPMS modes to
work on some hardware. Fixes e.g. the problems with gnome-settings-daemon
refusing to turn off the screen.

Upstream bug filed at https://bugzilla.gnome.org/show_bug.cgi?id=660962

---
 ...esktop-3.2.0-dpmssettimeouts-return-value.patch |   91 ++++++++++++++++++++
 ...2.0-r1.ebuild => gnome-desktop-3.2.0-r2.ebuild} |    4 +
 2 files changed, 95 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-dpmssettimeouts-return-value.patch b/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-dpmssettimeouts-return-value.patch
new file mode 100644
index 0000000..cd8b401
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-dpmssettimeouts-return-value.patch
@@ -0,0 +1,91 @@
+From c33e020e4b6119b08c3748209360b7c826e0dfca Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Wed, 5 Oct 2011 02:27:48 -0400
+Subject: [PATCH] Ignore DPMSSetTimeouts() and DPMSForceLevel() return value
+
+At least with nvidia binary drivers, DPMSSetTimeouts() and DPMSForceLevel()
+always return BadRequest, even if they succeed. On a machine with intel
+graphics, DPMSForceLevel() was also observed to return BadRequest despite
+successfully changing the DPMS level. So we should just ignore the return
+value from these functions, like xset does.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660962
+---
+ libgnome-desktop/gnome-rr.c |   34 +++++++++++-----------------------
+ 1 files changed, 11 insertions(+), 23 deletions(-)
+
+diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
+index 465dee9..55ca03b 100644
+--- a/libgnome-desktop/gnome-rr.c
++++ b/libgnome-desktop/gnome-rr.c
+@@ -1240,24 +1240,17 @@ static gboolean
+ gnome_rr_screen_clear_dpms_timeouts (GnomeRRScreen *screen,
+                                      GError **error)
+ {
+-    gboolean ret = TRUE;
+-    gint rc;
+-
+     gdk_error_trap_push ();
+-    rc = DPMSSetTimeouts (screen->priv->xdisplay, 0, 0, 0);
+-    if (gdk_error_trap_pop ())
+-        ret = FALSE;
+-
+-    if (!ret || rc != Success) {
+-        ret = FALSE;
++    /* DPMSSetTimeouts() return value is often a lie, so ignore it */
++    DPMSSetTimeouts (screen->priv->xdisplay, 0, 0, 0);
++    if (gdk_error_trap_pop ()) {
+         g_set_error_literal (error,
+                              GNOME_RR_ERROR,
+                              GNOME_RR_ERROR_UNKNOWN,
+                              "Could not set DPMS timeouts");
+-        goto out;
++        return FALSE;
+     }
+-out:
+-    return ret;
++    return TRUE;
+ }
+ 
+ /**
+@@ -1272,7 +1265,6 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
+ {
+     CARD16 state = 0;
+     gboolean ret;
+-    gint rc;
+     GnomeRRDpmsMode current_mode;
+ 
+     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+@@ -1305,11 +1297,9 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
+     }
+ 
+     gdk_error_trap_push ();
+-    rc = DPMSForceLevel (screen->priv->xdisplay, state);
+-    if (gdk_error_trap_pop ())
+-        ret = FALSE;
+-
+-    if (!ret || rc != Success) {
++    /* DPMSForceLevel() return value is often a lie, so ignore it */
++    DPMSForceLevel (screen->priv->xdisplay, state);
++    if (gdk_error_trap_pop ()) {
+         ret = FALSE;
+         g_set_error_literal (error,
+                              GNOME_RR_ERROR,
+@@ -1319,11 +1309,9 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
+     }
+ 
+     gdk_error_trap_push ();
+-    rc = DPMSSetTimeouts (screen->priv->xdisplay, 0, 0, 0);
+-    if (gdk_error_trap_pop ())
+-        ret = FALSE;
+-
+-    if (!ret || rc != Success) {
++    /* DPMSSetTimeouts() return value is often a lie, so ignore it */
++    DPMSSetTimeouts (screen->priv->xdisplay, 0, 0, 0);
++    if (gdk_error_trap_pop ()) {
+         ret = FALSE;
+         g_set_error_literal (error,
+                              GNOME_RR_ERROR,
+-- 
+1.7.7
+

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.2.0-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.2.0-r2.ebuild
similarity index 93%
rename from gnome-base/gnome-desktop/gnome-desktop-3.2.0-r1.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.2.0-r2.ebuild
index ffbc212..3b01e21 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.2.0-r1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.2.0-r2.ebuild
@@ -93,5 +93,9 @@ src_prepare() {
 	# Fix GNomeWallClock fallback code
 	epatch "${FILESDIR}/${P}-GnomeWallClock-fallback.patch"
 
+	# Required for setting DPMS timeouts and modes to work on some hardware;
+	# https://bugzilla.gnome.org/show_bug.cgi?id=660962
+	epatch "${FILESDIR}/${P}-dpmssettimeouts-return-value.patch"
+
 	gnome2_src_prepare
 }