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

1 files changed, 26 insertions, 37 deletions

diff --git a/community/qt5-qttools/APKBUILD b/community/qt5-qttools/APKBUILD
index c681d5b7d7..cf5433699c 100644
--- a/community/qt5-qttools/APKBUILD
+++ b/community/qt5-qttools/APKBUILD
@@ -1,27 +1,24 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=qt5-qttools
-pkgver=5.9.1
+_pkgname=${pkgname/qt5-//}-opensource-src
+pkgver=5.9.3
+_ver=${pkgver/_/-}
+_ver=${_ver/beta0/beta}
+_ver=${_ver/rc0/rc}
+_V=${_ver/rc/RC}
 pkgrel=0
 pkgdesc="Qt5 - QtTool components"
 url="http://qt-project.org/"
 arch="all"
 license="LGPLv2 with exceptions or GPLv3 with exceptions"
-depends=""
-depends_dev="qt5-qtbase-dev"
-makedepends="$depends_dev"
-install=""
+makedepends="qt5-qtbase-dev"
 subpackages="$pkgname-dev qt5-assistant:_assistant qt5-qdbusviewer:_dbusviewer"
 
-_ver=${pkgver/_/-}
-_ver=${_ver/beta0/beta}
-_ver=${_ver/rc0/rc}
-_V=${_ver/rc/RC}
 case $pkgver in
 *_beta*|*_rc*) _rel=development_releases;;
 *) _rel=official_releases;;
 esac
-
-source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/qttools-opensource-src-$_V.tar.xz
+source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/$_pkgname-$_V.tar.xz
 	assistant-qt5.desktop
 	designer-qt5.desktop
 	linguist-qt5.desktop
@@ -29,58 +26,53 @@ source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/qt
 	"
 
 _qt5_prefix=/usr/lib/qt5
