Subject: [alpine-aports] [PATCH] main/gtk+3.0: upgrade to 3.24.7, modernise

From: Paul Bredbury <[email-masked]>
Date: Sun, 24 Mar 2019 17:49:14 +0000

---
 main/gtk+3.0/APKBUILD | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/main/gtk+3.0/APKBUILD b/main/gtk+3.0/APKBUILD
index 358d8bd07e..4e6940e286 100644
--- a/main/gtk+3.0/APKBUILD
+++ b/main/gtk+3.0/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=gtk+3.0
-pkgver=3.24.1
-pkgrel=1
+pkgver=3.24.7
+pkgrel=0
 pkgdesc="The GTK+ Toolkit (v3)"
 url="https://www.gtk.org/"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
@@ -54,7 +54,7 @@ source="https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
 	10-Revert-gdkseatdefault-Grab-touch-events-where-applic.patch"

-builddir="$srcdir"/gtk+-$pkgver
+builddir="$srcdir/gtk+-$pkgver"
 
 build() {
 	cd "$builddir"
@@ -71,23 +71,22 @@ build() {
 		--enable-xcomposite \
 		--enable-xdamage \
 		--enable-x11-backend \
-		--enable-wayland-backend \
-		|| return 1
+		--enable-wayland-backend
 
 	# https://bugzilla.gnome.org/show_bug.cgi?id=655517
-	sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool || return 1
+	sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
-	make || return 1
+	make
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 
 	# use gtk-update-icon-cache from gtk+2.0 for now
 	rm -f "$pkgdir"/usr/bin/gtk-update-icon-cache
 	rm -f "$pkgdir"/usr/share/man/man1/gtk-update-icon-cache.1
 }
 
-sha512sums="13ddb1099a2a0eb44ea53fa4be5054a403e1b27468a33862646ba111577b7bb72b9bbe4f6aea15889c2a2bee1238023bc23524b901cf2dbb3adf0e126eb6ea5d  gtk+-3.24.1.tar.xz
+sha512sums="2605087c3e09c81192769e6c4bcc4374e0fadbc4d05433edeaefd9915e128ff925c64fb3d07799bacccb16d85d31e53936ac09c696a09349efa6e21d886074c5  gtk+-3.24.7.tar.xz
 e4ea76484b70bd9beb65b2964bbcff3b3f78f5f6fe70b12309a7721ca134e3735e8aaac09803f93b393a6130a703f8f346c0df89ad45d18c580dac1e0e922276  10-Revert-gdkseatdefault-Grab-touch-events-where-applic.patch"
-- 
2.21.0

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---