From d8f3a8f216e629cb3399dbc32e2d8e5d8030f5c6 Mon Sep 17 00:00:00 2001
From: Jean-Louis Fuchs <ganwell@fangorn.ch>
Date: Mon, 23 Apr 2018 17:40:21 +0200
Subject: community/girara: upgrade to 0.2.9

* Upstream switched to meson build
---
 community/girara/APKBUILD | 35 +++++++++++++++++++----------------
 community/girara/test.sh  |  2 +-
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/community/girara/APKBUILD b/community/girara/APKBUILD
index 05dc323d5c..aabed35ee2 100644
--- a/community/girara/APKBUILD
+++ b/community/girara/APKBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jean-Louis Fuchs <ganwell@fangorn.ch>
 # Maintainer: Jean-Louis Fuchs <ganwell@fangorn.ch>
 pkgname=girara
-pkgver=0.2.8
+pkgver=0.2.9
 pkgrel=0
 pkgdesc="girara - gtk user interface that focuses on simplicity and minimalism"
 url="https://pwmt.org/projects/girara/"
@@ -12,36 +12,39 @@ license="zlib"
 # Remove coreutils from checkdepends once this is fixed:
 # https://bugs.busybox.net/show_bug.cgi?id=10526
 checkdepends="dbus coreutils"
-makedepends="gtk+3.0-dev libnotify-dev intltool doxygen check-dev xvfb ncurses"
+makedepends="gtk+3.0-dev libnotify-dev json-c-dev intltool doxygen check-dev
+	xvfb ncurses meson ninja"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-lang"
-source="https://pwmt.org/projects/girara/download/girara-$pkgver.tar.gz
+source="https://pwmt.org/projects/girara/download/girara-$pkgver.tar.xz
 	test.sh"
 
 builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
-	make -C "$builddir" COLOR=0
-	make -C "$builddir/doc" COLOR=0
+	cd "$builddir"
+	meson build --prefix=/usr
+	ninja -C build
+}
+
+check () {
+	if [ "$CARCH" != "ppc64le" ]; then
+		cd "$builddir"
+		"$srcdir/test.sh"
+	fi
 }
 
 package() {
-	make PREFIX=/usr DESTDIR="$pkgdir" \
-		-C "$builddir" install COLOR=0
+	cd "$builddir"
+	DESTDIR="$pkgdir" ninja -C build install
 }
 
 doc() {
 	pkgdesc="girara - gtk user interface that focuses on simplicity and minimalism (documentation)"
 	local _docdir="$subpkgdir"/usr/share/doc/$pkgname/
 	mkdir -p "$_docdir"
-	cp -r "$builddir"/doc/build/html/* "$_docdir"
+	cp -r "$builddir"/build/doc/html/* "$_docdir"
 }
 
-check () {
-	if [ "$CARCH" != "ppc64le" ]; then
-		cd "$builddir"
-		"$srcdir/test.sh"
-	fi
-}
 
-sha512sums="d853f8337a63ae2ed319547a2daa2ccd3ce6f31b3dbb52522705c78dbbb94da1dc1efc4ac62d3c2af94531d4dea309323b878619ea0c9778c37960791ca0cb4e  girara-0.2.8.tar.gz
-a8e200a84395d638219f2fdb29055d7caead8fc9db63f98e77944f84e206e1d561d36fe6818a969bf4f8b348b7f5c2f5d0db655c01ee8ee31687ecbe9b8c1494  test.sh"
+sha512sums="2e04d3c436dc79098676652d8d503c82b9c6f75af92e84b32ee5e41bcaaca38d079eebd9c1cb461789cff4461c1bea2f95a868dd4cd09acb708f30a5044e5c87  girara-0.2.9.tar.xz
+2190d324753810c8dc5b109274dcf4f644e51edcda876c225ac76369dd569dda0b8db445b01dac1ac2b06178534d18e1074ca37d1a69622bdc58fd77350b4ddd  test.sh"
diff --git a/community/girara/test.sh b/community/girara/test.sh
index 690b3c5a38..b37dc50a9c 100755
--- a/community/girara/test.sh
+++ b/community/girara/test.sh
@@ -3,7 +3,7 @@
 Xvfb :4242 &
 PID=$!
 export DISPLAY=:4242
-if make test COLOR=0; then
+if ninja -C build meson-test; then
 	kill $PID
 	return 0
 else
-- 
cgit v1.2.3