community/qt5-qtbase: upgrade to 5.9.3, improved APKBUILD

1 files changed, 21 insertions, 30 deletions

diff --git a/community/qt5-qtbase/APKBUILD b/community/qt5-qtbase/APKBUILD
index c0a6f4ae02..d77ed81a61 100644
--- a/community/qt5-qtbase/APKBUILD
+++ b/community/qt5-qtbase/APKBUILD
@@ -1,19 +1,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=qt5-qtbase
-pkgver=5.9.1
+_pkgname=${pkgname/qt5-//}-opensource-src
+pkgver=5.9.3
 _ver=${pkgver/_p/-}
 _ver=${_ver/_/-}
 _ver=${_ver/beta0/beta}
 _ver=${_ver/rc0/rc}
 _V=${_ver/rc/RC}
-pkgrel=2
+pkgrel=0
 pkgdesc="Qt5 - QtBase components"
 url="http://qt-project.org/"
 arch="all"
 license="LGPLv2 with exceptions or GPLv3 with exceptions"
 _sub="$pkgname-sqlite $pkgname-odbc $pkgname-postgresql $pkgname-mysql
 	$pkgname-tds $pkgname-x11"
-depends=""
 depends_dev="mesa-dev libice-dev libsm-dev libx11-dev libxext-dev
 	libressl-dev fontconfig-dev freetype-dev glib-dev libpng-dev zlib-dev
 	sqlite-dev dbus-dev perl $_sub"
@@ -47,43 +47,33 @@ makedepends="$depends_dev
 	xcb-util-wm-dev
 	xcb-util-renderutil-dev
 	"
-install=""
 subpackages="$pkgname-dev $pkgname-doc $_sub"
+
 case $pkgver in
 *_beta*|*_rc*) _rel=development_releases;;
 *) _rel=official_releases;;
 esac
-source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtbase-opensource-src-$_V.tar.xz
+source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/$_pkgname-$_V.tar.xz
 	qt-musl-iconv-no-bom.patch
 	libressl-compat.patch
-	hack-openssl_test.patch
 	"
 
 _qt5_prefix=/usr/lib/qt5
 _qt5_datadir=/usr/share/qt5
+builddir="$srcdir"/$_pkgname-${_V%-*}
 
-builddir="$srcdir"/qtbase-opensource-src-${_V%-*}
 prepare() {
+	default_prepare
 	cd "$builddir"
-	for i in $source; do
-		case $i in
-		*.patch)
-			msg "Applying $i"
-			patch -p1 -i "$srcdir"/$i || return 1
-			;;
-		esac
-	done
 	sed -i -e "s|-O2|$CXXFLAGS|" \
 		-e "/^QMAKE_RPATH/s| -Wl,-rpath,||g" \
 		-e "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" \
-		mkspecs/common/*.conf || return 1
+		mkspecs/common/*.conf
 }
 
 build() {
 	local _arch
-
 	cd "$builddir"
-
 	./configure -confirm-license -opensource \
 		-archdatadir "$_qt5_prefix" \
 		-bindir  "$_qt5_prefix"/bin \
@@ -118,14 +108,18 @@ build() {
 		-system-xcb \
 		-system-zlib \
 		-translationdir "$_qt5_datadir"/translations \
-		-no-reduce-relocations \
-		|| return 1
-	make || return 1
+		-no-reduce-relocations
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make INSTALL_ROOT="$pkgdir" install || return 1
+	make INSTALL_ROOT="$pkgdir" install
 	mkdir -p "$pkgdir"/usr/bin/
 	for i in "$pkgdir"/$_qt5_prefix/bin/*; do
 		_name=${i##*/}
@@ -141,7 +135,7 @@ _mv_files() {
 	local i
 	for i; do
 		mkdir -p "$subpkgdir"/${i%/*}
-		mv "$pkgdir"/$i "$subpkgdir"/$i || return 1
+		mv "$pkgdir"/$i "$subpkgdir"/$i
 	done
 }
 
@@ -151,8 +145,7 @@ dev() {
 		usr/lib/cmake \
 		usr/lib/qt5/bin \
 		usr/bin \
-		$(find usr/ -name '*.prl') \
-		|| return 1
+		$(find usr/ -name '*.prl')
 	default_dev
 }
 
@@ -203,14 +196,12 @@ x11() {
 		usr/lib/qt5/plugins/image* \
 		usr/lib/qt5/plugins/platform* \
 		usr/lib/qt5/plugins/printsupport* \
-		usr/lib/qt5/plugins/xcbglintegrations \
-		|| return 1
+		usr/lib/qt5/plugins/xcbglintegrations
 
 	scanelf -Rn usr/ | egrep '(libX|libQt5Gui|libGL)' && return 1
 	return 0
 }
 
-sha512sums="b384e91b3fd88b2f32e826e3dd1c930213683a0fdbfd284a319204fa8d27c796b54324cf4a715f6bebd92fca6426e37cf0be5866fc1f6053b8758570ddb2fa45  qtbase-opensource-src-5.9.1.tar.xz
+sha512sums="256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c  qtbase-opensource-src-5.9.3.tar.xz
 7d68421a14f0259535c977d8a521c98918193c107b76ac664571b12f5b0d7588a0d0e1297af412a26753a393b21f3f44c3274fa8ab5bc87f03705a3a03acb444  qt-musl-iconv-no-bom.patch
-af284ebb51e3d903275f0f43901755fee0d0071a2fa4f5d6e8a4b00d9185d9d9fffba8e5cbda8c4aa2b3acde69fd26a449b23ad104f509fd4156f6908e0b43da  libressl-compat.patch
-3bc1380268f077587114cfa535c58403f59c4c931902d0599633e1365f075d2e253b6f461e22ed3fe3adb12ef45ea97e1dbcbc1bbe0d151435703986f25c44c6  hack-openssl_test.patch"
+af284ebb51e3d903275f0f43901755fee0d0071a2fa4f5d6e8a4b00d9185d9d9fffba8e5cbda8c4aa2b3acde69fd26a449b23ad104f509fd4156f6908e0b43da  libressl-compat.patch"