From 21e70eae871680d51654c71bdd8ed3b841b78acc Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 5 Sep 2017 23:19:30 -0500
Subject: [PATCH] main/libxcomposite: modernise, fix deps, mark no test

---
 main/libxcomposite/APKBUILD | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/main/libxcomposite/APKBUILD b/main/libxcomposite/APKBUILD
index e07db149d2..2dbf1a8c2a 100644
--- a/main/libxcomposite/APKBUILD
+++ b/main/libxcomposite/APKBUILD
@@ -1,39 +1,40 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxcomposite
 pkgver=0.4.4
-pkgrel=0
+pkgrel=1
 pkgdesc="X11 Composite extension library"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
+options="!check"  # No test suite.
 subpackages="$pkgname-dev $pkgname-doc"
 depends=
-depends_dev="xproto compositeproto libxfixes-dev libx11-dev libxext-dev"
-makedepends="libxfixes-dev libxext-dev compositeproto"
+depends_dev="libxext-dev"
+makedepends="libx11-dev libxext-dev libxfixes-dev compositeproto util-macros xproto"
 source="http://www.x.org/releases/individual/lib/libXcomposite-$pkgver.tar.bz2"
 
-_builddir="$srcdir"/libXcomposite-$pkgver
+builddir="$srcdir"/libXcomposite-$pkgver
 
 prepare() {
-	cd "$_builddir"
+	cd "$builddir"
 	chmod u+w config.sub
-	update_config_sub || return 1
+	update_config_sub
+	default_prepare
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--sysconfdir=/etc \
-		|| return 1
-	make || return 1
+		--sysconfdir=/etc
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-- 
GitLab