From 9d27d0cf3f37ce81b1614cfb875ee3c4a8a87b52 Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Fri, 17 Nov 2017 10:48:17 +0000
Subject: main/gtk-xfce-engine: modernize and add check

---
 main/gtk-xfce-engine/APKBUILD | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

(limited to 'main')

diff --git a/main/gtk-xfce-engine/APKBUILD b/main/gtk-xfce-engine/APKBUILD
index 8b28ed3ae0..bac70aa89c 100644
--- a/main/gtk-xfce-engine/APKBUILD
+++ b/main/gtk-xfce-engine/APKBUILD
@@ -1,29 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gtk-xfce-engine
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Xfce theme engine"
 url="http://www.xfce.org/"
 arch="all"
 license="GPL2"
-depends=
 makedepends="gtk+2.0-dev gtk+3.0-dev"
 source="http://archive.xfce.org/src/xfce/gtk-xfce-engine/${pkgver%.*}/gtk-xfce-engine-$pkgver.tar.bz2
 fix-utf8-codec-can-not-decode-byte.patch"
 subpackages="gtk2-xfce-engine:_gtk2 gtk3-xfce-engine:_gtk3"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -33,14 +24,18 @@ build() {
 		--localstatedir=/var \
 		--disable-static \
 		--enable-gtk3 \
-		--enable-gtk2 \
-		|| return 1
-	make || return 1
+		--enable-gtk2
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 }
 
 _split() {
@@ -49,8 +44,8 @@ _split() {
 	install_if="$pkgname=$pkgver-r$pkgrel ${1/-/+}"
 	cd "$pkgdir"
 	for dir in usr/lib/$1 usr/share/themes/*/$1; do
-		mkdir -p "$subpkgdir"/${dir%/*} || return 1
-		mv $dir "$subpkgdir"/${dir%/*} || return 1
+		mkdir -p "$subpkgdir"/${dir%/*}
+		mv $dir "$subpkgdir"/${dir%/*}
 	done
 }
 
-- 
cgit v1.2.3