Date: Wednesday, October 31, 2012 @ 05:09:29 Author: jgc Revision: 170048
upgpkg: gconf-editor 3.0.1-1 Fix assertion when navigating through the tree Added: gconf-editor/trunk/fix-assertion-failed-crash.patch Modified: gconf-editor/trunk/PKGBUILD ----------------------------------+ PKGBUILD | 11 +++++++---- fix-assertion-failed-crash.patch | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-10-31 08:56:54 UTC (rev 170047) +++ PKGBUILD 2012-10-31 09:09:29 UTC (rev 170048) @@ -2,8 +2,8 @@ # Maintainer: Jan de Groot <[email protected]> pkgname=gconf-editor -pkgver=3.0.0 -pkgrel=2 +pkgver=3.0.1 +pkgrel=1 pkgdesc="Graphical gconf registry editor" arch=(i686 x86_64) license=('GPL') @@ -13,11 +13,14 @@ groups=('gnome-extra') options=(!emptydirs) install=gconf-editor.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('184e17416c2dd927ccb3a9b435d86fbe4b654316b91a6db724a3fd447a9fae60') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 + fix-assertion-failed-crash.patch) +sha256sums=('9afc4fc0d0afe019998736f06c04cbfa0393c813e2aa755133d95e83835f8869' + '6550714ee06d09632244d0f4f41402224599f5230ef71376ea34291ce0d651bc') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "${srcdir}/fix-assertion-failed-crash.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-scrollkeeper make Added: fix-assertion-failed-crash.patch =================================================================== --- fix-assertion-failed-crash.patch (rev 0) +++ fix-assertion-failed-crash.patch 2012-10-31 09:09:29 UTC (rev 170048) @@ -0,0 +1,34 @@ +From 25d823099337f7ede4782f46fea46f251646dc3e Mon Sep 17 00:00:00 2001 +From: Edward Sheldrake <[email protected]> +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.0.2
