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 ) id 1QR60s-00020g-PI for garchives@archives.gentoo.org; Mon, 30 May 2011 17:12:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE0981C084; Mon, 30 May 2011 17:11:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9921B1C072 for ; Mon, 30 May 2011 17:11:45 +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 5B3EE2AC160 for ; Mon, 30 May 2011 17:11:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B68108050C for ; Mon, 30 May 2011 17:11:43 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <83334b14de9c23effc647d077db6e94b64c2aa15.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.2.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: 83334b14de9c23effc647d077db6e94b64c2aa15 Date: Mon, 30 May 2011 17:11:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: b0da217a9f2ab44a050804f96fdc78fd commit: 83334b14de9c23effc647d077db6e94b64c2aa15 Author: Alexandre Rostovtsev gmail com> AuthorDate: Tue May 24 03:43:00 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Mon May 30 15:47:52 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D83334b14 gnome-desktop-3.0.2 version bump * Patch has been applied upstream. Signed-off-by: Nirbheek Chauhan gentoo.org> --- ...ome-desktop-3.0.1-fix-randr-missing-crash.patch | 30 --------------= ------ ...-3.0.1-r1.ebuild =3D> gnome-desktop-3.0.2.ebuild} | 6 ---- 2 files changed, 0 insertions(+), 36 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 deleted file mode 100644 index 5402a20..0000000 --- a/gnome-base/gnome-desktop/files/gnome-desktop-3.0.1-fix-randr-missin= g-crash.patch +++ /dev/null @@ -1,30 +0,0 @@ -From aa93854f2ba6b0f72f1bdff9699b5724a72c89c9 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -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-r1.ebuild b/gno= me-base/gnome-desktop/gnome-desktop-3.0.2.ebuild similarity index 92% rename from gnome-base/gnome-desktop/gnome-desktop-3.0.1-r1.ebuild rename to gnome-base/gnome-desktop/gnome-desktop-3.0.2.ebuild index fce1620..87d2013 100644 --- a/gnome-base/gnome-desktop/gnome-desktop-3.0.1-r1.ebuild +++ b/gnome-base/gnome-desktop/gnome-desktop-3.0.2.ebuild @@ -58,9 +58,3 @@ 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 -}