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

[Nirbheek Chauhan]

commit:     c249b133b6ecf094bf9e1a23b37a33c0497acc31
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 15:54:43 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon May  2 15:54:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c249b133

gnome-base/gnome-desktop: fix bug 365717

---
 ...ome-desktop-3.0.1-fix-randr-missing-crash.patch |   30 ++++++++++++++++++++
 ...-3.0.1.ebuild => gnome-desktop-3.0.1-r1.ebuild} |    6 ++++
 2 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-3.0.1-fix-randr-missing-crash.patch b/gnome-base/gnome-desktop/files/gnome-desktop-3.0.1-fix-randr-missing-crash.patch
new file mode 100644
index 0000000..5402a20
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/gnome-desktop-3.0.1-fix-randr-missing-crash.patch
@@ -0,0 +1,30 @@
+From aa93854f2ba6b0f72f1bdff9699b5724a72c89c9 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@××××××.com>
+Date: Sat, 30 Apr 2011 20:48:03 -0400
+Subject: [PATCH] Don't fall over if RANDR is missing
+
+When RANDR is not present, the screen object never gets an info,
+and since screen_info_free asserts, we must not call it unconditionally
+in finalize.
+This fixes https://bugzilla.gnome.org/show_bug.cgi?id=649053
+---
+ libgnome-desktop/gnome-rr.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
+index 4a9d98e..eb3d735 100644
+--- a/libgnome-desktop/gnome-rr.c
++++ b/libgnome-desktop/gnome-rr.c
+@@ -748,7 +748,8 @@ gnome_rr_screen_finalize (GObject *gobject)
+ 
+     gdk_window_remove_filter (screen->priv->gdk_root, screen_on_event, screen);
+ 
+-    screen_info_free (screen->priv->info);
++    if (screen->priv->info)
++      screen_info_free (screen->priv->info);
+ 
+     G_OBJECT_CLASS (gnome_rr_screen_parent_class)->finalize (gobject);
+ }
+-- 
+1.7.5
+

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.0.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.0.1-r1.ebuild
similarity index 92%
rename from gnome-base/gnome-desktop/gnome-desktop-3.0.1.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.0.1-r1.ebuild
index 87d2013..fce1620 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.0.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.0.1-r1.ebuild
@@ -58,3 +58,9 @@ pkg_setup() {
 		$(use_enable doc desktop-docs)
 		$(use_enable introspection)"
 }
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=365717
+	epatch "${FILESDIR}/${P}-fix-randr-missing-crash.patch"
+	gnome2_src_prepare
+}