[gentoo-commits] proj/gnome:gnome-next commit in: gnome-extra/gnome-screensaver/files/, gnome-extra/gnome-screensaver/

[Alexandre Restovtsev]

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@×××××.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"
-}