summaryrefslogtreecommitdiff
path: root/gnome-unstable/dconf
diff options
context:
space:
mode:
authorParabola <dev@list.parabolagnulinux.org>2011-04-07 03:09:25 +0000
committerParabola <dev@list.parabolagnulinux.org>2011-04-07 03:09:25 +0000
commitbd65dc7107bfdd881c3b5451d0300824cf435428 (patch)
treee3a556d41162da07c82e31daa6fc22af18719e63 /gnome-unstable/dconf
parent415856bdd4f48ab4f2732996f0bae58595092bbe (diff)
Thu Apr 7 03:09:43 UTC 2011
Diffstat (limited to 'gnome-unstable/dconf')
-rw-r--r--gnome-unstable/dconf/PKGBUILD11
-rw-r--r--gnome-unstable/dconf/load-enum.patch22
2 files changed, 29 insertions, 4 deletions
diff --git a/gnome-unstable/dconf/PKGBUILD b/gnome-unstable/dconf/PKGBUILD
index 89972bfb7..e650eba4c 100644
--- a/gnome-unstable/dconf/PKGBUILD
+++ b/gnome-unstable/dconf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 116096 2011-03-22 18:35:51Z ibiru $
+# $Id: PKGBUILD 118171 2011-04-05 17:33:39Z ibiru $
# Maintainer: Ionut Biru <ibiru@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 @@ depends=('glib2')
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
diff --git a/gnome-unstable/dconf/load-enum.patch b/gnome-unstable/dconf/load-enum.patch
new file mode 100644
index 000000000..949de1e00
--- /dev/null
+++ b/gnome-unstable/dconf/load-enum.patch
@@ -0,0 +1,22 @@
+From 0d00a6ad3385e08eff0c50efe970af8d5d63c536 Mon Sep 17 00:00:00 2001
+From: Robert Ancell <robert.ancell@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