From 65270d710ceaa587b576c9d745628fb75d6b11aa Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 17 Aug 2011 12:12:30 +0000
Subject: main/dconf: upgrade to 0.9.0. split out dconf-editor

---
 ...oid-posix_fallocate-so-it-works-on-uClibc.patch | 36 ----------------------
 main/dconf/APKBUILD                                | 23 ++++++++++----
 2 files changed, 17 insertions(+), 42 deletions(-)
 delete mode 100644 main/dconf/0001-Avoid-posix_fallocate-so-it-works-on-uClibc.patch

(limited to 'main/dconf')

diff --git a/main/dconf/0001-Avoid-posix_fallocate-so-it-works-on-uClibc.patch b/main/dconf/0001-Avoid-posix_fallocate-so-it-works-on-uClibc.patch
deleted file mode 100644
index 5317b39c9..000000000
--- a/main/dconf/0001-Avoid-posix_fallocate-so-it-works-on-uClibc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From e6d875ff19ba7f23e68a2131d9abe2de3f39d001 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Sat, 9 Oct 2010 20:34:08 +0000
-Subject: [PATCH] Avoid posix_fallocate() so it works on uClibc
-
-It seems like the possix_fallocate() does not need to be provided on
-all implementations (see "Application Usage" in
-http://www.opengroup.org/onlinepubs/009695399/functions/posix_fallocate.html )
-
-I'm not too familiar with the code but it looks like _DConfEngine->shm
-is a mmap to a file with 1 char size. If thats the case then something
-like this would work:
----
- engine/dconf-engine.c |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/engine/dconf-engine.c b/engine/dconf-engine.c
-index cf57431..8eb3fa7 100644
---- a/engine/dconf-engine.c
-+++ b/engine/dconf-engine.c
-@@ -144,7 +144,11 @@ dconf_engine_setup_user (DConfEngine *engine)
- 
-           if (fd >= 0)
-             {
--              if (posix_fallocate (fd, 0, 1) == 0)
-+	      struct stat st;
-+	      int r = fstat(fd, &st);
-+	      if (r == 0 && st.st_size == 0)
-+	      	r = write(fd, "", 1);
-+              if (r == 0)
-                 {
-                   engine->shm = mmap (NULL, 1, PROT_READ, MAP_SHARED, fd, 0);
- 
--- 
-1.7.3.1
-
diff --git a/main/dconf/APKBUILD b/main/dconf/APKBUILD
index 812b03c7b..4519f4906 100644
--- a/main/dconf/APKBUILD
+++ b/main/dconf/APKBUILD
@@ -1,18 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dconf
-pkgver=0.5.1
+pkgver=0.9.0
 pkgrel=0
 pkgdesc="A low-level configuration system."
 url="http://live.gnome.org/dconf"
 arch="all"
 license="LGPL2.1"
 depends=""
-makedepends="vala gobject-introspection-dev gtk+-dev glib-dev libxml2-dev"
+makedepends="vala gobject-introspection-dev gtk+3.0-dev glib-dev libxml2-dev
+	dbus-dev"
 install=
-source="http://download.gnome.org/sources/dconf/0.5/dconf-$pkgver.tar.bz2
-	0001-Avoid-posix_fallocate-so-it-works-on-uClibc.patch
+subpackages="$pkgname-editor"
+source="http://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.bz2
 	"
 
+#	0001-Avoid-posix_fallocate-so-it-works-on-uClibc.patch
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
@@ -38,5 +40,14 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="c905497d0255fe2ba58564f9655908ab  dconf-0.5.1.tar.bz2
-750788f7fa6ff128ecdf7639ffff8b78  0001-Avoid-posix_fallocate-so-it-works-on-uClibc.patch"
+editor() {
+	pkgdesc="Configuration editor for dconf"
+	mkdir -p "$subpkgdir"/usr/bin \
+		"$subpkgdir"/usr/share/applications \
+		|| return 1
+	mv "$pkgdir"/usr/bin/dconf-editor "$subpkgdir"/usr/bin/ || return 1
+	mv "$pkgdir"/usr/share/dconf-editor "$subpkgdir"/usr/share/ || return 1
+	mv "$pkgdir"/usr/share/applications/dconf-editor.desktop \
+		"$subpkgdir"/usr/share/applications/  || return 1
+}
+md5sums="bd59d7ad24a1cb42092f80beddce4632  dconf-0.9.0.tar.bz2"
-- 
cgit v1.2.3