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

Package-Manager: portage-2.2.0_alpha80/cvs/Linux x86_64

diff --git a/gnome-base/libgnomekbd/ChangeLog b/gnome-base/libgnomekbd/ChangeLog
index 4a1e9b9997ab80ed35406a65aa0ffae6a3473ecb..ff9ddce45c2fb85864b18a0a072b49550ffb636b 100644 (file)
--- 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/Manifest b/gnome-base/libgnomekbd/Manifest
index 69e88b7d315f1a0c813c62a0c1564d09e1adaf28..934a495bedfacb048ad550b6295852e2d475c586 100644 (file)
--- a/gnome-base/libgnomekbd/Manifest
+++ b/gnome-base/libgnomekbd/Manifest
@@ -4,16 +4,18 @@ Hash: SHA256
 AUX libgnomekbd-2.32.0-gdkdisplay-usage.patch 2563 RMD160 0303c844d43df7b5f5fb1139802eb18f9ddc6f3d SHA1 bfe39ccd38da66bc96948654202c6fb0f712761b SHA256 65ba86cc9386d6562cfc26175015943548f9efeeafe6a55e803e3398dcc1874c
 AUX libgnomekbd-2.32.0-gdkkeyname-replace.patch 5628 RMD160 6bda98342945024bc6294eed8fc4177739608804 SHA1 0d90cce527c43c9de22b56559f46419cacbae93b SHA256 f65fbe70dd6fdaef0f8aa370471390a34bcb30b5b01da449139bf42f8da92ea6
 AUX libgnomekbd-2.32.0-unneeded-casts.patch 1630 RMD160 747b75c8f10cc229a41fe97f517091743a5c5a66 SHA1 ef33c764e03346fc9ee510e1002c003c48c3bc24 SHA256 2b1b28aa84450a0ccd438f2d8a97918193dca1ddcf9dbe9e17e61d0b9e14e436
+AUX libgnomekbd-3.2.0-fg-color.patch 1316 RMD160 a7d1f7bb20b8fcfe583833b138805a3dd457dde0 SHA1 5271f834ce058915161c35ba2ee093a6b2da08f5 SHA256 87a92d8e48404268f6301157f697d4c220a9bfc0b1dd0fc8b5c1fc4017778bc9
 DIST libgnomekbd-2.32.0.tar.bz2 410928 RMD160 5ecca30979373f746224693c6b9ff8b6fe2a8e18 SHA1 8401db5d7888185fb3a5855f316771aa09865403 SHA256 ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256
 DIST libgnomekbd-3.2.0.tar.xz 376580 RMD160 c7d549c731c57b995c4036d9378a5f33419bfe29 SHA1 c7a0af337df1ba67e3e1824db3191abdd7b6a098 SHA256 810ff305bbf076f6689911cf7b040d2113f501311a866abc37aa6bf5b28e1a2b
 EBUILD libgnomekbd-2.32.0-r1.ebuild 1176 RMD160 52c51f8bc68866b24201fbeebe3901c61d176233 SHA1 98ab6eb1695250cad2c089febfd6f00faf379ef7 SHA256 c1354c82ae7c2035029ee56a5dd05e6730d4f076a98d61962a31f066d5aeea91
+EBUILD libgnomekbd-3.2.0-r1.ebuild 1131 RMD160 c40991c7e9067cf8a625efadfd56e4e3b5c17c64 SHA1 d6d0c12eb61cbbf0dfd662ee697cebc8f351d017 SHA256 d30310eead7db857f75729d735885e6f7cdb30fccb1de4ebaba37e1f1b5f8637
 EBUILD libgnomekbd-3.2.0.ebuild 961 RMD160 c9203d189441f5c9c984c4684548be90474120e9 SHA1 6ffc357812ecd46e272b4401a836d21b73c35f17 SHA256 cea189aec33cccc4917e428f7d508f0b41e0135225acead8fa5076e4485e3a6e
-MISC ChangeLog 13099 RMD160 f569b853cb4ae70772c22ca433b9336027d39802 SHA1 a22759b05797d922a534b3bc5c428a2393198fff SHA256 7c9ebc4ef4262d3c91d931840fc37cd8a1939ef7d02acc0b68ec5802ebc9c3fc
+MISC ChangeLog 13338 RMD160 31a9a060ecab98010225a7223aaa6b87e8ab1904 SHA1 9c526cc68e73c4fd87b44d47335583604f4ffba7 SHA256 5ad37b6ce5467cca19d78e0a06ac02efbc685fcc327258d9485177716c357946
 MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7PKBgACgkQdjK8w9WeBnCRzwD/TCIykxXmvuGx1nM6E/yrT8BL
-aIOjQLBPJgfSlgpCv+YBAJbauix+zxO91Y1eGgnWG/YGxMr+uVqvEWo3lxt0mt0S
-=af50
+iF4EAREIAAYFAk7lH6wACgkQdjK8w9WeBnDiUAD+JTYCWp74StLUj7n+WBm70K1f
+dS0w3LGrNSeb32BzUGEA/0iQJWo0H20yJw0poIJ1A/CZ7Upg7UBePDFzWLPeLeg6
+=jLDa
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..a98e7e5
--- /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 (file)
index 0000000..e310ce9
--- /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
+}