Fix gnome-keybinding-properties crash (bug 291507)

(Portage version: 2.1.7.15/cvs/Linux x86_64)

3 files changed, 176 insertions, 1 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index e0db27ed2a62..9bbbde79d99c 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.43 2009/12/27 02:41:47 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.44 2009/12/28 19:27:56 pacho Exp $
+
+*gnome-control-center-2.26.0-r1 (28 Dec 2009)
+
+  28 Dec 2009; Pacho Ramos <pacho@gentoo.org>
+  +gnome-control-center-2.26.0-r1.ebuild,
+  +files/gnome-control-center-2.26.0-keybinding-crash.patch:
+  Fix gnome-keybinding-properties crash (bug 291507)
 
 *gnome-control-center-2.28.1-r2 (27 Dec 2009)
 
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-keybinding-crash.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-keybinding-crash.patch
new file mode 100644
index 000000000000..a246e929985a
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-keybinding-crash.patch
@@ -0,0 +1,47 @@
+From 5998aa90c08051cc520dfb64ede78783ef9cc2c4 Mon Sep 17 00:00:00 2001
+From: Jens Granseuer <jensgr@gmx.net>
+Date: Tue, 11 Aug 2009 16:01:55 +0000
+Subject: Fix crash when iterating through the tree model
+
+Don't use indices to move through iterators, don't skip the first
+section, and verify that we got a new iterator before using it
+(bug #591392).
+---
+diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c
+index fb3ba35..5383298 100644
+--- a/capplets/keybindings/gnome-keybinding-properties.c
++++ b/capplets/keybindings/gnome-keybinding-properties.c
+@@ -522,25 +522,20 @@ find_section (GtkTreeModel *model,
+               GtkTreeIter  *iter,
+ 	      const char   *title)
+ {
+-  gint i, j;
+-  gboolean found;
++  gboolean success, found;
+ 
+-  i = gtk_tree_model_iter_n_children (model, NULL);
+   found = FALSE;
+-  gtk_tree_model_get_iter_first (model, iter);
+-  for (j = 0; j < i; j++)
++  success = gtk_tree_model_get_iter_first (model, iter);
++  while (success && !found)
+     {
+       char *description = NULL;
+ 
+-      gtk_tree_model_iter_next (model, iter);
+       gtk_tree_model_get (model, iter,
+ 			  DESCRIPTION_COLUMN, &description,
+ 			  -1);
+-      if (g_strcmp0 (description, title) == 0)
+-        {
+-	  found = TRUE;
+-     	  break;
+-        }
++
++      found = (g_strcmp0 (description, title) == 0);
++      success = gtk_tree_model_iter_next (model, iter);
+     }
+   if (!found)
+     {
+--
+cgit v0.8.2
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.26.0-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.26.0-r1.ebuild
new file mode 100644
index 000000000000..b8137180d484
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.26.0-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.26.0-r1.ebuild,v 1.1 2009/12/28 19:27:56 pacho Exp $
+
+EAPI="2"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="The gnome2 Desktop configuration tool"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="eds hal policykit"
+
+RDEPEND="x11-libs/libXft
+	>=x11-libs/gtk+-2.13.1
+	>=dev-libs/glib-2.17.4
+	>=gnome-base/gconf-2.0
+	>=gnome-base/libglade-2
+	>=gnome-base/librsvg-2.0
+	>=gnome-base/nautilus-2.6
+	>=media-libs/fontconfig-1
+	>=dev-libs/dbus-glib-0.73
+	>=x11-libs/libxklavier-3.6
+	>=x11-wm/metacity-2.23.1
+	>=gnome-base/gnome-panel-2.0
+	>=gnome-base/libgnomekbd-2.21.4.1
+	>=gnome-base/gnome-desktop-2.25.1
+	>=gnome-base/gnome-menus-2.11.1
+	gnome-base/gnome-settings-daemon
+
+	x11-libs/pango
+	dev-libs/libxml2
+	media-libs/freetype
+	>=media-libs/libcanberra-0.4[gtk]
+
+	eds? ( >=gnome-extra/evolution-data-server-1.7.90 )
+	hal? ( >=sys-apps/hal-0.5.6 )
+	policykit? ( gnome-extra/policykit-gnome )
+
+	>=gnome-base/libbonobo-2
+	>=gnome-base/libgnome-2.2
+	>=gnome-base/libbonoboui-2
+	>=gnome-base/libgnomeui-2.2
+
+	x11-apps/xmodmap
+	x11-libs/libXScrnSaver
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXxf86misc
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXcursor"
+DEPEND="${RDEPEND}
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.19
+	dev-util/desktop-file-utils
+
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.10.1
+	gnome-base/gnome-common"
+# Needed for autoreconf
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-update-mimedb
+		--disable-static
+		--enable-canberra
+		$(use_enable eds aboutme)
+		$(use_enable hal)
+		$(use_enable policykit policykit-gnome)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix compilation on fbsd, bug #256958
+	epatch "${FILESDIR}/${PN}-2.24.0.1-fbsd.patch"
+
+	# Fix libcanberra and policykit-gnome for about-me capplet
+	# automagics support, bug #266110
+	epatch "${FILESDIR}/${P}-automagics-canberra+polkit.patch"
+
+	# Policykit-based solution to setting the default background.  Must be
+	# applied *after* teh automagics patch
+	epatch "${FILESDIR}"/${P}-default-background.patch
+
+	# Add support for libxklavier-4, bug #278450
+	epatch "${FILESDIR}/${PN}-2.26.0-libxklavier4.patch"
+
+	# Check pointer before unreferecing gconf client, bug #270319
+	epatch "${FILESDIR}/${PN}-2.26.0-gconf-unref.patch"
+
+	# Fix gnome-keybinding-properties crash, bug 291507
+	epatch "${FILESDIR}/${PN}-2.26.0-keybinding-crash.patch"
+
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use policykit ; then
+		# Install the policy for default backgrounds
+		insinto /usr/share/PolicyKit/policy/
+		doins "${FILESDIR}"/org.gnome.control-center.defaultbackground.policy
+	fi
+}