Patch to fix gnome-settings-daemon crash in gnome-3 fallback mode.

(Portage version: 2.2.0_alpha80/cvs/Linux x86_64)

3 files changed, 88 insertions, 1 deletions

diff --git a/gnome-base/libgnomekbd/ChangeLog b/gnome-base/libgnomekbd/ChangeLog
index 4a1e9b9997ab..ff9ddce45c2f 100644
--- a/gnome-base/libgnomekbd/ChangeLog
+++ b/gnome-base/libgnomekbd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/libgnomekbd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.97 2011/11/25 05:30:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.98 2011/12/11 21:24:55 tetromino Exp $
+
+*libgnomekbd-3.2.0-r1 (11 Dec 2011)
+
+  11 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +libgnomekbd-3.2.0-r1.ebuild, +files/libgnomekbd-3.2.0-fg-color.patch:
+  Patch to fix gnome-settings-daemon crash in gnome-3 fallback mode.
 
   25 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   -libgnomekbd-3.0.0.1.ebuild:
diff --git a/gnome-base/libgnomekbd/files/libgnomekbd-3.2.0-fg-color.patch b/gnome-base/libgnomekbd/files/libgnomekbd-3.2.0-fg-color.patch
new file mode 100644
index 000000000000..a98e7e5774da
--- /dev/null
+++ b/gnome-base/libgnomekbd/files/libgnomekbd-3.2.0-fg-color.patch
@@ -0,0 +1,39 @@
+From 6709342d25629debcab15adbd16d7d08948e2c9e Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@gnome.org>
+Date: Thu, 10 Nov 2011 23:57:03 +0100
+Subject: [PATCH] GtkTrayIcon:fg-color is a GdkRGBA
+
+... and not a GdkColor. So use the right variable, and the right free function.
+Fixes a crash on session startup in gnome-settings-daemon, when using the gnome3
+fallback session.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=663816
+---
+ libgnomekbd/gkbd-status.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libgnomekbd/gkbd-status.c b/libgnomekbd/gkbd-status.c
+index 2f5b41f..10c95bc 100644
+--- a/libgnomekbd/gkbd-status.c
++++ b/libgnomekbd/gkbd-status.c
+@@ -126,7 +126,7 @@ static void
+ gkbd_status_render_cairo (GkbdStatusPrivHack * gkh, cairo_t * cr, int group)
+ {
+ 	double r, g, b;
+-	GdkColor *fg_color;
++	GdkRGBA *fg_color;
+ 	gchar *font_family;
+ 	int font_size;
+ 	PangoFontDescription *pfd;
+@@ -155,7 +155,7 @@ gkbd_status_render_cairo (GkbdStatusPrivHack * gkh, cairo_t * cr, int group)
+ 
+ 	g_object_get (gkh->tray_icon, "fg-color", &fg_color, NULL);
+ 	cairo_set_source_rgb (cr, fg_color->red, fg_color->green, fg_color->blue);
+-	gdk_color_free (fg_color);
++	gdk_rgba_free (fg_color);
+ 
+ 	gkbd_indicator_config_get_font_for_widget (ind_cfg,
+ 						   gkh->tray_icon,
+-- 
+1.7.8
+
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.2.0-r1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..e310ce99102e
--- /dev/null
+++ b/gnome-base/libgnomekbd/libgnomekbd-3.2.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-3.2.0-r1.ebuild,v 1.1 2011/12/11 21:24:55 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="Gnome keyboard configuration library"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+introspection test"
+
+RDEPEND=">=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.91.7:3[introspection?]
+	>=x11-libs/libxklavier-5.1
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.19"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-schemas-compile
+		$(use_enable introspection)
+		$(use_enable test tests)"
+	DOCS="AUTHORS ChangeLog NEWS README"
+}
+
+src_prepare() {
+	# Upstream patch to use correct GtkTrayIcon:fg-color type; fixes g-s-d crash
+	epatch "${FILESDIR}/${P}-fg-color.patch"
+
+	gnome2_src_prepare
+}