public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/
Date: Mon,  2 May 2011 15:56:22 +0000 (UTC)	[thread overview]
Message-ID: <c249b133b6ecf094bf9e1a23b37a33c0497acc31.nirbheek@gentoo> (raw)

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@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=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
+}



             reply	other threads:[~2011-05-02 15:56 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-02 15:56 Nirbheek Chauhan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-05-30 17:11 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/ Nirbheek Chauhan
2011-10-04  4:04 Alexandre Restovtsev
2011-10-05  8:00 Alexandre Restovtsev
2011-10-18  7:37 Alexandre Restovtsev
2012-10-28 16:42 Gilles Dartiguelongue
2012-11-21 22:27 Gilles Dartiguelongue
2018-11-16 17:25 Gilles Dartiguelongue
2019-02-23 20:37 Mart Raudsepp
2019-09-14 21:00 Sobhan Mohammadpour

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c249b133b6ecf094bf9e1a23b37a33c0497acc31.nirbheek@gentoo \
    --to=nirbheek@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox