Fix gnome-keybinding-properties crash (bug 291507)

Package-Manager: portage-2.1.7.15/cvs/Linux x86_64

4 files changed, 189 insertions, 2 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/Manifest b/gnome-base/gnome-control-center/Manifest
index 70268dc5be61..f40e67be678b 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-control-center-2.24.0.1-capplet-help.patch 2345 RMD160 c92a563b9881b41015918f9fdba546d50e471b60 SHA1 e91afbf8f8802a51411ad5e5c22cf417800b3452 SHA256 c6f3cc0a9b5eeb569e2b62c75bf55f211fd7ba08de7b6db3923c7b40a71e7a95
 AUX gnome-control-center-2.24.0.1-fbsd.patch 394 RMD160 e5558b7be781663e05c8964355443a2ec993b6a4 SHA1 e6a23b54558824b279a74fdda6afbecb7621b9cf SHA256 d7216a88d518110e3d6a9b64e72e8a02fea1c1b48da43783d0ca0c06f610e11f
 AUX gnome-control-center-2.24.0.1-gnome-desktop-api.patch 1247 RMD160 1abed623fbddf91a868b9996d58fa48fd5153671 SHA1 332f4768418c4ddf7127fce28005a1f4580d8b18 SHA256 5441d0c54f18dc20a4bf81b2e79b4ad047e65ac2e3d4afad0d54c6b8d4a7eeea
@@ -6,6 +9,7 @@ AUX gnome-control-center-2.24.0.1-libgnomeui.patch 799 RMD160 b65ea123fa2136ccf1
 AUX gnome-control-center-2.26.0-automagics-canberra+polkit.patch 2432 RMD160 8dc01ee688986a20339e6d14d39a43d40a03a770 SHA1 cde5a169e98a7d92875bb7fc535502f375774e5b SHA256 1a2a294de055d561985ec95cd612b81cc8ad68820e890011a62afbb1e340b597
 AUX gnome-control-center-2.26.0-default-background.patch 6341 RMD160 287b29d28ea56a7a25cb189412b41b0ba4dec9af SHA1 58297198e1e1d3c0f8de0b63316ddfd9e7488d5d SHA256 c6cf58d7e284df4a25b8ad226b5d3dc8c56f697e23962a4944e140c65c109edd
 AUX gnome-control-center-2.26.0-gconf-unref.patch 680 RMD160 46e913235adea15003228959e9b198941602d904 SHA1 ddac887dd06f47ba2c624882e60f60ff6cb2986e SHA256 cd79f88e29b2c662910c6ddc57bd24958ba4f1c71ca60bf668f7c20261b1c573
+AUX gnome-control-center-2.26.0-keybinding-crash.patch 1475 RMD160 b1ea3c4ac4b34932ec55dc646f9f8809f7b764ad SHA1 1b417be26b64d85d7ec5da5e19f428e704782290 SHA256 8fc4cb0d33ad32c0e74a7e3e7e2b4dc9247257fae706c11c5b99d7ae4d11f26c
 AUX gnome-control-center-2.26.0-libxklavier4.patch 1651 RMD160 1bacf04c569b59a091a4ee2ac4d2b7d695be0f68 SHA1 7666c459f5aa71dd65e14ea092fff83588227f39 SHA256 453c08693d9fa79e6252a17e9aeef297089f6c709e2132e78b9a6b2858f051e4
 AUX gnome-control-center-2.28.1-gdm-default-bg.patch 4946 RMD160 7a8593a071548dd7b8a562927eae56d08164c489 SHA1 2c36d84ba5498a387dd7973eef7b18bac9a40609 SHA256 d6cdfbf3c293d3fa57bf49bd7ba55f41074202df617cd12607b9bacbdb2eb49e
 AUX org.gnome.control-center.defaultbackground.policy 836 RMD160 0e830941e4e03bd0c84ec6a352ed5df598f2ccb5 SHA1 c70e2db5e125e1236b0e796c3d9e293ecb3b58a7 SHA256 4fb135d55626e03a2b02b6c325e0fa3ee773984af2258acb3e2f1b22373dce52
