[arch-commits] Commit in dconf/trunk (3 files)

[Ionut Biru]

    Date: Tuesday, May 10, 2011 @ 11:42:26
  Author: ibiru
Revision: 123352

update to 0.7.5

Modified:
  dconf/trunk/PKGBUILD
  dconf/trunk/dconf.install
Deleted:
  dconf/trunk/fix-crash-when-user-database-is-not-present.patch

---------------------------------------------------+
 PKGBUILD                                          |   12 ++------
 dconf.install                                     |    1 
 fix-crash-when-user-database-is-not-present.patch |   29 --------------------
 3 files changed, 5 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-10 13:56:31 UTC (rev 123351)
+++ PKGBUILD	2011-05-10 15:42:26 UTC (rev 123352)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Ionut Biru <ibiru at archlinux.org>
 pkgname=dconf
-pkgver=0.7.4
-pkgrel=2
+pkgver=0.7.5
+pkgrel=1
 pkgdesc="A low-level configuration system."
 arch=(i686 x86_64)
 url="http://live.gnome.org/dconf"
@@ -11,16 +11,12 @@
 makedepends=('vala' 'gobject-introspection' 'gtk3')
 optdepends=('gtk3: for dconf-editor')
 install=dconf.install
-source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2
-       fix-crash-when-user-database-is-not-present.patch)
-sha256sums=('299d79daf0b214c692e7d5788d7bda76d778c1748ea37c33256c4fa6143b22cd'
-            'c78ea8db69a1be1286846282897f99e843e14d1e450beee4339d5500b2f0f73d')
+source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('e2103e8207744903790e9fac6427fa394bb485a0c7f4e0d03b0fb43268c34f33')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -Np1 -i "${srcdir}/fix-crash-when-user-database-is-not-present.patch"
-
   ./configure --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/lib/dconf
   make

Modified: dconf.install
===================================================================
--- dconf.install	2011-05-10 13:56:31 UTC (rev 123351)
+++ dconf.install	2011-05-10 15:42:26 UTC (rev 123352)
@@ -1,5 +1,6 @@
 post_install() {
     usr/bin/gio-querymodules usr/lib/gio/modules
+    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
 }
 
 post_upgrade(){

Deleted: fix-crash-when-user-database-is-not-present.patch
===================================================================
--- fix-crash-when-user-database-is-not-present.patch	2011-05-10 13:56:31 UTC (rev 123351)
+++ fix-crash-when-user-database-is-not-present.patch	2011-05-10 15:42:26 UTC (rev 123352)
@@ -1,29 +0,0 @@
-From c80896f5644ec0a07822047dd7e899da63b42e89 Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <desrt at desrt.ca>
-Date: Sun, 08 May 2011 12:08:38 +0000
-Subject: Fix crash when user database is not present
-
-If we fail to open the database in the user's home directory then the
-variable will be NULL.  The refactor of the read function for lockdown
-support missed this check, resulting in a rather dramatic crash on fresh
-accounts.
----
-diff --git a/engine/dconf-engine.c b/engine/dconf-engine.c
-index ec99116..087d780 100644
---- a/engine/dconf-engine.c
-+++ b/engine/dconf-engine.c
-@@ -452,7 +452,11 @@ dconf_engine_read_internal (DConfEngine  *engine,
-       break;
- 
-   while (i < limit && value == NULL)
--    value = gvdb_table_get_value (engine->gvdbs[i++], key);
-+    {
-+      if (engine->gvdbs[i] != NULL)
-+        value = gvdb_table_get_value (engine->gvdbs[i], key);
-+      i++;
-+    }
- 
-   g_static_mutex_unlock (&engine->lock);
- 
---
-cgit v0.9