diff options
| author | root <root@rshg054.dnsready.net> | 2012-11-01 01:47:44 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-11-01 01:47:44 -0700 |
| commit | 83a318800db22408628e60c9e1730578efcfee37 (patch) | |
| tree | 9f1c330c5019dd940e41c44a7c1db13d337058a6 /extra/gconf-editor | |
| parent | 5827948456201df72a1bd73e87977c569129fb27 (diff) | |
Thu Nov 1 01:47:04 PDT 2012
Diffstat (limited to 'extra/gconf-editor')
| -rw-r--r-- | extra/gconf-editor/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/gconf-editor/fix-assertion-failed-crash.patch | 34 |
2 files changed, 42 insertions, 5 deletions
diff --git a/extra/gconf-editor/PKGBUILD b/extra/gconf-editor/PKGBUILD index 94ade7b75..43e03ae09 100644 --- a/extra/gconf-editor/PKGBUILD +++ b/extra/gconf-editor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150859 2012-02-23 13:04:28Z ibiru $ +# $Id: PKGBUILD 170049 2012-10-31 09:09:59Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> 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 @@ url="http://www.gnome.org" 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 diff --git a/extra/gconf-editor/fix-assertion-failed-crash.patch b/extra/gconf-editor/fix-assertion-failed-crash.patch new file mode 100644 index 000000000..c9162f7f6 --- /dev/null +++ b/extra/gconf-editor/fix-assertion-failed-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.0.2 |