From e1e90ffb5be4ab101b369e24387e8e86c6fb237f Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 17 Sep 2017 17:15:08 -0500
Subject: main/xfconf: modernise, fix deps, add + disable tests

---
 main/xfconf/APKBUILD | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/main/xfconf/APKBUILD b/main/xfconf/APKBUILD
index 9902187fac2..e111b2ea63f 100644
--- a/main/xfconf/APKBUILD
+++ b/main/xfconf/APKBUILD
@@ -1,25 +1,22 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfconf
 pkgver=4.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Hierarchical configuration system for Xfce"
 url="http://www.xfce.org/"
 arch="all"
 license="GPL2"
+options="!check"  # Requires running dbus daemon.
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 depends=
-depends_dev="glib-dev dbus-dev dbus-glib-dev"
-makedepends="$depends_dev libxfce4util-dev intltool gtk-doc"
+makedepends="libxfce4util-dev intltool gtk-doc glib-dev dbus-dev dbus-glib-dev"
 source="http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
 
 
-_builddir="$srcdir"/$pkgname-$pkgver
+builddir="$srcdir"/$pkgname-$pkgver
 
-prepare() {
-	cd "$_builddir"
-}
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,14 +25,18 @@ build() {
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
 		--disable-static \
-		--enable-gtk-doc \
-		|| return 1
-	make || return 1
+		--enable-gtk-doc
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 }
 md5sums="20dc8d2bfd80ba136bf4964021b32757  xfconf-4.12.1.tar.bz2"
 sha256sums="35f48564e5694faa54fdc180cd3268e16fc2352946a89a3c2fc12cbe400ada36  xfconf-4.12.1.tar.bz2"
-- 
cgit v1.2.3