Apply upstream patches to fix crasher (#476248 by Mike Johnson) and don't load accel maps.

Package-Manager: portage-2.1.12.11/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 158 insertions, 7 deletions

diff --git a/gnome-extra/gconf-editor/ChangeLog b/gnome-extra/gconf-editor/ChangeLog
index 4dc2eeee5783..ac7526898780 100644
--- a/gnome-extra/gconf-editor/ChangeLog
+++ b/gnome-extra/gconf-editor/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gconf-editor
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/ChangeLog,v 1.179 2013/03/29 20:14:04 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/ChangeLog,v 1.180 2013/07/11 20:02:07 pacho Exp $
+
+*gconf-editor-3.0.1-r1 (11 Jul 2013)
+
+  11 Jul 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gconf-editor-3.0.1-assertion-crash.patch,
+  +files/gconf-editor-3.0.1-drop-accel.patch, +gconf-editor-3.0.1-r1.ebuild:
+  Apply upstream patches to fix crasher (#476248 by Mike Johnson) and don't load
+  accel maps.
 
   29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org>
   -gconf-editor-3.0.0.ebuild:
diff --git a/gnome-extra/gconf-editor/Manifest b/gnome-extra/gconf-editor/Manifest
index 1a70f8de7850..3854e0768209 100644
--- a/gnome-extra/gconf-editor/Manifest
+++ b/gnome-extra/gconf-editor/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gconf-editor-3.0.1-assertion-crash.patch 1194 SHA256 395e2cee14e0246c0da88c19fc0dcf4a0684c519905be34dbcebb97c3fb577ef SHA512 5fbe8a51d4f678f7444cfd8683ce171280031c8870a18efea709a5f0667f7701893f6d0d65df72cc6267b01f7a34c925529c5b814ab47a9a270568b3391b6bfc WHIRLPOOL c00a21a4d5af2703a681b2d61223ca64499b8c30e24c43e24cb13e08138bdbc3c0dac73e083863886475b2f775b294e14138f4b1e35d3412792676e1dc7fb33c
+AUX gconf-editor-3.0.1-drop-accel.patch 1383 SHA256 c37e88038127dee1372a32b16160c5ecb0ea829293defe24c5b5859778b75b9f SHA512 c50c4fbbd25170ca7a7261f590862927e5f68eb5d1529ac5252175caa28ea916484d284e307580297f23e2ee8df7822f12e75c2912f8ab808946997d032fedff WHIRLPOOL cb2f3fe9f0f21acf802242eb55e0d663729612707b7886c7fc8f0def102b7c61e408016112a5c64190be71fa8adf93129734434e37b9ad2b4fe3c4170aff2816
 DIST gconf-editor-2.32.0.tar.bz2 1397117 SHA256 c6d1d35ce5d136121ad76efe1c4033425bb2ad3800e711bd1bca9ce869c12a1f
-DIST gconf-editor-3.0.1.tar.xz 1452468 SHA256 3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
+DIST gconf-editor-3.0.1.tar.xz 1452468 SHA256 3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944 SHA512 faaf237233d94730902d7c8e231545841862451f5998ef06bc3d51f6cdf0bc16bd1cecfc6b6a9e0ccc5197a06bb4f89068bfb478f900f3272ba03a2d94ec2f49 WHIRLPOOL 991a5b7d6b02b3472a9207bb5750d18552ba5da15570f7f884950b838177431a42b1ebb0131bbf3f76abe8f6098a2af88e542ec88d22135f9c8684da0543703f
 EBUILD gconf-editor-2.32.0.ebuild 853 SHA256 0a6c2a456de557e411e481ac2a6efc0cedb28ffa08c4b167851cb33c21f74ac5 SHA512 bd620269fd7ecbf11fa65802135e802ff95c2f1d7915d5e2a537a3c5cb3e40c0c5fda0f4feb1d1c3d3400e51b189feeaebfef1c01e5ce8071dfba9e187e3bc5c WHIRLPOOL 1180218fc35d1822d23effbb87fe837aaecbf6d29d79d5cd95ec7e106db0325dcf8143012996215358093f754059045728904f35fe0a902362f4eaa3517ea78f
+EBUILD gconf-editor-3.0.1-r1.ebuild 1044 SHA256 47587b735727bbacfc44332daaaeb82f57147b05877cbe7d4521526854d39f4b SHA512 5c2f28cd8a9bf908edfcf246c12c3b73659cc04895ef8ac8d364469dfd741186c36ef26ca26f34aa155c912222a56e5b799193277b67b2d2495d56612d210a84 WHIRLPOOL ad17df038f9c1a6ce9c8b3df1b87bb4709638bf54758d5a490a2cdd9c6cc198116a92a00a11ce81e99f37c25d01369640a6a798d5943a9584ae9689645d0bb23
 EBUILD gconf-editor-3.0.1.ebuild 918 SHA256 e9dc407f9f443c44f5bbf3333289f36311ebf0fcf562847bc9dce8e796af36fd SHA512 badf0075c771f33b1d84bd60a4f6deacb5ca818a2b32334f3f1f18e15d0efad5e783550a81eda1088c543de6d801c71fff757ea0a858903ba1cc8004b8971cd1 WHIRLPOOL 4422a04688fa1f74ef26ac124e90e6071f6d818bd5ea78967b7aba33df63bc4667f2465ef51f6ac374c4ed2d1e913ad05d228ac50482a6bdfe1fbb1e07fded6c
-MISC ChangeLog 21838 SHA256 294b27f6602f4fac9fea356838fbc2254937e28dcc44442b6a2522a94e66c7e2 SHA512 d0b3d873752118bf7ca1081b8babed641addf806b2e29f7f25a028bb8060105cc001507d88b37a9810fa5304944579e5f146fecfffc2e9568227e0c0223b8103 WHIRLPOOL 78b16936d2506e2375c217faf5df98d3821e58b1dfb094f8c50d0910fcdb0a51b7525a55de56b2bbd93999d1844c1e1959ae8bd649f3a8f8508fc8e546ca3488
+MISC ChangeLog 22148 SHA256 171f623116191b633a054aa5a80a30a366f1d1695c0e083051b4f851caa08262 SHA512 4b608cc9c2ce27d70e10176a7faeb51d19732f4e59863aabe53bc45c5d63d87176cb1e5ff72bcb725883573d616c9d35c1d059218e823754d770c72b323363b1 WHIRLPOOL de2c35caa04abb04a7afb6bad90fd395984c3a56a60a687796f16ac7487b3e1473bd23a9180d46ce9d3ff11550aaeb68c169684dc950ee47182f632b48b835b8
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlFV9g0ACgkQ1fmVwcYIWAZVqgCguZ41g8XIlXtmXXlcFbbatu0Z
-IZIAoJzJo3Bfv6iRS7E5t+l30N8M4/tv
-=cH9i
+iEYEAREIAAYFAlHfD0AACgkQCaWpQKGI+9Q7pQCfSszDOCfHWc7GmLmRchHOMbH7
+B5gAn2T6U7Gmct5i1o1Z5eAyAk6a7Gyk
+=tcqP
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch b/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch
new file mode 100644
index 000000000000..b7df8f51007d
--- /dev/null
+++ b/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch
@@ -0,0 +1,34 @@
+From 25d823099337f7ede4782f46fea46f251646dc3e Mon Sep 17 00:00:00 2001
+From: Edward Sheldrake <ejsheldrake@gmail.com>
+Date: Wed, 11 Apr 2012 07:27:16 +0000
+Subject: Fix assertion failed crash
+
+Fix "assertion failed: (last_slash != NULL)" crash while navigating the
+left tree view, fixed by having the model for the right list view emit
+all the row deleted signals before deleting any of its data.
+
+Fixes https://bugzilla.gnome.org/show_bug.cgi?id=670586
+---
+diff --git a/src/gconf-list-model.c b/src/gconf-list-model.c
+index 27e1af6..4fc60f8 100644
+--- a/src/gconf-list-model.c
++++ b/src/gconf-list-model.c
+@@ -133,11 +133,14 @@ gconf_list_model_set_root_path (GConfListModel *model, const gchar *root_path)
+ 
+ 	if (model->root_path != NULL) {
+ 		for (list = model->values; list; list = list->next) {
++			model->stamp++;
++			gtk_tree_model_row_deleted (GTK_TREE_MODEL (model), path);
++		}
++
++		for (list = model->values; list; list = list->next) {
+ 			GConfEntry *entry = list->data;
+ 
+ 			g_hash_table_remove (model->key_hash, gconf_entry_get_key (entry));
+-			model->stamp++;
+-			gtk_tree_model_row_deleted (GTK_TREE_MODEL (model), path);
+ 
+ 			gconf_entry_unref (entry);
+ 		}
+--
+cgit v0.9.2
diff --git a/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch b/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch
new file mode 100644
index 000000000000..0d79ec56c396
--- /dev/null
+++ b/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch
@@ -0,0 +1,66 @@
+From 62e68d8e2f6e2c473820113fbf46ced9f77111d4 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <jmccann@redhat.com>
+Date: Thu, 03 May 2012 18:10:53 +0000
+Subject: Drop use GTK accel maps
+
+They are confusing, weird, and stored in an obsolete location.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=675392
+---
+diff --git a/src/main.c b/src/main.c
+index 8da5ccc..9bce4b8 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -26,34 +26,6 @@
+ #include "gconf-stock-icons.h"
+ #include "gconf-editor-window.h"
+ 
+-static char *
+-build_accel_filename (void)
+-{
+-	return g_build_filename (g_get_home_dir (), ".gnome2", "accels", PACKAGE, NULL);
+-}
+-
+-static void
+-load_accel_map (void)
+-{
+-	char *map;
+-
+-	map = build_accel_filename ();
+-	gtk_accel_map_load (map);
+-
+-	g_free (map);
+-}
+-
+-static void
+-save_accel_map (void)
+-{
+-	char *map;
+-
+-	map = build_accel_filename ();
+-	gtk_accel_map_save (map);
+-
+-	g_free (map);
+-}
+-
+ gint
+ main (gint argc, gchar **argv)
+ {
+@@ -92,7 +64,6 @@ main (gint argc, gchar **argv)
+ 	/* Register our stock icons */
+         gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), ICONDIR);
+ 	gconf_stock_icons_register ();
+-	load_accel_map ();
+ 
+         gtk_window_set_default_icon_name ("gconf-editor");
+ 
+@@ -107,7 +78,6 @@ main (gint argc, gchar **argv)
+ 	
+ 	gtk_main ();
+ 
+-	save_accel_map ();
+ 	g_strfreev (remaining_args);
+ 
+ 	return 0;
+--
+cgit v0.9.2
diff --git a/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild b/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..db895bb2b253
--- /dev/null
+++ b/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild,v 1.1 2013/07/11 20:02:07 pacho Exp $
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="An editor to the GNOME config system"
+HOMEPAGE="https://git.gnome.org/browse/gconf-editor"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=x11-libs/gtk+-3.0.0:3
+	>=gnome-base/gconf-2.12:2
+"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	sys-devel/gettext
+	app-text/gnome-doc-utils
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	~app-text/docbook-xml-dtd-4.1.2
+"
+# gnome-common for eautoreconf
+
+src_prepare() {
+	# Fix assertion failed crash (from 'master')
+	epatch "${FILESDIR}/${PN}-3.0.1-assertion-crash.patch"
+
+	# Drop use GTK accel maps (from 'master')
+	epatch "${FILESDIR}/${PN}-3.0.1-drop-accel.patch"
+
+	gnome2_src_prepare
+}