user/qt5: Bump to 5.12.6 LTS

This updates Qt 5 to the latest LTS release available.  Notable changes:

* The infamous clipboard bug (upstream QTBUG-65145; Gerrit 254187) is fixed!

* Qt Declarative's "V4 JIT" is disabled globally on pmmx.  It is no longer
  (easily) possible to turn off the JIT selectively based on CPU capability.

* Qt Script builds correctly on GCC 8 now.

This does not include:

* Build testing of Qt Multimedia (yet); this depends on the time64-isation
  of the alsa-lib package (at least).

* Build testing of Qt Speech (yet); speech-dispatcher also deps on alsa-lib
  indirectly.

* Qt WebKit 5.212.  This will be committed later.

1 files changed, 11 insertions, 19 deletions

diff --git a/user/qt5-qttools/APKBUILD b/user/qt5-qttools/APKBUILD
index da0fd89c1..876fecd91 100644
--- a/user/qt5-qttools/APKBUILD
+++ b/user/qt5-qttools/APKBUILD
@@ -1,16 +1,15 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qt5-qttools
-_pkgname=qttools-opensource-src
-pkgver=5.9.7
+_pkgname=qttools-everywhere-src
+pkgver=5.12.6
 pkgrel=0
-pkgdesc="Qt 5 - Tools for Qt development"
+pkgdesc="Tools for Qt development"
 url="https://www.qt.io/"
 arch="all"
 options="!check"  # Tests require KDE 4 with special window manager config
-license="LGPLv2 with exceptions OR GPLv3 with exceptions"
+license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0"
 depends=""
 makedepends="qt5-qtbase-dev"
-install=""
 subpackages="$pkgname-dev qt5-assistant:_assistant qt5-qdbusviewer:_dbusviewer
 	qdbus qtpaths"
 source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz
@@ -24,13 +23,11 @@ _qt5_prefix=/usr/lib/qt5
 builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
-	cd "$builddir"
 	qmake
 	make
 }
 
 package() {
-	cd "$builddir"
 	make install INSTALL_ROOT="$pkgdir"
 
 	mkdir -p "$pkgdir"/usr/bin/
@@ -65,32 +62,28 @@ package() {
 }
 
 _mv_files() {
-	local i
 	for i in "$@"; do
 		mkdir -p "$subpkgdir"/${i%/*}
-		mv "$pkgdir"/$i "$subpkgdir"/$i
+		mv "$pkgdir"/$i "$subpkgdir"/${i%/*}
 	done
 }
 
 qdbus() {
 	pkgdesc="Qt 5 D-Bus tool"
 	depends="dbus-x11"
-	cd "$pkgdir"
 	_mv_files $_qt5_prefix/bin/qdbus usr/bin/qdbus-qt5 usr/bin/qdbus
 }
 
 qtpaths() {
 	pkgdesc="Qt 5 path determination tool"
-	cd "$pkgdir"
 	_mv_files $_qt5_prefix/bin/qtpaths usr/bin/qtpaths-qt5 usr/bin/qtpaths
 }
 
 dev() {
-	pkgdesc="More Qt 5 development utilities (Qt Designer, Qt Linguist)"
 	default_dev
-	cd "$pkgdir"
+	pkgdesc="More Qt 5 development utilities (Qt Designer, Qt Linguist)"
 	for i in designer lconvert linguist lrelease lupdate pixeltool \
-		qcollectiongenerator qhelpconverter qhelpgenerator; do
+		qcollectiongenerator qhelpgenerator; do
 
 		_mv_files $_qt5_prefix/bin/$i usr/bin/$i-qt5 usr/bin/$i
 	done
@@ -103,23 +96,22 @@ dev() {
 
 _assistant() {
 	pkgdesc="Documentation browser for Qt 5"
-	cd "$pkgdir"
+	# workaround for weird shell bug???
 	_mv_files usr/bin/assist* \
 		$_qt5_prefix/bin/assist* \
 		usr/share/applications/*assistant* \
-		usr/share/icons/hicolor/*/apps/assistant*
+		usr/share/icons/hicolor/{32x32,128x128}/apps/assistant*
 }
 
 _dbusviewer() {
 	pkgdesc="Qt 5 D-Bus debugger and viewer"
-	cd "$pkgdir"
 	_mv_files usr/bin/qdbusviewer* \
 		$_qt5_prefix/bin/qdbusviewer* \
 		usr/share/applications/qdbusviewer* \
-		usr/share/icons/hicolor/*/apps/qdbusviewer*
+		usr/share/icons/hicolor/{32x32,128x128}/apps/qdbusviewer*
 }
 
-sha512sums="0240881adf23d3b5841882e107969ed298ee05b82c125a7577b568b29d4402259d459e534408f8768ce419c61a8c974c35454cb94c9387e160fd308209188b8a  qttools-opensource-src-5.9.7.tar.xz
+sha512sums="fd35a9dad9f797657121ce9daf916483f81fcc9dc2cd8ee30333d3614a17376579278f993ed2b96c578c64c7cdad0003151ed350c129263d377e0f1b0a34f787  qttools-everywhere-src-5.12.6.tar.xz
 d566c5284854855541df7177b23f491d96f5064b571e899a44f1d4fcf8bbf1223590b05b1954278dc6f3f56341c917f5b846594c5bd2215b6a859224038d8ad2  assistant-qt5.desktop
 72d9a2235a60c4ae05ba8395d473fe0b42c12e584da619dadb112eb67ba33a85fe0dab6c185d98112d7b25d3eeacaf02f7ef4731742e50c17eacc54c383661b3  designer-qt5.desktop
 b6d8a672d19eed39ab868ff6fc880f255da94acb9e1e84f5905c0f3b9b6055547e8a706492973692c06dc23d35ce77622fc13efc11adf21b62c3baf4ef5ab2ad  linguist-qt5.desktop