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

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

commit:     e90a114d0f5819701c5113bf436304f9a743ce51
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Oct  4 03:12:28 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Oct  4 03:12:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e90a114d

gnome-base/gnome-desktop: add DPMS timeout clearing and fix wall clock fallback

Add upstream patches to add a gnome_rr_screen_clear_dpms_timeouts()
function to clear DPMS timeouts (needed for gnome-settins-daemon), and
to fix the wall clock fallback code to not hang gnome-screensaver.

---
 ...ome-desktop-3.2.0-GnomeWallClock-fallback.patch |   47 ++++++++
 ...3.2.0-gnome_rr_screen_clear_dpms_timeouts.patch |  116 ++++++++++++++++++++
 ...-3.2.0.ebuild => gnome-desktop-3.2.0-r1.ebuild} |   12 ++-
 3 files changed, 174 insertions(+), 1 deletions(-)

diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-GnomeWallClock-fallback.patch b/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-GnomeWallClock-fallback.patch
new file mode 100644
index 0000000..82b59c5
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-GnomeWallClock-fallback.patch
@@ -0,0 +1,47 @@
+From 311476792ba7948f0eba5e4d9a1328cf3ff18950 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Mon, 3 Oct 2011 16:35:20 -0400
+Subject: [PATCH 2/2] GnomeWallClock: Fix non-Linux fallback code
+
+This fixes the "infinite loop in gnome-screensaver" bug.  Only
+dispatch in cancel on set when the monotonic timeout has expired,
+otherwise we will drop into a tight loop.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660343
+---
+ libgnome-desktop/gnome-datetime-source.c |    9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/libgnome-desktop/gnome-datetime-source.c b/libgnome-desktop/gnome-datetime-source.c
+index 05ec80a..a35d5b3 100644
+--- a/libgnome-desktop/gnome-datetime-source.c
++++ b/libgnome-desktop/gnome-datetime-source.c
+@@ -57,8 +57,10 @@ static gboolean
+ g_datetime_source_is_expired (GDateTimeSource *datetime_source)
+ {
+ 	gint64 real_now;
++	gint64 monotonic_now;
+ 
+ 	real_now = g_get_real_time ();
++	monotonic_now = g_source_get_time ((GSource*)datetime_source);
+ 
+ 	if (datetime_source->initially_expired)
+ 		return TRUE;
+@@ -66,10 +68,11 @@ g_datetime_source_is_expired (GDateTimeSource *datetime_source)
+ 	if (datetime_source->real_expiration <= real_now)
+ 		return TRUE;
+ 
+-	/* We can't really detect without system support when things change;
+-	 * so just trigger every second.
++	/* We can't really detect without system support when things
++	 * change; so just trigger every second (i.e. our wakeup
++	 * expiration)
+ 	 */
+-	if (datetime_source->cancel_on_set)
++	if (datetime_source->cancel_on_set && monotonic_now >= datetime_source->wakeup_expiration)
+ 		return TRUE;
+ 
+ 	return FALSE;
+-- 
+1.7.7
+

diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-gnome_rr_screen_clear_dpms_timeouts.patch b/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-gnome_rr_screen_clear_dpms_timeouts.patch
new file mode 100644
index 0000000..4e6d780
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-gnome_rr_screen_clear_dpms_timeouts.patch
@@ -0,0 +1,116 @@
+From 55daaf0972c0021a20624dcd16df5e14cca5d430 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 3 Oct 2011 16:19:23 +0100
+Subject: [PATCH 1/2] When setting the DPMS mode manually, clear the timeouts
+
+Based on a patch from Michael Vogt, many thanks.
+
+Resolves https://bugzilla.gnome.org/show_bug.cgi?id=660482
+---
+ libgnome-desktop/gnome-rr.c |   57 ++++++++++++++++++++++++++++++++++++++++---
+ 1 files changed, 53 insertions(+), 4 deletions(-)
+
+diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
+index d5f0590..465dee9 100644
+--- a/libgnome-desktop/gnome-rr.c
++++ b/libgnome-desktop/gnome-rr.c
+@@ -1234,7 +1234,36 @@ out:
+ }
+ 
+ /**
++ * gnome_rr_screen_clear_dpms_timeouts:
++ **/
++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;
++        g_set_error_literal (error,
++                             GNOME_RR_ERROR,
++                             GNOME_RR_ERROR_UNKNOWN,
++                             "Could not set DPMS timeouts");
++        goto out;
++    }
++out:
++    return ret;
++}
++
++/**
+  * gnome_rr_screen_set_dpms_mode:
++ *
++ * This method also disables the DPMS timeouts.
+  **/
+ gboolean
+ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
+@@ -1243,6 +1272,7 @@ 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);
+@@ -1251,8 +1281,10 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
+     ret = gnome_rr_screen_get_dpms_mode (screen, &current_mode, error);
+     if (!ret)
+         goto out;
+-    if (current_mode == mode)
++    if (current_mode == mode) {
++        ret = gnome_rr_screen_clear_dpms_timeouts (screen, error);
+         goto out;
++    }
+ 
+     switch (mode) {
+     case GNOME_RR_DPMS_ON:
+@@ -1273,12 +1305,11 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
+     }
+ 
+     gdk_error_trap_push ();
+-    ret = DPMSForceLevel (screen->priv->xdisplay, state);
+-    gdk_flush ();
++    rc = DPMSForceLevel (screen->priv->xdisplay, state);
+     if (gdk_error_trap_pop ())
+         ret = FALSE;
+ 
+-    if (!ret) {
++    if (!ret || rc != Success) {
+         ret = FALSE;
+         g_set_error_literal (error,
+                              GNOME_RR_ERROR,
+@@ -1286,6 +1317,24 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
+                              "Could not change DPMS mode");
+         goto out;
+     }
++
++    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;
++        g_set_error_literal (error,
++                             GNOME_RR_ERROR,
++                             GNOME_RR_ERROR_UNKNOWN,
++                             "Could not set DPMS timeouts");
++        goto out;
++    }
++
++    ret = gnome_rr_screen_clear_dpms_timeouts (screen, error);
++    if (!ret)
++        goto out;
+ out:
+     return ret;
+ }
+-- 
+1.7.7
+

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.2.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.2.0-r1.ebuild
similarity index 89%
rename from gnome-base/gnome-desktop/gnome-desktop-3.2.0.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.2.0-r1.ebuild
index 300f0d8..ffbc212 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.2.0.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.2.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit eutils gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit git-2 gnome2-live
 fi
@@ -85,3 +85,13 @@ src_unpack() {
 			die "ln -sf failed"
 	fi
 }
+
+src_prepare() {
+	# Useful upstream patches, will be in next release
+	# Clear DPMS timeouts, bug #385063
+	epatch "${FILESDIR}/${P}-gnome_rr_screen_clear_dpms_timeouts.patch"
+	# Fix GNomeWallClock fallback code
+	epatch "${FILESDIR}/${P}-GnomeWallClock-fallback.patch"
+
+	gnome2_src_prepare
+}