From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-341204-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QGvUH-0006kV-40
for garchives@archives.gentoo.org; Mon, 02 May 2011 15:56:41 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5759E1C045;
Mon, 2 May 2011 15:56:24 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 17EA11C045
for <gentoo-commits@lists.gentoo.org>; Mon, 2 May 2011 15:56:24 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 4B76F1B406D
for <gentoo-commits@lists.gentoo.org>; Mon, 2 May 2011 15:56:23 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 32B3D80509
for <gentoo-commits@lists.gentoo.org>; Mon, 2 May 2011 15:56:22 +0000 (UTC)
From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" <nirbheek@gentoo.org>
Message-ID: <c249b133b6ecf094bf9e1a23b37a33c0497acc31.nirbheek@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/
X-VCS-Repository: proj/gnome
X-VCS-Files: gnome-base/gnome-desktop/files/gnome-desktop-3.0.1-fix-randr-missing-crash.patch gnome-base/gnome-desktop/gnome-desktop-3.0.1-r1.ebuild gnome-base/gnome-desktop/gnome-desktop-3.0.1.ebuild
X-VCS-Directories: gnome-base/gnome-desktop/ gnome-base/gnome-desktop/files/
X-VCS-Committer: nirbheek
X-VCS-Committer-Name: Nirbheek Chauhan
X-VCS-Revision: c249b133b6ecf094bf9e1a23b37a33c0497acc31
Date: Mon, 2 May 2011 15:56:22 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 275dc580a0d7cc445e97a205f82608dd
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=3Dproj/gnome.git;a=3D=
commit;h=3Dc249b133
gnome-base/gnome-desktop: fix bug 365717
---
...ome-desktop-3.0.1-fix-randr-missing-crash.patch | 30 ++++++++++++++=
++++++
...-3.0.1.ebuild =3D> 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-missin=
g-crash.patch
@@ -0,0 +1,30 @@
+From aa93854f2ba6b0f72f1bdff9699b5724a72c89c9 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.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=3D649053
+---
+ 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)
+=20
+ gdk_window_remove_filter (screen->priv->gdk_root, screen_on_event, =
screen);
+=20
+- screen_info_free (screen->priv->info);
++ if (screen->priv->info)
++ screen_info_free (screen->priv->info);
+=20
+ G_OBJECT_CLASS (gnome_rr_screen_parent_class)->finalize (gobject);
+ }
+--=20
+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=3D365717
+ epatch "${FILESDIR}/${P}-fix-randr-missing-crash.patch"
+ gnome2_src_prepare
+}