main/cairo: modernise, explicit configure, broken tests

main/cairo/APKBUILD

@@ -1,10 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cairo
 pkgver=1.14.12
-pkgrel=0
+pkgrel=1
 pkgdesc="A vector graphics library"
 url="http://cairographics.org/"
 arch="all"
+options="!check"  # Recursive dependency on gtk+2.0 for check.
 license="LGPL-2.0-or-later MPL-1.1"
 depends=
 depends_dev="fontconfig-dev freetype-dev libxrender-dev pixman-dev
@@ -21,12 +22,12 @@ builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
 	cd "$builddir"
-	default_prepare || return 1
+	default_prepare
 
 	# infinality
 	for j in "$srcdir"/fontconfig-ultimate-$_ultver/$pkgname/*.patch; do
 		msg "Applying ${j}"
-		patch -p1 -i $j || return 1
+		patch -p1 -i $j
 	done
 }
 
@@ -44,18 +45,21 @@ build() {
 		--enable-pdf \
 		--enable-png \
 		--enable-ps \
+		--enable-svg \
 		--enable-tee \
+		--enable-x \
 		--enable-xcb \
+		--enable-xcb-shm \
+		--enable-xlib \
 		--enable-xlib-xrender \
 		--disable-xlib-xcb \
-		--disable-static \
-		|| return 1
-	make || return 1
+		--disable-static
+	make
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 gobject() {
@@ -67,7 +71,7 @@ gobject() {
 tools() {
 	pkgdesc="$pkgdesc (development tools)"
 	mkdir -p "$subpkgdir"/usr/lib/cairo
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ || return 1
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 	mv "$pkgdir"/usr/lib/cairo/libcairo-trace.* \
 		"$subpkgdir"/usr/lib/cairo/
 }