Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/clementine/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/redis/PKGBUILD
	community/uzbl/PKGBUILD
	extra/anjuta/PKGBUILD
	extra/atkmm/PKGBUILD
	extra/ekiga/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/gdl/PKGBUILD
	extra/glade/PKGBUILD
	extra/glibmm/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnome-menus/PKGBUILD
	extra/gnome-nettool/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/libchamplain/PKGBUILD
	extra/libgda/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libvncserver/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/notification-daemon/PKGBUILD
	extra/pangomm/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/rasqal/PKGBUILD
	extra/redland/PKGBUILD
	extra/vte/PKGBUILD
	extra/xarchiver/PKGBUILD
	extra/yelp/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/mesa/PKGBUILD
	testing/rasqal/PKGBUILD
	testing/redland/PKGBUILD

2 files changed, 39 insertions, 10 deletions

diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD
index 2fdd90e36..f9bd14a1b 100644
--- a/extra/dconf/PKGBUILD
+++ b/extra/dconf/PKGBUILD
@@ -1,26 +1,33 @@
-# $Id:
+# $Id: PKGBUILD 118171 2011-04-05 17:33:39Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=dconf
-pkgver=0.5.1
-pkgrel=1
+pkgver=0.7.3
+pkgrel=2
 pkgdesc="A low-level configuration system."
 arch=(i686 x86_64 'mips64el')
 url="http://live.gnome.org/dconf"
 license=('LGPL2.1')
-depends=('glib2>=2.25.17')
-makedepends=('vala' 'gobject-introspection' 'gtk2')
-optdepends=('gtk2: for dconf-editor')
+depends=('glib2')
+makedepends=('vala' 'gobject-introspection' 'gtk3')
+optdepends=('gtk3: for dconf-editor')
 install=dconf.install
-source=(http://download.gnome.org/sources/${pkgname}/0.5/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('0083d70e1b5e540d8d4b3f04fa5d17dff4c574136682fe3bdd9b5ecc196ec4f6')
+source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2
+       load-enum.patch)
+sha256sums=('84efc95cb62b6637b2131e110ff447908be739c2185d69bebb300293b561dfd9'
+            '8ead56b2897b18c97b9b72b81bd6e9f9249e28743b05a2653bbf4e6af7d9f7cc')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -Np1 -i "${srcdir}/load-enum.patch"
   ./configure --prefix=/usr \
     --libexecdir=/usr/lib/dconf
   make
-  make DESTDIR="$pkgdir/" install
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/dconf/load-enum.patch b/extra/dconf/load-enum.patch
new file mode 100644
index 000000000..949de1e00
--- /dev/null
+++ b/extra/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