From 3704cbf44d3cbcbc4eb621fffae8712e48f51035 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 7 Feb 2018 13:59:32 -0600
Subject: main/gtk+2.0: modernise, explicit configure, license

---
 main/gtk+2.0/APKBUILD | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

(limited to 'main/gtk+2.0/APKBUILD')

diff --git a/main/gtk+2.0/APKBUILD b/main/gtk+2.0/APKBUILD
index 1f07edb86d8..f6c0c2bfcb3 100644
--- a/main/gtk+2.0/APKBUILD
+++ b/main/gtk+2.0/APKBUILD
@@ -1,14 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gtk+2.0
 pkgver=2.24.31
-pkgrel=0
+pkgrel=1
 subpkg=gtk-update-icon-cache
 pkgdesc="The GTK+ Toolkit (v2)"
 url="https://www.gtk.org/"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
 triggers="$subpkg.trigger=/usr/share/icons/*"
 arch="all"
-license="LGPL"
+options="!check"  # Requires xvfb, resulting in eventual circular dependency
+license="LGPL-2.0+"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $subpkg:icon_cache"
 depends="shared-mime-info gtk-update-icon-cache"
 
@@ -30,9 +31,9 @@ makedepends="
 	$depends_dev
 	cups-dev
 	expat-dev
-    gdk-pixbuf-dev
+	gdk-pixbuf-dev
 	gettext-dev
-    glib-dev
+	glib-dev
 	gnutls-dev
 	gobject-introspection-dev
 	gtk-doc
@@ -51,16 +52,11 @@ source="https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
 	gtk2-fixdso.patch
 	"
 
+builddir="$srcdir"/gtk+-$pkgver
 
-_builddir="$srcdir"/gtk+-$pkgver
 prepare() {
-        local i
-        cd "$_builddir"
-        for i in $source; do
-                case $i in
-                *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-                esac
-        done
+	cd "$builddir"
+	default_prepare
 	libtoolize --force \
 		&& aclocal -I m4 \
 		&& autoconf \
@@ -68,7 +64,7 @@ prepare() {
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -78,32 +74,34 @@ build() {
 		--with-xinput=yes \
 		--without-libjasper \
 		--with-included-loaders=png \
-		|| return 1
+		--with-gdktarget=x11 \
+		--enable-cups \
+		--enable-man
 	# https://bugzilla.gnome.org/show_bug.cgi?id=655517
-	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool || return 1
-	make || return 1
+	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 }
 
 dev() {
 	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/share/
-	mv "$pkgdir"/usr/share/gtk-2.0 "$subpkgdir"/usr/share/ || return 1
+	mv "$pkgdir"/usr/share/gtk-2.0 "$subpkgdir"/usr/share/
 	default_dev
 	replaces="gtk+2.0"
 	mv "$pkgdir"/usr/bin/gtk-builder-convert \
 		"$pkgdir"/usr/bin/gtk-demo \
-		"$subpkgdir"/usr/bin || return 1
+		"$subpkgdir"/usr/bin
 }
 
 icon_cache() {
 	depends="hicolor-icon-theme"
 
 	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/"$subpkg" "$subpkgdir"/usr/bin || return 1
+	mv "$pkgdir"/usr/bin/"$subpkg" "$subpkgdir"/usr/bin
 }
 
 sha512sums="75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1  gtk+-2.24.31.tar.xz
-- 
cgit v1.2.3