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

[Ionut Biru]

    Date: Tuesday, April 5, 2011 @ 13:33:39
  Author: ibiru
Revision: 118171

upgpkg: dconf 0.7.3-2
fix loading entries from drop down lists

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

-----------------+
 PKGBUILD        |    9 ++++++---
 load-enum.patch |   22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-05 16:59:37 UTC (rev 118170)
+++ PKGBUILD	2011-04-05 17:33:39 UTC (rev 118171)
@@ -2,7 +2,7 @@
 # Maintainer: Ionut Biru <ibiru at archlinux.org>
 pkgname=dconf
 pkgver=0.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A low-level configuration system."
 arch=(i686 x86_64)
 url="http://live.gnome.org/dconf"
@@ -11,12 +11,15 @@
 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)
-sha256sums=('84efc95cb62b6637b2131e110ff447908be739c2185d69bebb300293b561dfd9')
+source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2
+       load-enum.patch)
+sha256sums=('84efc95cb62b6637b2131e110ff447908be739c2185d69bebb300293b561dfd9'
+            '8ead56b2897b18c97b9b72b81bd6e9f9249e28743b05a2653bbf4e6af7d9f7cc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -Np1 -i "${srcdir}/load-enum.patch"
   ./configure --prefix=/usr \
     --libexecdir=/usr/lib/dconf
   make

Added: load-enum.patch
===================================================================
--- load-enum.patch	                        (rev 0)
+++ load-enum.patch	2011-04-05 17:33:39 UTC (rev 118171)
@@ -0,0 +1,22 @@
+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