diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-09 20:23:53 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-09 20:23:53 -0300 |
| commit | 7c6a0188a5ac63d4bb6c667c2f1bcf26792312e6 (patch) | |
| tree | 706c3ba50b28eb4e1414d122b28ce69cf2c8a285 /extra/dconf | |
| parent | 25828de60b05b955dc23d7226b591b416f955875 (diff) | |
| parent | d2f2d3b5c845807249680c275031f94047f9e762 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libtextcat/PKGBUILD
extra/glsof/PKGBUILD
extra/orca/PKGBUILD
extra/python-qt/PKGBUILD
extra/python-sip/PKGBUILD
extra/python2-qt/PKGBUILD
extra/python2-sip/PKGBUILD
extra/swfdec-mozilla/PKGBUILD
extra/swfdec/PKGBUILD
extra/trayer/PKGBUILD
extra/xbill/PKGBUILD
extra/xfce4-xfapplet-plugin/PKGBUILD
Diffstat (limited to 'extra/dconf')
| -rw-r--r-- | extra/dconf/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/dconf/load-enum.patch | 22 |
2 files changed, 6 insertions, 31 deletions
diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD index f9bd14a1b..14aec63dd 100644 --- a/extra/dconf/PKGBUILD +++ b/extra/dconf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 118171 2011-04-05 17:33:39Z ibiru $ +# $Id: PKGBUILD 123046 2011-05-07 19:01:26Z ibiru $ # Maintainer: Ionut Biru <ibiru@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 'mips64el') url="http://live.gnome.org/dconf" @@ -11,16 +11,13 @@ 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 - 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 } diff --git a/extra/dconf/load-enum.patch b/extra/dconf/load-enum.patch deleted file mode 100644 index 949de1e00..000000000 --- a/extra/dconf/load-enum.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 |