public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-extra/gnome-screensaver/files/, gnome-extra/gnome-screensaver/
@ 2011-07-20 21:02 Alexandre Restovtsev
  0 siblings, 0 replies; 5+ messages in thread
From: Alexandre Restovtsev @ 2011-07-20 21:02 UTC (permalink / raw
  To: gentoo-commits

commit:     6ada87d8f18ed1e24c2e8db9e77f463d50737c52
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Jul 20 20:46:43 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Jul 20 21:02:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6ada87d8

gnome-extra/gnome-screensaver: 3.0.0 → 3.0.0-r1, fix clock, user switcher

Add an upstream patch for a crash in the user switcher. Add a patch to
fix gnome bug #648145 (the gnome-screensaver clock fails to update after
resuming from suspend).

---
 .../files/gnome-screensaver-3.0.0-ui-timers.patch  |  150 ++++++++++++++++++++
 ...ome-screensaver-3.0.0-user-switcher-crash.patch |   28 ++++
 ....0.ebuild => gnome-screensaver-3.0.0-r1.ebuild} |   10 ++-
 3 files changed, 187 insertions(+), 1 deletions(-)

diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-ui-timers.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-ui-timers.patch
new file mode 100644
index 0000000..759fe7f
--- /dev/null
+++ b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-ui-timers.patch
@@ -0,0 +1,150 @@
+From 669e23233e8364f5ec7478d938df64d820f4b3cc Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Wed, 20 Jul 2011 14:00:43 -0400
+Subject: [PATCH] Add a clock check timer and set watchdog timer in seconds
+ (#648145)
+
+This patch adds two changes:
+* We need a short timer (e.g. 2 seconds) to check that the panel
+  clock has not gotten out of sync with the machine's clock (e.g.
+  when the machine resumes from suspend or hibernate, or if the
+  machine's clock is reset by ntp). Fixes bug #648145.
+* Use 1-second increments for the watchdog timer to save a bit of power.
+---
+ src/gs-window-x11.c |   60 ++++++++++++++++++++++++++++++++++++++++++++------
+ 1 files changed, 52 insertions(+), 8 deletions(-)
+
+diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
+index 5120476..7546627 100644
+--- a/src/gs-window-x11.c
++++ b/src/gs-window-x11.c
+@@ -26,6 +26,7 @@
+ #include <errno.h>
+ #include <sys/wait.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+@@ -100,6 +101,9 @@ struct GSWindowPrivate
+         guint      watchdog_timer_id;
+         guint      info_bar_timer_id;
+         guint      clock_update_id;
++        guint      clock_check_timer_id;
++
++        GDateTime *local_date_time;
+ 
+         gint       lock_pid;
+         gint       lock_watch_id;
+@@ -151,6 +155,9 @@ G_DEFINE_TYPE (GSWindow, gs_window, GTK_TYPE_WINDOW)
+ 
+ static void queue_clock_update (GSWindow *window);
+ 
++static void remove_clock_check_timer (GSWindow *window);
++static void add_clock_check_timer (GSWindow *window);
++
+ static void
+ set_invisible_cursor (GdkWindow *window,
+                       gboolean   invisible)
+@@ -481,9 +488,9 @@ static void
+ add_watchdog_timer (GSWindow *window,
+                     glong     timeout)
+ {
+-        window->priv->watchdog_timer_id = g_timeout_add (timeout,
+-                                                         (GSourceFunc)watchdog_timer,
+-                                                         window);
++        window->priv->watchdog_timer_id = g_timeout_add_seconds (timeout,
++                                                                 (GSourceFunc)watchdog_timer,
++                                                                 window);
+ }
+ 
+ static void
+@@ -671,7 +678,10 @@ gs_window_real_show (GtkWidget *widget)
+         window->priv->timer = g_timer_new ();
+ 
+         remove_watchdog_timer (window);
+-        add_watchdog_timer (window, 30000);
++        add_watchdog_timer (window, 30);
++
++        remove_clock_check_timer (window);
++        add_clock_check_timer (window);
+ 
+         select_popup_events ();
+         window_select_shape_events (window);
+@@ -2191,7 +2201,6 @@ update_clock (GSWindow *window)
+         const char *clock_format;
+         char *text;
+         char *markup;
+-        GDateTime *dt;
+ 
+         /* clock */
+         if (window->priv->clock_format == G_DESKTOP_CLOCK_FORMAT_24H)
+@@ -2201,13 +2210,13 @@ update_clock (GSWindow *window)
+                 /* Translators, this is the 12h date format used in the panel clock */
+                 clock_format = _("%a %l:%M %p");
+ 
+-        dt = g_date_time_new_now_local ();
+-        text = g_date_time_format (dt, clock_format);
++        g_date_time_unref (window->priv->local_date_time);
++        window->priv->local_date_time = g_date_time_new_now_local ();
++        text = g_date_time_format (window->priv->local_date_time, clock_format);
+         markup = g_strdup_printf ("<b><span foreground=\"#ccc\">%s</span></b>", text);
+         gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup);
+         g_free (markup);
+         g_free (text);
+-        g_date_time_unref (dt);
+ }
+ 
+ 
+@@ -2234,6 +2243,38 @@ queue_clock_update (GSWindow *window)
+         window->priv->clock_update_id = g_timeout_add (timeouttime, (GSourceFunc)update_clock_timer, window);
+ }
+ 
++/* check that our clock hasn't gotten out of sync with the machine's clock
++   (e.g. when the machine resumes from suspend or hibernate) */
++static gboolean
++clock_check_timer (GSWindow *window)
++{
++        GDateTime* dt;
++
++        dt = g_date_time_new_now_local ();
++        if (labs(g_date_time_difference(dt, window->priv->local_date_time)) >
++            G_USEC_PER_SEC * 60)
++                update_clock_timer (window);
++        g_date_time_unref (dt);
++        return TRUE;
++}
++
++static void
++remove_clock_check_timer (GSWindow *window)
++{
++        if (window->priv->clock_check_timer_id != 0) {
++                g_source_remove (window->priv->clock_check_timer_id);
++                window->priv->clock_check_timer_id = 0;
++        }
++}
++
++static void
++add_clock_check_timer (GSWindow *window)
++{
++        window->priv->clock_check_timer_id = g_timeout_add_seconds (2,
++                                                                    (GSourceFunc)clock_check_timer,
++                                                                    window);
++}
++
+ static char *
+ get_user_display_name (void)
+ {
+@@ -2448,6 +2489,9 @@ gs_window_finalize (GObject *object)
+ 
+         remove_watchdog_timer (window);
+         remove_popup_dialog_idle (window);
++        remove_clock_check_timer (window);
++
++        g_date_time_unref (window->priv->local_date_time);
+ 
+         if (window->priv->timer) {
+                 g_timer_destroy (window->priv->timer);
+-- 
+1.7.6
+

diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-user-switcher-crash.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-user-switcher-crash.patch
new file mode 100644
index 0000000..bfdea6e
--- /dev/null
+++ b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-user-switcher-crash.patch
@@ -0,0 +1,28 @@
+From 338b86c4f0c2cdc4241dbf5cda913f0184afc105 Mon Sep 17 00:00:00 2001
+From: Huzaifa Sidhpurwala <huzaifas@redhat.com>
+Date: Tue, 26 Apr 2011 17:15:56 +0000
+Subject: dialog: Fix crash in user switcher code
+
+The user switch button currently causes the lock dialog to crash
+because of an inverted conditional in the error checking code.
+
+This commit addresses the crash by performing the proper check
+in the conditional.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=648234
+---
+diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
+index 67ab36a..6706fde 100644
+--- a/src/gs-lock-plug.c
++++ b/src/gs-lock-plug.c
+@@ -167,7 +167,7 @@ do_user_switch (GSLockPlug *plug)
+         g_object_unref (context);
+         g_object_unref (app);
+ 
+-        if (!error) {
++        if (error != NULL) {
+                 gs_debug ("Unable to start GDM greeter: %s", error->message);
+                 g_error_free (error);
+         }
+--
+cgit v0.9

diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0-r1.ebuild
similarity index 86%
rename from gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0.ebuild
rename to gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0-r1.ebuild
index 7c17349..ab6bf7e 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI="3"
 GCONF_DEBUG="yes"
 
-inherit gnome2
+inherit eutils gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -69,3 +69,11 @@ pkg_setup() {
 	# xscreensaver and custom screensaver capability removed
 	# poke and inhibit commands were also removed, bug 579430
 }
+
+src_prepare() {
+	# Upstream patch to fix crash in user switcher; will be in next release
+	epatch "${FILESDIR}/${P}-user-switcher-crash.patch"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=648145
+	epatch "${FILESDIR}/${PN}-3.0.0-ui-timers.patch"
+}



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-extra/gnome-screensaver/files/, gnome-extra/gnome-screensaver/
@ 2011-07-25 22:50 Alexandre Restovtsev
  0 siblings, 0 replies; 5+ messages in thread
From: Alexandre Restovtsev @ 2011-07-25 22:50 UTC (permalink / raw
  To: gentoo-commits

commit:     c5be2daa0257553922ed6c9a2d339cb0bc1b9c23
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Jul 25 22:44:33 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Jul 25 22:49:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c5be2daa

gnome-extra/gnome-screensaver: update clock and timer patch

Update the clock and timer patch to the version committed by upstream,
see gnome bug 648145. No revision number bump because the change is
not noticeable for gnome-screensaver users.

---
 .../files/gnome-screensaver-3.0.0-clock-skew.patch |  100 +++++++++++++
 .../files/gnome-screensaver-3.0.0-ui-timers.patch  |  150 --------------------
 ...me-screensaver-3.0.0-watchdog-add_seconds.patch |   44 ++++++
 .../gnome-screensaver-3.0.0-r1.ebuild              |    8 +-
 4 files changed, 150 insertions(+), 152 deletions(-)

diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-clock-skew.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-clock-skew.patch
new file mode 100644
index 0000000..8a453ef
--- /dev/null
+++ b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-clock-skew.patch
@@ -0,0 +1,100 @@
+From 9f98f3a20b5eec6a1fa13e5a4972eadc2d728acf Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Wed, 20 Jul 2011 18:00:43 +0000
+Subject: gs-window-x11: shorten clock timeout to detect skew
+
+The timer for the panel clock currently wakes up once a minute in
+the default case.  This means, if the clock changes while the
+screen is locked (say from a resume following suspend, or from
+ntp) then it becomes out of date for up to a minute.
+
+There's no good way right now to detect when clock skew happens,
+so this commit changes the timeout to expire every couple of
+seconds instead of once a minute.
+
+Minor-Updates-By: Ray Strode <rstrode@redhat.com>
+
+http://bugzilla.gnome.org/show_bug.cgi?id=648145
+---
+diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
+index e7a475e..a723c4d 100644
+--- a/src/gs-window-x11.c
++++ b/src/gs-window-x11.c
+@@ -26,6 +26,7 @@
+ #include <errno.h>
+ #include <sys/wait.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+@@ -101,6 +102,8 @@ struct GSWindowPrivate
+         guint      info_bar_timer_id;
+         guint      clock_update_id;
+ 
++        gint64     clock_update_time;
++
+         gint       lock_pid;
+         gint       lock_watch_id;
+         gint       dialog_response;
+@@ -2201,7 +2204,8 @@ update_clock (GSWindow *window)
+                 /* Translators, this is the 12h date format used in the panel clock */
+                 clock_format = _("%a %l:%M %p");
+ 
+-        dt = g_date_time_new_now_local ();
++        window->priv->clock_update_time = g_get_real_time ();
++        dt = g_date_time_new_from_unix_local (window->priv->clock_update_time / G_USEC_PER_SEC);
+         text = g_date_time_format (dt, clock_format);
+         markup = g_strdup_printf ("<b><span foreground=\"#ccc\">%s</span></b>", text);
+         gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup);
+@@ -2219,6 +2223,28 @@ update_clock_timer (GSWindow *window)
+         return FALSE;
+ }
+ 
++static gboolean
++check_clock_timer (GSWindow *window)
++{
++        /* Update the panel clock when necessary.
++           This happens:
++
++           - Once a minute in the normal case
++           - When the machine resumes from suspend
++           - When the system time is adjusted
++
++           Right now this function is called much more frequently than any of the
++           above 3 events happen (see queue_clock_update ()).
++
++           We can wake up less often if bug 655129 gets fixed.  */
++        if (ABS (g_get_real_time () - window->priv->clock_update_time) > 60 * G_USEC_PER_SEC) {
++                update_clock (window);
++        }
++
++        queue_clock_update (window);
++        return FALSE;
++}
++
+ static void
+ queue_clock_update (GSWindow *window)
+ {
+@@ -2228,10 +2254,17 @@ queue_clock_update (GSWindow *window)
+         gettimeofday (&tv, NULL);
+         timeouttime = (G_USEC_PER_SEC - tv.tv_usec) / 1000 + 1;
+ 
+-        /* timeout of one minute if we don't care about the seconds */
++        /* time until next minute */
+         timeouttime += 1000 * (59 - tv.tv_sec % 60);
+ 
+-        window->priv->clock_update_id = g_timeout_add (timeouttime, (GSourceFunc)update_clock_timer, window);
++        /* If we are more than 2.5 seconds from the start of the next minute,
++           schedule less precise but more power friendly 2 second add_seconds
++           timeout to check if the system realtime clock has changed under us. */
++        if (timeouttime > 2500) {
++                window->priv->clock_update_id = g_timeout_add_seconds (2, (GSourceFunc)check_clock_timer, window);
++        } else {
++                window->priv->clock_update_id = g_timeout_add (timeouttime, (GSourceFunc)update_clock_timer, window);
++        }
+ }
+ 
+ static char *
+--
+cgit v0.9

diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-ui-timers.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-ui-timers.patch
deleted file mode 100644
index 759fe7f..0000000
--- a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-ui-timers.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 669e23233e8364f5ec7478d938df64d820f4b3cc Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Wed, 20 Jul 2011 14:00:43 -0400
-Subject: [PATCH] Add a clock check timer and set watchdog timer in seconds
- (#648145)
-
-This patch adds two changes:
-* We need a short timer (e.g. 2 seconds) to check that the panel
-  clock has not gotten out of sync with the machine's clock (e.g.
-  when the machine resumes from suspend or hibernate, or if the
-  machine's clock is reset by ntp). Fixes bug #648145.
-* Use 1-second increments for the watchdog timer to save a bit of power.
----
- src/gs-window-x11.c |   60 ++++++++++++++++++++++++++++++++++++++++++++------
- 1 files changed, 52 insertions(+), 8 deletions(-)
-
-diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
-index 5120476..7546627 100644
---- a/src/gs-window-x11.c
-+++ b/src/gs-window-x11.c
-@@ -26,6 +26,7 @@
- #include <errno.h>
- #include <sys/wait.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
-@@ -100,6 +101,9 @@ struct GSWindowPrivate
-         guint      watchdog_timer_id;
-         guint      info_bar_timer_id;
-         guint      clock_update_id;
-+        guint      clock_check_timer_id;
-+
-+        GDateTime *local_date_time;
- 
-         gint       lock_pid;
-         gint       lock_watch_id;
-@@ -151,6 +155,9 @@ G_DEFINE_TYPE (GSWindow, gs_window, GTK_TYPE_WINDOW)
- 
- static void queue_clock_update (GSWindow *window);
- 
-+static void remove_clock_check_timer (GSWindow *window);
-+static void add_clock_check_timer (GSWindow *window);
-+
- static void
- set_invisible_cursor (GdkWindow *window,
-                       gboolean   invisible)
-@@ -481,9 +488,9 @@ static void
- add_watchdog_timer (GSWindow *window,
-                     glong     timeout)
- {
--        window->priv->watchdog_timer_id = g_timeout_add (timeout,
--                                                         (GSourceFunc)watchdog_timer,
--                                                         window);
-+        window->priv->watchdog_timer_id = g_timeout_add_seconds (timeout,
-+                                                                 (GSourceFunc)watchdog_timer,
-+                                                                 window);
- }
- 
- static void
-@@ -671,7 +678,10 @@ gs_window_real_show (GtkWidget *widget)
-         window->priv->timer = g_timer_new ();
- 
-         remove_watchdog_timer (window);
--        add_watchdog_timer (window, 30000);
-+        add_watchdog_timer (window, 30);
-+
-+        remove_clock_check_timer (window);
-+        add_clock_check_timer (window);
- 
-         select_popup_events ();
-         window_select_shape_events (window);
-@@ -2191,7 +2201,6 @@ update_clock (GSWindow *window)
-         const char *clock_format;
-         char *text;
-         char *markup;
--        GDateTime *dt;
- 
-         /* clock */
-         if (window->priv->clock_format == G_DESKTOP_CLOCK_FORMAT_24H)
-@@ -2201,13 +2210,13 @@ update_clock (GSWindow *window)
-                 /* Translators, this is the 12h date format used in the panel clock */
-                 clock_format = _("%a %l:%M %p");
- 
--        dt = g_date_time_new_now_local ();
--        text = g_date_time_format (dt, clock_format);
-+        g_date_time_unref (window->priv->local_date_time);
-+        window->priv->local_date_time = g_date_time_new_now_local ();
-+        text = g_date_time_format (window->priv->local_date_time, clock_format);
-         markup = g_strdup_printf ("<b><span foreground=\"#ccc\">%s</span></b>", text);
-         gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup);
-         g_free (markup);
-         g_free (text);
--        g_date_time_unref (dt);
- }
- 
- 
-@@ -2234,6 +2243,38 @@ queue_clock_update (GSWindow *window)
-         window->priv->clock_update_id = g_timeout_add (timeouttime, (GSourceFunc)update_clock_timer, window);
- }
- 
-+/* check that our clock hasn't gotten out of sync with the machine's clock
-+   (e.g. when the machine resumes from suspend or hibernate) */
-+static gboolean
-+clock_check_timer (GSWindow *window)
-+{
-+        GDateTime* dt;
-+
-+        dt = g_date_time_new_now_local ();
-+        if (labs(g_date_time_difference(dt, window->priv->local_date_time)) >
-+            G_USEC_PER_SEC * 60)
-+                update_clock_timer (window);
-+        g_date_time_unref (dt);
-+        return TRUE;
-+}
-+
-+static void
-+remove_clock_check_timer (GSWindow *window)
-+{
-+        if (window->priv->clock_check_timer_id != 0) {
-+                g_source_remove (window->priv->clock_check_timer_id);
-+                window->priv->clock_check_timer_id = 0;
-+        }
-+}
-+
-+static void
-+add_clock_check_timer (GSWindow *window)
-+{
-+        window->priv->clock_check_timer_id = g_timeout_add_seconds (2,
-+                                                                    (GSourceFunc)clock_check_timer,
-+                                                                    window);
-+}
-+
- static char *
- get_user_display_name (void)
- {
-@@ -2448,6 +2489,9 @@ gs_window_finalize (GObject *object)
- 
-         remove_watchdog_timer (window);
-         remove_popup_dialog_idle (window);
-+        remove_clock_check_timer (window);
-+
-+        g_date_time_unref (window->priv->local_date_time);
- 
-         if (window->priv->timer) {
-                 g_timer_destroy (window->priv->timer);
--- 
-1.7.6
-

diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-watchdog-add_seconds.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-watchdog-add_seconds.patch
new file mode 100644
index 0000000..4dddf15
--- /dev/null
+++ b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-watchdog-add_seconds.patch
@@ -0,0 +1,44 @@
+From 742b77d217dced55b8b07616bf6a70ec167ffc01 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Mon, 25 Jul 2011 15:03:00 +0000
+Subject: gs-window-x11: use g_timeout_add_seconds for watch dog
+
+The watch dog timer runs sort of arbitrarily every 30 seconds.
+We don't need much precision on when it runs, it just needs to
+run once in a while.
+
+This commit changes the timer setup call from g_timeout_add
+to g_timeout_add_seconds so the watch dog will wake up with
+any other pending timeouts that happen to expire around the same
+time, saving a little power.
+
+http://bugzilla.gnome.org/show_bug.cgi?id=648145
+---
+diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
+index 5120476..e7a475e 100644
+--- a/src/gs-window-x11.c
++++ b/src/gs-window-x11.c
+@@ -481,9 +481,9 @@ static void
+ add_watchdog_timer (GSWindow *window,
+                     glong     timeout)
+ {
+-        window->priv->watchdog_timer_id = g_timeout_add (timeout,
+-                                                         (GSourceFunc)watchdog_timer,
+-                                                         window);
++        window->priv->watchdog_timer_id = g_timeout_add_seconds (timeout,
++                                                                 (GSourceFunc)watchdog_timer,
++                                                                 window);
+ }
+ 
+ static void
+@@ -671,7 +671,7 @@ gs_window_real_show (GtkWidget *widget)
+         window->priv->timer = g_timer_new ();
+ 
+         remove_watchdog_timer (window);
+-        add_watchdog_timer (window, 30000);
++        add_watchdog_timer (window, 30);
+ 
+         select_popup_events ();
+         window_select_shape_events (window);
+--
+cgit v0.9

diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0-r1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0-r1.ebuild
index ab6bf7e..d6a1971 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0-r1.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0-r1.ebuild
@@ -74,6 +74,10 @@ src_prepare() {
 	# Upstream patch to fix crash in user switcher; will be in next release
 	epatch "${FILESDIR}/${P}-user-switcher-crash.patch"
 
-	# https://bugzilla.gnome.org/show_bug.cgi?id=648145
-	epatch "${FILESDIR}/${PN}-3.0.0-ui-timers.patch"
+	# Upstream patches to fix timers and update the clock properly; will be
+	# in next release
+	epatch "${FILESDIR}/${P}-watchdog-add_seconds.patch"
+	epatch "${FILESDIR}/${P}-clock-skew.patch"
+
+	gnome2_src_prepare
 }



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-extra/gnome-screensaver/files/, gnome-extra/gnome-screensaver/
@ 2011-08-19  1:16 Alexandre Restovtsev
  0 siblings, 0 replies; 5+ messages in thread
From: Alexandre Restovtsev @ 2011-08-19  1:16 UTC (permalink / raw
  To: gentoo-commits

commit:     c90a904239fc6f4a2361a88c92520d604ce419e0
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Fri Aug 19 01:14:19 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Aug 19 01:14:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c90a9042

gnome-extra/gnome-screensaver: 3.0.0-r1 → 3.1.5

Bump to gnome-3.1.x version. Patches have been applied upstream.

---
 .../files/gnome-screensaver-3.0.0-clock-skew.patch |  100 --------------------
 ...ome-screensaver-3.0.0-user-switcher-crash.patch |   28 ------
 ...me-screensaver-3.0.0-watchdog-add_seconds.patch |   44 ---------
 ....0-r1.ebuild => gnome-screensaver-3.1.5.ebuild} |   17 +---
 .../gnome-screensaver-9999.ebuild                  |    3 +-
 5 files changed, 3 insertions(+), 189 deletions(-)

diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-clock-skew.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-clock-skew.patch
deleted file mode 100644
index 8a453ef..0000000
--- a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-clock-skew.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 9f98f3a20b5eec6a1fa13e5a4972eadc2d728acf Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Wed, 20 Jul 2011 18:00:43 +0000
-Subject: gs-window-x11: shorten clock timeout to detect skew
-
-The timer for the panel clock currently wakes up once a minute in
-the default case.  This means, if the clock changes while the
-screen is locked (say from a resume following suspend, or from
-ntp) then it becomes out of date for up to a minute.
-
-There's no good way right now to detect when clock skew happens,
-so this commit changes the timeout to expire every couple of
-seconds instead of once a minute.
-
-Minor-Updates-By: Ray Strode <rstrode@redhat.com>
-
-http://bugzilla.gnome.org/show_bug.cgi?id=648145
----
-diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
-index e7a475e..a723c4d 100644
---- a/src/gs-window-x11.c
-+++ b/src/gs-window-x11.c
-@@ -26,6 +26,7 @@
- #include <errno.h>
- #include <sys/wait.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
-@@ -101,6 +102,8 @@ struct GSWindowPrivate
-         guint      info_bar_timer_id;
-         guint      clock_update_id;
- 
-+        gint64     clock_update_time;
-+
-         gint       lock_pid;
-         gint       lock_watch_id;
-         gint       dialog_response;
-@@ -2201,7 +2204,8 @@ update_clock (GSWindow *window)
-                 /* Translators, this is the 12h date format used in the panel clock */
-                 clock_format = _("%a %l:%M %p");
- 
--        dt = g_date_time_new_now_local ();
-+        window->priv->clock_update_time = g_get_real_time ();
-+        dt = g_date_time_new_from_unix_local (window->priv->clock_update_time / G_USEC_PER_SEC);
-         text = g_date_time_format (dt, clock_format);
-         markup = g_strdup_printf ("<b><span foreground=\"#ccc\">%s</span></b>", text);
-         gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup);
-@@ -2219,6 +2223,28 @@ update_clock_timer (GSWindow *window)
-         return FALSE;
- }
- 
-+static gboolean
-+check_clock_timer (GSWindow *window)
-+{
-+        /* Update the panel clock when necessary.
-+           This happens:
-+
-+           - Once a minute in the normal case
-+           - When the machine resumes from suspend
-+           - When the system time is adjusted
-+
-+           Right now this function is called much more frequently than any of the
-+           above 3 events happen (see queue_clock_update ()).
-+
-+           We can wake up less often if bug 655129 gets fixed.  */
-+        if (ABS (g_get_real_time () - window->priv->clock_update_time) > 60 * G_USEC_PER_SEC) {
-+                update_clock (window);
-+        }
-+
-+        queue_clock_update (window);
-+        return FALSE;
-+}
-+
- static void
- queue_clock_update (GSWindow *window)
- {
-@@ -2228,10 +2254,17 @@ queue_clock_update (GSWindow *window)
-         gettimeofday (&tv, NULL);
-         timeouttime = (G_USEC_PER_SEC - tv.tv_usec) / 1000 + 1;
- 
--        /* timeout of one minute if we don't care about the seconds */
-+        /* time until next minute */
-         timeouttime += 1000 * (59 - tv.tv_sec % 60);
- 
--        window->priv->clock_update_id = g_timeout_add (timeouttime, (GSourceFunc)update_clock_timer, window);
-+        /* If we are more than 2.5 seconds from the start of the next minute,
-+           schedule less precise but more power friendly 2 second add_seconds
-+           timeout to check if the system realtime clock has changed under us. */
-+        if (timeouttime > 2500) {
-+                window->priv->clock_update_id = g_timeout_add_seconds (2, (GSourceFunc)check_clock_timer, window);
-+        } else {
-+                window->priv->clock_update_id = g_timeout_add (timeouttime, (GSourceFunc)update_clock_timer, window);
-+        }
- }
- 
- static char *
---
-cgit v0.9

diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-user-switcher-crash.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-user-switcher-crash.patch
deleted file mode 100644
index bfdea6e..0000000
--- a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-user-switcher-crash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 338b86c4f0c2cdc4241dbf5cda913f0184afc105 Mon Sep 17 00:00:00 2001
-From: Huzaifa Sidhpurwala <huzaifas@redhat.com>
-Date: Tue, 26 Apr 2011 17:15:56 +0000
-Subject: dialog: Fix crash in user switcher code
-
-The user switch button currently causes the lock dialog to crash
-because of an inverted conditional in the error checking code.
-
-This commit addresses the crash by performing the proper check
-in the conditional.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=648234
----
-diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
-index 67ab36a..6706fde 100644
---- a/src/gs-lock-plug.c
-+++ b/src/gs-lock-plug.c
-@@ -167,7 +167,7 @@ do_user_switch (GSLockPlug *plug)
-         g_object_unref (context);
-         g_object_unref (app);
- 
--        if (!error) {
-+        if (error != NULL) {
-                 gs_debug ("Unable to start GDM greeter: %s", error->message);
-                 g_error_free (error);
-         }
---
-cgit v0.9

diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-watchdog-add_seconds.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-watchdog-add_seconds.patch
deleted file mode 100644
index 4dddf15..0000000
--- a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-watchdog-add_seconds.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 742b77d217dced55b8b07616bf6a70ec167ffc01 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Mon, 25 Jul 2011 15:03:00 +0000
-Subject: gs-window-x11: use g_timeout_add_seconds for watch dog
-
-The watch dog timer runs sort of arbitrarily every 30 seconds.
-We don't need much precision on when it runs, it just needs to
-run once in a while.
-
-This commit changes the timer setup call from g_timeout_add
-to g_timeout_add_seconds so the watch dog will wake up with
-any other pending timeouts that happen to expire around the same
-time, saving a little power.
-
-http://bugzilla.gnome.org/show_bug.cgi?id=648145
----
-diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
-index 5120476..e7a475e 100644
---- a/src/gs-window-x11.c
-+++ b/src/gs-window-x11.c
-@@ -481,9 +481,9 @@ static void
- add_watchdog_timer (GSWindow *window,
-                     glong     timeout)
- {
--        window->priv->watchdog_timer_id = g_timeout_add (timeout,
--                                                         (GSourceFunc)watchdog_timer,
--                                                         window);
-+        window->priv->watchdog_timer_id = g_timeout_add_seconds (timeout,
-+                                                                 (GSourceFunc)watchdog_timer,
-+                                                                 window);
- }
- 
- static void
-@@ -671,7 +671,7 @@ gs_window_real_show (GtkWidget *widget)
-         window->priv->timer = g_timer_new ();
- 
-         remove_watchdog_timer (window);
--        add_watchdog_timer (window, 30000);
-+        add_watchdog_timer (window, 30);
- 
-         select_popup_events ();
-         window_select_shape_events (window);
---
-cgit v0.9

diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0-r1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-3.1.5.ebuild
similarity index 79%
rename from gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0-r1.ebuild
rename to gnome-extra/gnome-screensaver/gnome-screensaver-3.1.5.ebuild
index d6a1971..cdbada9 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0-r1.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-3.1.5.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2.ebuild,v 1.2 2010/11/02 02:33:58 ford_prefect Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
 
-inherit eutils gnome2
+inherit gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -26,7 +26,6 @@ RDEPEND="
 	>=dev-libs/glib-2.25.6:2
 	>=x11-libs/gtk+-2.99.3:3
 	>=gnome-base/gnome-desktop-2.91.5:3
-	>=gnome-base/gnome-menus-2.12
 	>=gnome-base/gsettings-desktop-schemas-0.1.7
 	>=gnome-base/libgnomekbd-0.1
 	>=dev-libs/dbus-glib-0.71
@@ -69,15 +68,3 @@ pkg_setup() {
 	# xscreensaver and custom screensaver capability removed
 	# poke and inhibit commands were also removed, bug 579430
 }
-
-src_prepare() {
-	# Upstream patch to fix crash in user switcher; will be in next release
-	epatch "${FILESDIR}/${P}-user-switcher-crash.patch"
-
-	# Upstream patches to fix timers and update the clock properly; will be
-	# in next release
-	epatch "${FILESDIR}/${P}-watchdog-add_seconds.patch"
-	epatch "${FILESDIR}/${P}-clock-skew.patch"
-
-	gnome2_src_prepare
-}

diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-9999.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-9999.ebuild
index 7c17349..cdbada9 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-9999.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2.ebuild,v 1.2 2010/11/02 02:33:58 ford_prefect Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
 
 inherit gnome2
@@ -26,7 +26,6 @@ RDEPEND="
 	>=dev-libs/glib-2.25.6:2
 	>=x11-libs/gtk+-2.99.3:3
 	>=gnome-base/gnome-desktop-2.91.5:3
-	>=gnome-base/gnome-menus-2.12
 	>=gnome-base/gsettings-desktop-schemas-0.1.7
 	>=gnome-base/libgnomekbd-0.1
 	>=dev-libs/dbus-glib-0.71



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-extra/gnome-screensaver/files/, gnome-extra/gnome-screensaver/
@ 2011-09-15 13:08 Alexandre Restovtsev
  0 siblings, 0 replies; 5+ messages in thread
From: Alexandre Restovtsev @ 2011-09-15 13:08 UTC (permalink / raw
  To: gentoo-commits

commit:     6931fe2490ea09a3f75e0ab34e4bbe60554c97bf
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Thu Sep 15 12:44:48 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Sep 15 12:44:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6931fe24

gnome-extra/gnome-screensaver: 3.1.90 → 3.1.91

Version bump with a new, more efficient wall clock.

---
 .../gnome-screensaver-3.1.91-clock-update.patch    |   36 ++++++++++++++++++++
 ...1.90.ebuild => gnome-screensaver-3.1.91.ebuild} |   13 +++++--
 .../gnome-screensaver-9999.ebuild                  |    5 ++-
 3 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.1.91-clock-update.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.1.91-clock-update.patch
new file mode 100644
index 0000000..68b64de
--- /dev/null
+++ b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.1.91-clock-update.patch
@@ -0,0 +1,36 @@
+From e2b44ece90711752dfe970f64b290d7921119399 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Sun, 11 Sep 2011 13:40:00 +0000
+Subject: Fix clock to actually update every minute
+
+https://bugzilla.gnome.org/show_bug.cgi?id=658746
+---
+diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
+index a0de35a..6956874 100644
+--- a/src/gs-window-x11.c
++++ b/src/gs-window-x11.c
+@@ -2190,6 +2190,14 @@ update_clock (GSWindow *window)
+         g_free (markup);
+ }
+ 
++static void
++on_clock_changed (GnomeWallClock *clock,
++                  GParamSpec     *pspec,
++                  gpointer        user_data)
++{
++        update_clock (GS_WINDOW (user_data));
++}
++
+ static char *
+ get_user_display_name (void)
+ {
+@@ -2339,6 +2347,7 @@ gs_window_init (GSWindow *window)
+         create_info_bar (window);
+ 
+         window->priv->clock_tracker = g_object_new (GNOME_TYPE_WALL_CLOCK, NULL);
++        g_signal_connect (window->priv->clock_tracker, "notify::clock", G_CALLBACK (on_clock_changed), window);
+         update_clock (window);
+ 
+         force_no_pixmap_background (window->priv->drawing_area);
+--
+cgit v0.9.0.2

diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-3.1.90.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-3.1.91.ebuild
similarity index 85%
rename from gnome-extra/gnome-screensaver/gnome-screensaver-3.1.90.ebuild
rename to gnome-extra/gnome-screensaver/gnome-screensaver-3.1.91.ebuild
index cdbada9..3d9fd1a 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-3.1.90.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-3.1.91.ebuild
@@ -5,7 +5,7 @@
 EAPI="4"
 GCONF_DEBUG="yes"
 
-inherit gnome2
+inherit eutils gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -25,7 +25,7 @@ fi
 RDEPEND="
 	>=dev-libs/glib-2.25.6:2
 	>=x11-libs/gtk+-2.99.3:3
-	>=gnome-base/gnome-desktop-2.91.5:3
+	>=gnome-base/gnome-desktop-3.1.91:3
 	>=gnome-base/gsettings-desktop-schemas-0.1.7
 	>=gnome-base/libgnomekbd-0.1
 	>=dev-libs/dbus-glib-0.71
@@ -64,7 +64,14 @@ pkg_setup() {
 		--with-pam-prefix=/etc
 		--with-xf86gamma-ext
 		--with-kbd-layout-indicator
-		--disable-schemas-compile"
+		--disable-schemas-compile
+		--disable-maintainer-mode"
 	# xscreensaver and custom screensaver capability removed
 	# poke and inhibit commands were also removed, bug 579430
 }
+
+src_prepare() {
+	gnome2_src_prepare
+	# Upstream patch to fix clock update, will be in next release
+	epatch "${FILESDIR}/${P}-clock-update.patch"
+}

diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-9999.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-9999.ebuild
index cdbada9..6811b11 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-9999.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-9999.ebuild
@@ -25,7 +25,7 @@ fi
 RDEPEND="
 	>=dev-libs/glib-2.25.6:2
 	>=x11-libs/gtk+-2.99.3:3
-	>=gnome-base/gnome-desktop-2.91.5:3
+	>=gnome-base/gnome-desktop-3.1.91:3
 	>=gnome-base/gsettings-desktop-schemas-0.1.7
 	>=gnome-base/libgnomekbd-0.1
 	>=dev-libs/dbus-glib-0.71
@@ -64,7 +64,8 @@ pkg_setup() {
 		--with-pam-prefix=/etc
 		--with-xf86gamma-ext
 		--with-kbd-layout-indicator
-		--disable-schemas-compile"
+		--disable-schemas-compile
+		--disable-maintainer-mode"
 	# xscreensaver and custom screensaver capability removed
 	# poke and inhibit commands were also removed, bug 579430
 }



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-extra/gnome-screensaver/files/, gnome-extra/gnome-screensaver/
@ 2011-09-28  1:52 Alexandre Restovtsev
  0 siblings, 0 replies; 5+ messages in thread
From: Alexandre Restovtsev @ 2011-09-28  1:52 UTC (permalink / raw
  To: gentoo-commits

commit:     6a5c242c300a349bead881f1be90e7eccf5336f8
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep 28 01:50:08 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Sep 28 01:50:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6a5c242c

gnome-extra/gnome-screensaver: 3.1.91 → 3.2.0

Bump. Patch was applied upstream.

---
 .../gnome-screensaver-3.1.91-clock-update.patch    |   36 --------------------
 ....1.91.ebuild => gnome-screensaver-3.2.0.ebuild} |    8 +----
 2 files changed, 1 insertions(+), 43 deletions(-)

diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.1.91-clock-update.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.1.91-clock-update.patch
deleted file mode 100644
index 68b64de..0000000
--- a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.1.91-clock-update.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From e2b44ece90711752dfe970f64b290d7921119399 Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Sun, 11 Sep 2011 13:40:00 +0000
-Subject: Fix clock to actually update every minute
-
-https://bugzilla.gnome.org/show_bug.cgi?id=658746
----
-diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
-index a0de35a..6956874 100644
---- a/src/gs-window-x11.c
-+++ b/src/gs-window-x11.c
-@@ -2190,6 +2190,14 @@ update_clock (GSWindow *window)
-         g_free (markup);
- }
- 
-+static void
-+on_clock_changed (GnomeWallClock *clock,
-+                  GParamSpec     *pspec,
-+                  gpointer        user_data)
-+{
-+        update_clock (GS_WINDOW (user_data));
-+}
-+
- static char *
- get_user_display_name (void)
- {
-@@ -2339,6 +2347,7 @@ gs_window_init (GSWindow *window)
-         create_info_bar (window);
- 
-         window->priv->clock_tracker = g_object_new (GNOME_TYPE_WALL_CLOCK, NULL);
-+        g_signal_connect (window->priv->clock_tracker, "notify::clock", G_CALLBACK (on_clock_changed), window);
-         update_clock (window);
- 
-         force_no_pixmap_background (window->priv->drawing_area);
---
-cgit v0.9.0.2

diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-3.1.91.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-3.2.0.ebuild
similarity index 90%
rename from gnome-extra/gnome-screensaver/gnome-screensaver-3.1.91.ebuild
rename to gnome-extra/gnome-screensaver/gnome-screensaver-3.2.0.ebuild
index 3d9fd1a..6811b11 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-3.1.91.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-3.2.0.ebuild
@@ -5,7 +5,7 @@
 EAPI="4"
 GCONF_DEBUG="yes"
 
-inherit eutils gnome2
+inherit gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -69,9 +69,3 @@ pkg_setup() {
 	# xscreensaver and custom screensaver capability removed
 	# poke and inhibit commands were also removed, bug 579430
 }
-
-src_prepare() {
-	gnome2_src_prepare
-	# Upstream patch to fix clock update, will be in next release
-	epatch "${FILESDIR}/${P}-clock-update.patch"
-}



^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2011-09-28  1:52 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-25 22:50 [gentoo-commits] proj/gnome:gnome-next commit in: gnome-extra/gnome-screensaver/files/, gnome-extra/gnome-screensaver/ Alexandre Restovtsev
  -- strict thread matches above, loose matches on Subject: below --
2011-09-28  1:52 Alexandre Restovtsev
2011-09-15 13:08 Alexandre Restovtsev
2011-08-19  1:16 Alexandre Restovtsev
2011-07-20 21:02 Alexandre Restovtsev

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox