[arch-commits] Commit in dconf/trunk (PKGBUILD load-enum.patch)

[Ionut Biru]

    Date: Saturday, May 7, 2011 @ 15:01:26
  Author: ibiru
Revision: 123046

update to 0.7.4

Modified:
  dconf/trunk/PKGBUILD
Deleted:
  dconf/trunk/load-enum.patch

-----------------+
 PKGBUILD        |   13 +++++--------
 load-enum.patch |   22 ----------------------
 2 files changed, 5 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-07 17:47:27 UTC (rev 123045)
+++ PKGBUILD	2011-05-07 19:01:26 UTC (rev 123046)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Ionut Biru <ibiru at archlinux.org>
 pkgname=dconf
-pkgver=0.7.3
-pkgrel=2
+pkgver=0.7.4
+pkgrel=1
 pkgdesc="A low-level configuration system."
 arch=(i686 x86_64)
 url="http://live.gnome.org/dconf"
@@ -11,16 +11,13 @@
 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
-       load-enum.patch)
-sha256sums=('84efc95cb62b6637b2131e110ff447908be739c2185d69bebb300293b561dfd9'
-            '8ead56b2897b18c97b9b72b81bd6e9f9249e28743b05a2653bbf4e6af7d9f7cc')
+source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('299d79daf0b214c692e7d5788d7bda76d778c1748ea37c33256c4fa6143b22cd')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -Np1 -i "${srcdir}/load-enum.patch"
-  ./configure --prefix=/usr \
+  ./configure --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/lib/dconf
   make
 }

Deleted: load-enum.patch
===================================================================
--- load-enum.patch	2011-05-07 17:47:27 UTC (rev 123045)
+++ load-enum.patch	2011-05-07 19:01:26 UTC (rev 123046)
@@ -1,22 +0,0 @@
-From 0d00a6ad3385e08eff0c50efe970af8d5d63c536 Mon Sep 17 00:00:00 2001
-From: Robert Ancell <robert.ancell at canonical.com>
-Date: Tue, 29 Mar 2011 05:50:12 +0000
-Subject: editor: Load *.enums.xml as well as *.gschema.xml.  This was stopping some enums from being loaded.
-
-Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=636880
----
-diff --git a/editor/dconf-schema.vala b/editor/dconf-schema.vala
-index 2b34e28..c2654b5 100644
---- a/editor/dconf-schema.vala
-+++ b/editor/dconf-schema.vala
-@@ -371,7 +371,7 @@ public class SchemaList
-         while ((info = i.next_file (null)) != null) {
-             string name = info.get_name();
- 
--            if (!name.has_suffix(".gschema.xml"))
-+            if (!name.has_suffix(".gschema.xml") && !name.has_suffix(".enums.xml"))
-                 continue;
- 
-             string path = Path.build_filename(dir, name, null);
---
-cgit v0.9