@@ -15,8 +19,16 @@ DIST gnome-control-center-2.28.1.tar.bz2 2287398 RMD160 a9620e2f227124bb81b7a3a8
 EBUILD gnome-control-center-2.24.0.1-r1.ebuild 2769 RMD160 8df832492e029b55239ebff3f5d2b4ef4836eb1f SHA1 a99239988a5a08c10d58c8cf53e5a780a74bcfde SHA256 11e9fcbcce321aa286ee8773624d57e3a83d6ce26999e1ac80cdf67287248ed9
 EBUILD gnome-control-center-2.24.0.1-r10.ebuild 2938 RMD160 f78416df69f49fe61074522791495241caffeed5 SHA1 c54dc1420c43c801806def07bc9bc7c3be8529db SHA256 661d46db71e3b81af155a8cb42dfed0d2a97ef9a87924e6f57d4f24ff852b20d
 EBUILD gnome-control-center-2.24.0.1.ebuild 2556 RMD160 76370a1d6750c343fe9c5791d0335991133a4dfa SHA1 2baecb6a12008f05d9b3f011413e6fe9bdf79bb4 SHA256 413162a78846d58d95e46e051e2a6d6d24ecd235e4acb1a2a5fa636670b6e698
+EBUILD gnome-control-center-2.26.0-r1.ebuild 3095 RMD160 271fe42993ae727b94a055766335f9d5b1a92bc8 SHA1 0ad58bc9c9a3a383c8baeed4fbf6f6d581d6b183 SHA256 e41d0134faf757973902ba6c64c4b22b790161bc923df2ff0cc5544792ed80d4
 EBUILD gnome-control-center-2.26.0.ebuild 2974 RMD160 efe4debd4282b77b2760965e7518441a45a06c50 SHA1 51a39eba3932b42a63ecb6482b2e34769f16ac02 SHA256 deeaec7f0a51f4256a3e2c4de4e0c4efd81c4e27c14da7451b55cb44395e9b81
 EBUILD gnome-control-center-2.28.1-r2.ebuild 2442 RMD160 8f1639059f6fa67d98b7bac51b6a0683ef38c8dd SHA1 bc36425e02ab96cde6f3057120ad6fad396ba44e SHA256 9f1ec15411fe16148cc6ab7be13b80cddc9d14b4a8b2b849f0709a1be1ebde2d
 EBUILD gnome-control-center-2.28.1.ebuild 2226 RMD160 fc8765ff967ec8f19e02abbe70423607eeb2d218 SHA1 2abf3bbbb9d5ee3f510e14bece9203b7836c6478 SHA256 924c70582de6e2cffe770edfd5530415e1c7cda7c8860b44ff74d20c3ec4a8a6
-MISC ChangeLog 44905 RMD160 902305ad58f6eec30e28bf9496a18bfe75ddf22a SHA1 48583b6f52b9e5959d8a7a92f97e1c4e6f93e7a0 SHA256 10d5e9cc2f70a93c75db16b8c07c50d48c9d441a921a2a6aec3d33898d155d01
+MISC ChangeLog 45152 RMD160 ae7f86c2caf3f8546a25da58fdc312baba02397f SHA1 2e0ba163ec271b5d2d3effd2af8f27c1257db4cc SHA256 9ccda9fecdf1011ef077a4d5007e515cd4ff911eeaf6e700ff95d3b4d9ecd55e
 MISC metadata.xml 264 RMD160 e891c8cddd44dc4a25f7b9a1172e8ad7332177c0 SHA1 379b57843ca1c94fe14c334b39d6aa2d1822623c SHA256 3df2f5e7333311872f1351c41df47ecfbfa3a85534f210911603d72968cb2d22
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAks5BsUACgkQCaWpQKGI+9SMTgCfaEQ+KcXOSEu7buTq+mhwl0Ju
+9/cAnjFp9K5WFRFO5bCck8Hse6UL227w
+=cUMo
+-----END PGP SIGNATURE-----
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
+}