-builddir="$srcdir"/qttools-opensource-src-$_V
+builddir="$srcdir"/$_pkgname-${_V%-*}
 
 build() {
 	cd "$builddir"
-	qmake-qt5 && make || return 1
+	qmake-qt5 && make
 }
 
 package() {
 	cd "$builddir"
-	make install INSTALL_ROOT="$pkgdir" || return 1
+	make install INSTALL_ROOT="$pkgdir"
 
 	# -qt5 symlinks
 	mkdir -p "$pkgdir"/usr/bin/
 	for i in "$pkgdir"/$_qt5_prefix/bin/*; do
-		ln -s ../lib/qt5/bin/${i##*/} "$pkgdir"/usr/bin/${i##*/}-qt5 || return 1
+		ln -s ../lib/qt5/bin/${i##*/} "$pkgdir"/usr/bin/${i##*/}-qt5
 	done
 
 	for i in $source; do
 		case $i in
 		*.desktop) install -Dm644 "$srcdir"/$i \
-			"$pkgdir"/usr/share/applications/$i || return 1;;
+			"$pkgdir"/usr/share/applications/$i ;;
 		esac
 	done
 	# icons
 	install -m644 -p -D src/assistant/assistant/images/assistant.png \
-		"$pkgdir"/usr/share/icons/hicolor/32x32/apps/assistant-qt5.png \
-		|| return 1
+		"$pkgdir"/usr/share/icons/hicolor/32x32/apps/assistant-qt5.png
 	install -m644 -p -D src/assistant/assistant/images/assistant-128.png \
-		"$pkgdir"/usr/share/icons/hicolor/128x128/apps/assistant-qt5.png\
-		|| return 1
+		"$pkgdir"/usr/share/icons/hicolor/128x128/apps/assistant-qt5.png
 	install -m644 -p -D src/designer/src/designer/images/designer.png \
-		"$pkgdir"/usr/share/icons/hicolor/32x32/apps/designer-qt5.png \
-		|| return 1
+		"$pkgdir"/usr/share/icons/hicolor/32x32/apps/designer-qt5.png
 	install -m644 -p -D src/qdbus/qdbusviewer/images/qdbusviewer.png \
-		"$pkgdir"/usr/share/icons/hicolor/32x32/apps/qdbusviewer-qt5.png \
-		|| return 1
+		"$pkgdir"/usr/share/icons/hicolor/32x32/apps/qdbusviewer-qt5.png
 	install -m644 -p -D src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
-		"$pkgdir"/usr/share/icons/hicolor/128x128/apps/qdbusviewer-qt5.png \
-		|| return 1
+		"$pkgdir"/usr/share/icons/hicolor/128x128/apps/qdbusviewer-qt5.png
 	# linguist icons
 	for icon in src/linguist/linguist/images/icons/linguist-*-32.png ; do
 		size=$(echo ${icon##*/} | cut -d- -f2)
 	    install -p -m644 -D ${icon} \
-		"$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png || return 1
-	    done
+		"$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png
+	done
 }
 
 _mv_files() {
 	local i
 	for i in "$@"; do
 		mkdir -p "$subpkgdir"/${i%/*}
-		mv "$pkgdir"/$i "$subpkgdir"/$i || return 1
+		mv "$pkgdir"/$i "$subpkgdir"/$i
 	done
 }
 
@@ -90,14 +82,13 @@ dev() {
 	for i in designer lconvert linguist lrelease lupdate pixeltool \
 		qcollectiongenerator qhelpconverter qhelpgenerator; do
 
-		_mv_files $_qt5_prefix/bin/$i usr/bin/$i-qt5 || return 1
+		_mv_files $_qt5_prefix/bin/$i usr/bin/$i-qt5
 	done
 	_mv_files \
 		usr/share/applications/designer* \
 		usr/share/applications/linguist* \
 		usr/share/icons/hicolor/*/apps/designer* \
-		usr/share/icons/hicolor/*/apps/linguist* \
-		|| return 1
+		usr/share/icons/hicolor/*/apps/linguist*
 }
 
 _assistant() {
@@ -106,8 +97,7 @@ _assistant() {
 	_mv_files usr/bin/assist* \
 		$_qt5_prefix/bin/assist* \
 		usr/share/applications/*assistant* \
-		usr/share/icons/hicolor/*/apps/assistant* \
-		|| return 1
+		usr/share/icons/hicolor/*/apps/assistant*
 }
 
 _dbusviewer() {
@@ -116,11 +106,10 @@ _dbusviewer() {
 	_mv_files usr/bin/qdbusviewer* \
 		$_qt5_prefix/bin/qdbusviewer* \
 		usr/share/applications/qdbusviewer* \
-		usr/share/icons/hicolor/*/apps/qdbusviewer* \
-		|| return 1
+		usr/share/icons/hicolor/*/apps/qdbusviewer*
 }
 
-sha512sums="689d0d19b56c333862dc3270b72e83ad640c0b6462c37b13c5ad522338d2d7e105c88d47f506243b5fcf4d5813b63ce559049977e8d2c3e4fd1d7c5be9cd0a3f  qttools-opensource-src-5.9.1.tar.xz
+sha512sums="5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f  qttools-opensource-src-5.9.3.tar.xz
 d566c5284854855541df7177b23f491d96f5064b571e899a44f1d4fcf8bbf1223590b05b1954278dc6f3f56341c917f5b846594c5bd2215b6a859224038d8ad2  assistant-qt5.desktop
 72d9a2235a60c4ae05ba8395d473fe0b42c12e584da619dadb112eb67ba33a85fe0dab6c185d98112d7b25d3eeacaf02f7ef4731742e50c17eacc54c383661b3  designer-qt5.desktop
 b6d8a672d19eed39ab868ff6fc880f255da94acb9e1e84f5905c0f3b9b6055547e8a706492973692c06dc23d35ce77622fc13efc11adf21b62c3baf4ef5ab2ad  linguist-qt5.desktop