[arch-commits] Commit in gconf-editor/repos (3 files)

[Evangelos Foutras]

    Date: Friday, November 9, 2018 @ 21:01:37
  Author: foutrelis
Revision: 338504

archrelease: copy trunk to staging-x86_64

Added:
  gconf-editor/repos/staging-x86_64/
  gconf-editor/repos/staging-x86_64/PKGBUILD
    (from rev 338503, gconf-editor/trunk/PKGBUILD)
  gconf-editor/repos/staging-x86_64/fix-assertion-failed-crash.patch
    (from rev 338503, gconf-editor/trunk/fix-assertion-failed-crash.patch)

----------------------------------+
 PKGBUILD                         |   36 ++++++++++++++++++++++++++++++++++++
 fix-assertion-failed-crash.patch |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)

Copied: gconf-editor/repos/staging-x86_64/PKGBUILD (from rev 338503, gconf-editor/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2018-11-09 21:01:37 UTC (rev 338504)
@@ -0,0 +1,36 @@
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gconf-editor
+pkgver=3.0.1
+pkgrel=5
+pkgdesc="Graphical gconf registry editor"
+arch=(x86_64)
+license=('GPL')
+depends=('gconf' 'gtk3')
+makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils')
+url="http://www.gnome.org"
+options=(!emptydirs)
+source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+        fix-assertion-failed-crash.patch)
+sha256sums=('9afc4fc0d0afe019998736f06c04cbfa0393c813e2aa755133d95e83835f8869'
+            '6550714ee06d09632244d0f4f41402224599f5230ef71376ea34291ce0d651bc')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../fix-assertion-failed-crash.patch
+}
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+     --localstatedir=/var --disable-scrollkeeper
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+
+  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gconf-editor "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+}

Copied: gconf-editor/repos/staging-x86_64/fix-assertion-failed-crash.patch (from rev 338503, gconf-editor/trunk/fix-assertion-failed-crash.patch)
===================================================================
--- staging-x86_64/fix-assertion-failed-crash.patch	                        (rev 0)
+++ staging-x86_64/fix-assertion-failed-crash.patch	2018-11-09 21:01:37 UTC (rev 338504)
@@ -0,0 +1,34 @@
+From 25d823099337f7ede4782f46fea46f251646dc3e Mon Sep 17 00:00:00 2001
+From: Edward Sheldrake <ejsheldrake at 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