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.
author: A. Wilcox <AWilcox@Wilcox-Tech.com> 2019-12-27 04:02:42 -0600
committer: A. Wilcox <AWilcox@Wilcox-Tech.com> 2019-12-27 04:02:42 -0600
commit: 47d18b13213ccd7c51894796760f97571c3eb424 (patch)
tree: 6e31cc5d066c199564a5c8f34a40d313a08c44aa /user
parent: 9b07de55dfe6d50baeda3a8feda7f9fcade9c647 (diff)
download: packages-47d18b13213ccd7c51894796760f97571c3eb424.tar.gz
packages-47d18b13213ccd7c51894796760f97571c3eb424.tar.bz2
packages-47d18b13213ccd7c51894796760f97571c3eb424.tar.xz
packages-47d18b13213ccd7c51894796760f97571c3eb424.zip
24 files changed, 263 insertions, 572 deletions
diff --git a/user/qt5-qtbase/APKBUILD b/user/qt5-qtbase/APKBUILD
index 95f461d64..18b5b88ad 100644
--- a/user/qt5-qtbase/APKBUILD
+++ b/user/qt5-qtbase/APKBUILD
@@ -1,14 +1,15 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qt5-qtbase
-_pkgname=qtbase-opensource-src
-pkgver=5.9.7
-pkgrel=1
-pkgdesc="Qt 5.9 base components"
+_pkgname=qtbase-everywhere-src
+pkgver=5.12.6
+pkgrel=0
+pkgdesc="Cross-platform application and UI framework"
 url="https://www.qt.io/"
 arch="all"
-license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions"
+license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0"
 _sub="$pkgname-sqlite $pkgname-odbc $pkgname-postgresql
 	$pkgname-tds $pkgname-x11"
+depends=""
 depends_dev="dbus-dev fontconfig-dev freetype-dev glib-dev libice-dev
 	libpng-dev libsm-dev libx11-dev libxext-dev mesa-dev openssl-dev perl
 	sqlite-dev zlib-dev $_sub"
@@ -25,15 +26,23 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu
 	big-endian-scroll-wheel.patch
 	link-to-execinfo.patch
 	qt-musl-iconv-no-bom.patch
+	time64.patch
 	"
 
+# secfixes: qt
+#   5.9.7-r0:
+#     - CVE-2018-15518
+#     - CVE-2018-19869
+#     - CVE-2018-19870
+#     - CVE-2018-19871
+#     - CVE-2018-19873
+
 _qt5_prefix=/usr/lib/qt5
 _qt5_datadir=/usr/share/qt5
 builddir="$srcdir"/$_pkgname-$pkgver
 
 prepare() {
 	default_prepare
-	cd "$builddir"
 	sed -i -e "s|-O2|$CXXFLAGS|" \
 		-e "/^QMAKE_RPATH/s| -Wl,-rpath,||g" \
 		-e "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" \
@@ -41,9 +50,7 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
-
-	local ARCH_OPTS=""
+	ARCH_OPTS=""
 	[ ${CTARGET_ARCH} != "pmmx" ] || ARCH_OPTS="-no-sse2"
 
 	./configure -confirm-license -opensource \
@@ -56,6 +63,7 @@ build() {
 		-glib \
 		-icu \
 		-importdir "$_qt5_prefix"/imports \
+		-kms \
 		-libexecdir "$_qt5_prefix"/libexec \
 		-no-pch \
 		-no-rpath \
@@ -87,15 +95,12 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make INSTALL_ROOT="$pkgdir" install
 	mkdir -p "$pkgdir"/usr/bin/
-	local i
 	for i in "$pkgdir"/$_qt5_prefix/bin/*; do
 		ln -s ../lib/qt5/bin/"$(basename $i)" \
 			"$pkgdir"/usr/bin/"$(basename $i)"
@@ -103,15 +108,14 @@ package() {
 }
 
 _mv_files() {
-	local i
-	for i; do
+	for i in "$@"; do
 		mkdir -p "$subpkgdir"/${i%/*}
-		mv "$pkgdir"/$i "$subpkgdir"/$i
+		mv "$pkgdir"/$i "$subpkgdir"/${i%/*}
 	done
 }
 
 dev() {
-	cd "$pkgdir"
+	cd "$pkgdir"  # Required for the 'find' command to work properly.
 	_mv_files usr/lib/qt5/mkspecs \
 		usr/lib/cmake \
 		usr/lib/qt5/bin \
@@ -122,38 +126,32 @@ dev() {
 
 sqlite() {
 	pkgdesc="SQLite driver for Qt5's SQL classes"
-	cd "$pkgdir"
 	_mv_files usr/lib/qt5/plugins/sqldrivers/libqsqlite*
 }
 
 odbc() {
 	pkgdesc="ODBC driver for Qt5's SQL classes"
-	cd "$pkgdir"
 	_mv_files usr/lib/qt5/plugins/sqldrivers/libqsqlodbc*
 }
 
 postgresql() {
 	pkgdesc="PostgreSQL driver for Qt5's SQL classes"
-	cd "$pkgdir"
 	_mv_files usr/lib/qt5/plugins/sqldrivers/libqsqlpsql*
 }
 
 mysql() {
 	pkgdesc="MySQL driver for Qt5's SQL classes"
-	cd "$pkgdir"
 	_mv_files usr/lib/qt5/plugins/sqldrivers/libqsqlmysql*
 }
 
 tds() {
 	pkgdesc="TDS driver for Qt5's SQL classes"
-	cd "$pkgdir"
 	_mv_files usr/lib/qt5/plugins/sqldrivers/libqsqltds*
 }
 
 x11() {
 	pkgdesc="Qt5 GUI-related libraries"
 	depends="hicolor-icon-theme"
-	cd "$pkgdir"
 	_mv_files \
 		usr/lib/libQt5EglFSDeviceIntegration.so.* \
 		usr/lib/libQt5EglFsKmsSupport.so.* \
@@ -169,11 +167,12 @@ x11() {
 		usr/lib/qt5/plugins/printsupport* \
 		usr/lib/qt5/plugins/xcbglintegrations
 
-	scanelf -Rn usr/ | egrep '(libX|libQt5Gui|libGL)' && return 1
+	scanelf -Rn "$pkgdir"/usr/ | egrep '(libX|libQt5Gui|libGL)' && return 1
 	return 0
 }
 
-sha512sums="7121837501b810f31863fbb3a6ea7189d3e38789ff25eb49b639a69b73913761c8cba18b65046519693d2f5c8755c2197feff1df1ec3d88676d00c649a326e1e  qtbase-opensource-src-5.9.7.tar.xz
-0f5b3d93bd1543f4e28e3dfe4a77db4759f2e3afbeb6f6b2c3aa76bf106ed585984ea228b2233bc53afeb3f51c557e3545b18a74096d2cf129364a1f6c4ef090  big-endian-scroll-wheel.patch
+sha512sums="5fb82d903b0db95c23c55785047722dea7979e7f94ecaaf374e0c73b4787aabd768a1c79482a091b8b11f61d7bd4fb891675a6842b90cdc9caaa3b393a3187c6  qtbase-everywhere-src-5.12.6.tar.xz
+d00dc607b71a93132f756b952871df9197cfd6d78cc3617544bfa11d7f0eea21ce5dd0d1aeb69dd2702a5694a63d3802accc76499dbf414c01eb56421698cb0c  big-endian-scroll-wheel.patch
 ee78a44e28ba5f728914bfc3d8d5b467896c7de11a02d54b0bce11e40a4338b1f776c1fcc30cbd436df4f548c1ab0b4fe801f01b162ddd5c0f892893e227acfd  link-to-execinfo.patch
-dca65670df25a8e391d4c62b8967f4377cbd193a3053d8e8e288452ea197f418fe3f6d9d5e48dc333a44aeadec68e3d4380b3672a07ef6baf7aa3eed96ba96e3  qt-musl-iconv-no-bom.patch"
+e3982b2df2ab4ba53b7a1329a9eb928eb1fee813c61cf6ac03d3300a767ffb57f019ac0fd89f633cac2330549446ff3d43344871296bf362815e7ebffadefa6b  qt-musl-iconv-no-bom.patch
+436f0bb7a89a88aa62c7b0398c4e91c325e78542e96f747c903f7e96dbf9d9b693d9688c722f2a74e287fb9ab31e861bd5ed8deb172ed28f56a1b8757663771c  time64.patch"
diff --git a/user/qt5-qtbase/big-endian-scroll-wheel.patch b/user/qt5-qtbase/big-endian-scroll-wheel.patch
index 3fbb8aec7..4cfa4f7b8 100644
--- a/user/qt5-qtbase/big-endian-scroll-wheel.patch
+++ b/user/qt5-qtbase/big-endian-scroll-wheel.patch
@@ -1,43 +1,55 @@
---- qtbase-opensource-src-5.9.7/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp.old	2018-10-16 08:37:05.000000000 +0000
-+++ qtbase-opensource-src-5.9.7/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp	2019-08-03 03:58:05.875790720 +0000
-@@ -43,6 +43,7 @@
- #include "qxcbwindow.h"
- #include "qtouchdevice.h"
- #include "QtCore/qmetaobject.h"
-+#include "QtCore/qendian.h"
- #include <qpa/qwindowsysteminterface_p.h>
- #include <QDebug>
- #include <cmath>
-@@ -106,6 +107,7 @@
-     XIEventMask xiEventMask;
-     bitMask = XI_HierarchyChangedMask;
-     bitMask |= XI_DeviceChangedMask;
-+    bitMask = qToLittleEndian(bitMask);
-     xiEventMask.deviceid = XIAllDevices;
-     xiEventMask.mask_len = sizeof(bitMask);
-     xiEventMask.mask = xiBitMask;
-@@ -327,7 +329,8 @@
-         }
-         XIEventMask mask;
-         mask.mask_len = sizeof(bitMask);
-+        bitMask = qToLittleEndian(bitMask);
-         mask.mask = xiBitMask;
-         // When xi2MouseEvents() is true (the default), pointer emulation for touch and tablet
-         // events will get disabled. This is preferable, as Qt Quick handles touch events
-         // directly, while for other applications QtGui synthesizes mouse events.
-@@ -353,6 +356,7 @@
-         tabletBitMask = XI_PropertyEventMask;
-         if (!pointerSelected)
-             tabletBitMask |= XI_ButtonPressMask | XI_ButtonReleaseMask | XI_MotionMask;
-+        tabletBitMask = qToLittleEndian(tabletBitMask);
-         for (int i = 0; i < m_tabletData.count(); ++i) {
-             int deviceId = m_tabletData.at(i).deviceId;
-             tabletDevices.insert(deviceId);
-@@ -374,6 +378,7 @@
- 
-         scrollBitMask = XI_MotionMask;
-         scrollBitMask |= XI_ButtonReleaseMask;
-+        scrollBitMask = qToLittleEndian(scrollBitMask);
-         int i=0;
-         for (const ScrollingDevice& scrollingDevice : qAsConst(m_scrollingDevices)) {
-             if (tabletDevices.contains(scrollingDevice.deviceId))
+--- qtbase-everywhere-src-5.12.3/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp.orig	2019-08-02 17:27:00.011197696 +0200
++++ qtbase-everywhere-src-5.12.3/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp	2019-08-02 17:29:36.336019411 +0200
+@@ -43,6 +43,7 @@
+ #include "qxcbwindow.h"
+ #include "qtouchdevice.h"
+ #include "QtCore/qmetaobject.h"
++#include "QtCore/qendian.h"
+ #include <qpa/qwindowsysteminterface_p.h>
+ #include <QDebug>
+ #include <cmath>
+@@ -66,6 +67,7 @@
+     xiEventMask.mask = XCB_INPUT_XI_EVENT_MASK_HIERARCHY;
+     xiEventMask.mask |= XCB_INPUT_XI_EVENT_MASK_DEVICE_CHANGED;
+     xiEventMask.mask |= XCB_INPUT_XI_EVENT_MASK_PROPERTY;
++    xiEventMask.mask = qToLittleEndian(xiEventMask.mask);
+     xcb_input_xi_select_events(xcb_connection(), rootWindow(), 1, &xiEventMask.header);
+ }
+ 
+@@ -90,7 +92,7 @@
+     qt_xcb_input_event_mask_t mask;
+     mask.header.deviceid = XCB_INPUT_DEVICE_ALL_MASTER;
+     mask.header.mask_len = 1;
+-    mask.mask = bitMask;
++    mask.mask = qToLittleEndian(bitMask);
+     xcb_void_cookie_t cookie =
+             xcb_input_xi_select_events_checked(xcb_connection(), window, 1, &mask.header);
+     xcb_generic_error_t *error = xcb_request_check(xcb_connection(), cookie);
+@@ -363,7 +365,7 @@
+         qt_xcb_input_event_mask_t xiMask;
+         xiMask.header.deviceid = XCB_INPUT_DEVICE_ALL_MASTER;
+         xiMask.header.mask_len = 1;
+-        xiMask.mask = mask;
++        xiMask.mask = qToLittleEndian(mask);
+ 
+         xcb_void_cookie_t cookie =
+                 xcb_input_xi_select_events_checked(xcb_connection(), window, 1, &xiMask.header);
+@@ -390,7 +392,7 @@
+             tabletDevices.insert(deviceId);
+             xiEventMask[i].header.deviceid = deviceId;
+             xiEventMask[i].header.mask_len = 1;
+-            xiEventMask[i].mask = mask;
++            xiEventMask[i].mask = qToLittleEndian(mask);
+         }
+         xcb_input_xi_select_events(xcb_connection(), window, nrTablets, &(xiEventMask.data()->header));
+     }
+@@ -406,7 +408,7 @@
+ #endif
+             xiEventMask[i].header.deviceid = scrollingDevice.deviceId;
+             xiEventMask[i].header.mask_len = 1;
+-            xiEventMask[i].mask = mask;
++            xiEventMask[i].mask = qToLittleEndian(mask);
+             i++;
+         }
+         xcb_input_xi_select_events(xcb_connection(), window, i, &(xiEventMask.data()->header));
+
diff --git a/user/qt5-qtbase/qt-musl-iconv-no-bom.patch b/user/qt5-qtbase/qt-musl-iconv-no-bom.patch
index be2afc714..9df5d594d 100644
--- a/user/qt5-qtbase/qt-musl-iconv-no-bom.patch
+++ b/user/qt5-qtbase/qt-musl-iconv-no-bom.patch
@@ -1,6 +1,6 @@
 --- qtbase/src/corelib/codecs/qiconvcodec.cpp	2017-01-18 15:20:58.000000000 +0100
 +++ qtbase/src/corelib/codecs/qiconvcodec.cpp	2017-02-21 14:33:32.423808603 +0100
-@@ -63,7 +63,7 @@
+@@ -61,7 +61,7 @@
  #elif defined(Q_OS_AIX)
  #  define NO_BOM
  #  define UTF16 "UCS-2"
diff --git a/user/qt5-qtbase/time64.patch b/user/qt5-qtbase/time64.patch
new file mode 100644
index 000000000..76b4671c6
--- /dev/null
+++ b/user/qt5-qtbase/time64.patch
@@ -0,0 +1,62 @@
+From e06ac2e26c8490a7b8702e9462d1f38244ac3f0f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 25 Nov 2019 08:27:39 -0800
+Subject: [PATCH] input: Make use of timeval portable for 64bit time_t
+
+This patch avoids using time field of input_event structure which is not available
+on 32bit arches supporting 64bit time_t structs, Patch makes it compatible with new
+and keeps old input.h implementation functional as well.
+
+See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign
+
+Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/282610]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ .../input/evdevkeyboard/qevdevkeyboardhandler.cpp      | 10 +++++++++-
+ .../input/evdevtouch/qevdevtouchhandler.cpp            |  2 +-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
+index 666613f09d..0e3e0ea0de 100644
+--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
++++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
+@@ -58,6 +58,11 @@
+ #include <linux/input.h>
+ #endif
+ 
++#ifndef input_event_sec
++#define input_event_sec time.tv_sec
++#define input_event_usec time.tv_usec
++#endif
++
+ QT_BEGIN_NAMESPACE
+ 
+ Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input")
+@@ -149,7 +154,10 @@ void QEvdevKeyboardHandler::switchLed(int led, bool state)
+     qCDebug(qLcEvdevKey) << "switchLed" << led << state;
+ 
+     struct ::input_event led_ie;
+-    ::gettimeofday(&led_ie.time, 0);
++    struct timeval tval;
++    ::gettimeofday(&tval, 0);
++    led_ie.input_event_sec = tval.tv_sec;
++    led_ie.input_event_usec = tval.tv_usec;
+     led_ie.type = EV_LED;
+     led_ie.code = led;
+     led_ie.value = state;
+diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
+index f86f80785e..3914698f2a 100644
+--- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
++++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
+@@ -568,7 +568,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
+ 
+         // update timestamps
+         m_lastTimeStamp = m_timeStamp;
+-        m_timeStamp = data->time.tv_sec + data->time.tv_usec / 1000000.0;
++        m_timeStamp = data->input_event_sec + data->input_event_usec / 1000000.0;
+ 
+         m_lastTouchPoints = m_touchPoints;
+         m_touchPoints.clear();
+-- 
+2.24.0
+
diff --git a/user/qt5-qtdeclarative/APKBUILD b/user/qt5-qtdeclarative/APKBUILD
index 38d6e1bb1..349bdfd84 100644
--- a/user/qt5-qtdeclarative/APKBUILD
+++ b/user/qt5-qtdeclarative/APKBUILD
@@ -1,17 +1,18 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qt5-qtdeclarative
-_pkgname=${pkgname#qt5-}-opensource-src
-pkgver=5.9.7
-pkgrel=1
-pkgdesc="Qt 5 - Qt Declarative and Qt Quick 2"
+_pkgname=${pkgname#qt5-}-everywhere-src
+pkgver=5.12.6
+pkgrel=0
+pkgdesc="Qt Declarative and Qt Quick 2"
 url="https://www.qt.io/"
 arch="all"
-license="LGPL-2.0 with exceptions OR GPL-3.0 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 libexecinfo-dev python3"
 subpackages="$pkgname-dev"
 source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz
 	add-execinfo.patch
-	pmmx.patch
+	disable-jit-pmmx.patch
 	python3.patch
 	"
 
@@ -35,7 +36,7 @@ package() {
 	done
 }
 
-sha512sums="bccddeca26c317083fcebc182dd3221dcbe9af665c502bfb636907f2c17a6edd8874a964910423c9eaa6e5c68bf5a13520193ba77f915be08ba1982348d2a9ee  qtdeclarative-opensource-src-5.9.7.tar.xz
+sha512sums="b60537dd10bc2c91c7a40035248d898733fbf1486ae2e00f8d8de37af965dcb1ee48828f82704441370656f0821896b09acf7f06dd0a7c398a2a9497ce4f0250  qtdeclarative-everywhere-src-5.12.6.tar.xz
 065ab2440fd0a81e76fe8873b0991929fad3d4189c8938e0205e94478a6cdce81ef710e3bad19cd5ca0b5ea0f8b3cd1b366969ddede51070496d1d02ace59220  add-execinfo.patch
-07bad5742bf00acadc6f2d5e1b8756b9545b95ad93d2b16646c0031abec881bfab6e1c39ca2f1b0a4e43d716518bd4380fd45995a9597d9ce1b51f88f9379176  pmmx.patch
-c434ec3b3eaa8859cc3a3ce48d0299533428d94c998876e5735c210b25f89bc8509980cee0d96f2e68331540f95b5f1ec5e9745949d26367bde1d15bc7ac9081  python3.patch"
+d21aeba1167ebebcdfc54eca14f714efc3de7252513ea4fd096dcbcab2d509faa06d94a6b8978ee7ea15b1c9acb94bc23662debecc2f443a4a5258b90c872048  disable-jit-pmmx.patch
+bb39564f2d68e5635141f3de950ff7ec8174d2c972d066049153039268154de1cad7fcb82d191e325db0a0317ed90eb869431432e32494fa52584af1536f1990  python3.patch"
diff --git a/user/qt5-qtdeclarative/disable-jit-pmmx.patch b/user/qt5-qtdeclarative/disable-jit-pmmx.patch
new file mode 100644
index 000000000..971fd9f14
--- /dev/null
+++ b/user/qt5-qtdeclarative/disable-jit-pmmx.patch
@@ -0,0 +1,18 @@
+It is no longer possible to remove the SSE2 requirement.
+
+So we remove the JIT entirely on pmmx/x86.
+
+--- qtdeclarative-everywhere-src-5.12.6/src/qml/jsruntime/qv4global_p.h.old	2019-11-07 11:01:48.000000000 +0000
++++ qtdeclarative-everywhere-src-5.12.6/src/qml/jsruntime/qv4global_p.h	2019-12-27 06:11:55.456270846 +0000
+@@ -88,10 +88,7 @@
+ //
+ // NOTE: This should match the logic in qv4targetplatform_p.h!
+ 
+-#if defined(Q_PROCESSOR_X86_32) && (QT_POINTER_SIZE == 4) \
+-    && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD))
+-#  define V4_ENABLE_JIT
+-#elif defined(Q_PROCESSOR_X86_64) && (QT_POINTER_SIZE == 8) \
++#if defined(Q_PROCESSOR_X86_64) && (QT_POINTER_SIZE == 8) \
+     && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_MAC) || defined(Q_OS_FREEBSD))
+ #  define V4_ENABLE_JIT
+ #elif defined(Q_PROCESSOR_ARM_32) && (QT_POINTER_SIZE == 4) \
diff --git a/user/qt5-qtdeclarative/pmmx.patch b/user/qt5-qtdeclarative/pmmx.patch
deleted file mode 100644
index a4ce84650..000000000
--- a/user/qt5-qtdeclarative/pmmx.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 4950c366b12265f1ea390a6feb8dbbd0d850d206 Mon Sep 17 00:00:00 2001
-From: Guillem Jover <guillem@hadrons.org>
-Date: Mon, 12 Oct 2015 01:45:37 +0200
-Subject: [PATCH v2] Do not make lack of SSE2 support on x86-32 fatal
-
-When an x86-32 CPU does not have SSE2 support (which is the case for
-all AMD CPUs, and older Intel CPUs), fallback to use the interpreter,
-otherwise use the JIT engine.
-
-Even then, make the lack of SSE2 support on x86-32 fatal when trying
-to instantiate a JIT engine, which does require it.
-
-Refactor the required CPU support check into a new pair of privately
-exported functions to avoid duplicating the logic, and do so in
-functions instead of class members to avoid changing the class
-signatures.
-
-Version: 5.7.x
-Bug-Debian: https://bugs.debian.org/792594
----
- src/qml/jit/qv4isel_masm.cpp    |  2 ++
- src/qml/jit/qv4isel_masm_p.h    | 18 ++++++++++++++++++
- src/qml/jsruntime/qv4engine.cpp |  1 +
- src/qml/qml/v8/qv8engine.cpp    |  7 -------
- tools/qmljs/qmljs.cpp           |  7 +++----
- 5 files changed, 24 insertions(+), 11 deletions(-)
-
---- a/src/qml/jit/qv4isel_masm.cpp
-+++ b/src/qml/jit/qv4isel_masm.cpp
-@@ -72,6 +72,8 @@ InstructionSelection<JITAssembler>::Inst
-     , compilationUnit(new CompilationUnit)
-     , qmlEngine(qmlEngine)
- {
-+    checkRequiredCpuSupport();
-+
-     compilationUnit->codeRefs.resize(module->functions.size());
-     module->unitFlags |= QV4::CompiledData::Unit::ContainsMachineCode;
- }
---- a/src/qml/jit/qv4isel_masm_p.h
-+++ b/src/qml/jit/qv4isel_masm_p.h
-@@ -60,6 +60,7 @@
- 
- #include <QtCore/QHash>
- #include <QtCore/QStack>
-+#include <private/qsimd_p.h>
- #include <config.h>
- #include <wtf/Vector.h>
- 
-@@ -72,6 +73,23 @@ QT_BEGIN_NAMESPACE
- namespace QV4 {
- namespace JIT {
- 
-+Q_QML_PRIVATE_EXPORT inline bool hasRequiredCpuSupport()
-+{
-+#ifdef Q_PROCESSOR_X86_32
-+    return qCpuHasFeature(SSE2);
-+#else
-+    return true;
-+#endif
-+}
-+
-+Q_QML_PRIVATE_EXPORT inline void checkRequiredCpuSupport()
-+{
-+#ifdef Q_PROCESSOR_X86_32
-+    if (!qCpuHasFeature(SSE2))
-+        qFatal("This program requires an X86 processor that supports SSE2 extension, at least a Pentium 4 or newer");
-+#endif
-+}
-+
- template <typename JITAssembler = Assembler<DefaultAssemblerTargetConfiguration>>
- class Q_QML_EXPORT InstructionSelection:
-         protected IR::IRDecoder,
---- a/src/qml/jsruntime/qv4engine.cpp
-+++ b/src/qml/jsruntime/qv4engine.cpp
-@@ -159,6 +159,7 @@
- 
- #ifdef V4_ENABLE_JIT
-         static const bool forceMoth = !qEnvironmentVariableIsEmpty("QV4_FORCE_INTERPRETER") ||
-+                                      !JIT::hasRequiredCpuSupport() ||
-                                       !OSAllocator::canAllocateExecutableMemory();
-         if (forceMoth) {
-             factory = new Moth::ISelFactory;
---- a/src/qml/qml/v8/qv8engine.cpp
-+++ b/src/qml/qml/v8/qv8engine.cpp
-@@ -64,7 +64,6 @@
- #include <QtCore/qjsonvalue.h>
- #include <QtCore/qdatetime.h>
- #include <QtCore/qdatastream.h>
--#include <private/qsimd_p.h>
- 
- #include <private/qv4value_p.h>
- #include <private/qv4dateobject_p.h>
-@@ -129,12 +128,6 @@ QV8Engine::QV8Engine(QJSEngine* qq)
-     , m_xmlHttpRequestData(0)
-     , m_listModelData(0)
- {
--#ifdef Q_PROCESSOR_X86_32
--    if (!qCpuHasFeature(SSE2)) {
--        qFatal("This program requires an X86 processor that supports SSE2 extension, at least a Pentium 4 or newer");
--    }
--#endif
--
-     QML_MEMORY_SCOPE_STRING("QV8Engine::QV8Engine");
-     qMetaTypeId<QJSValue>();
-     qMetaTypeId<QList<int> >();
---- a/tools/qmljs/qmljs.cpp
-+++ b/tools/qmljs/qmljs.cpp
-@@ -92,11 +92,10 @@ int main(int argc, char *argv[])
-     enum {
-         use_masm,
-         use_moth
--    } mode;
-+    } mode = use_moth;
- #ifdef V4_ENABLE_JIT
--    mode = use_masm;
--#else
--    mode = use_moth;
-+    if (QV4::JIT::hasRequiredCpuSupport())
-+        mode = use_masm;
- #endif
- 
-     bool runAsQml = false;
diff --git a/user/qt5-qtdeclarative/python3.patch b/user/qt5-qtdeclarative/python3.patch
index 2d67290bb..e863f7a9f 100644
--- a/user/qt5-qtdeclarative/python3.patch
+++ b/user/qt5-qtdeclarative/python3.patch
@@ -20,7 +20,7 @@
      QMAKE_EXTRA_COMPILERS += udis86
  
      udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c
-@@ -110,7 +110,7 @@
+@@ -113,7 +113,7 @@
  retgen.script = $$PWD/create_regex_tables
  retgen.input = retgen.script
  retgen.CONFIG += no_link
diff --git a/user/qt5-qtgraphicaleffects/APKBUILD b/user/qt5-qtgraphicaleffects/APKBUILD
index c4a476b9f..57e85b5b0 100644
--- a/user/qt5-qtgraphicaleffects/APKBUILD
+++ b/user/qt5-qtgraphicaleffects/APKBUILD
@@ -1,12 +1,13 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qt5-qtgraphicaleffects
-_pkgname=qtgraphicaleffects-opensource-src
-pkgver=5.9.7
+_pkgname=qtgraphicaleffects-everywhere-src
+pkgver=5.12.6
 pkgrel=0
-pkgdesc="Qt 5 - Pre-made visual effects for QML"
+pkgdesc="Pre-made visual effects for QML"
 url="https://www.qt.io/"
 arch="all"
-license="LGPL-2.0 with exceptions OR GPL-3.0 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 qt5-qtdeclarative-dev"
 source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz"
 
@@ -14,19 +15,16 @@ _qt5_prefix=/usr/lib/qt5
 builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
-	cd "$builddir"
 	qmake
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make install INSTALL_ROOT="$pkgdir"
 }
 
-sha512sums="914e70403b9529071f13b3f7af596f4b06f1988d59e0ea5915cc6f5b8b2e1b38eaab50e2cbe5a895d0f5be4f99c3ec62b32d629083ff3dc1fce413acb2615c0f  qtgraphicaleffects-opensource-src-5.9.7.tar.xz"
+sha512sums="54bd457e47aaff799eb92d91b7aab5692420556493ee39ff34dca496f8ab24dab84c8a638a71b74c201454db4e306b12dad4c8b300ce6c254cdc0c2d7b3a9c8a  qtgraphicaleffects-everywhere-src-5.12.6.tar.xz"
diff --git a/user/qt5-qtmultimedia/APKBUILD b/user/qt5-qtmultimedia/APKBUILD
index 9b677708a..204a01047 100644
--- a/user/qt5-qtmultimedia/APKBUILD
+++ b/user/qt5-qtmultimedia/APKBUILD
@@ -1,12 +1,13 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qt5-qtmultimedia
-_pkgname=qtmultimedia-opensource-src
-pkgver=5.9.7
+_pkgname=qtmultimedia-everywhere-src
+pkgver=5.12.6
 pkgrel=0
-pkgdesc="Qt 5 - Audio, video, radio, and camera libraries"
+pkgdesc="Audio, video, radio, and camera libraries for Qt 5"
 url="https://www.qt.io/"
 arch="all"
-license="LGPL-2.0 with exceptions OR GPL-3.0 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="alsa-lib-dev gstreamer-dev gst-plugins-base-dev libxv-dev
 	pulseaudio-dev qt5-qtbase-dev qt5-qtdeclarative-dev xorgproto-dev"
 subpackages="$pkgname-dev"
@@ -14,18 +15,15 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu
 builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
-	cd "$builddir"
 	qmake
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 package() {
-	cd "$builddir"
 	make install INSTALL_ROOT="$pkgdir"
 }
 
-sha512sums="a5c947cb8764e63e81187db01caefa588bab77705b03ed0dff09433b0831f55f2461c64f2ce99085c7bfcac795ae67dd69ac7a992ef8d04c043d237e2c95e4c6  qtmultimedia-opensource-src-5.9.7.tar.xz"
+sha512sums="e72768c9b392dcaaefafb63b26cdf1a44b554c545c3f42bd12b0817c251cd495291e06bda97fa303c522c2f34e0483db428684f4053db52753929c57fa257470  qtmultimedia-everywhere-src-5.12.6.tar.xz"
diff --git a/user/qt5-qtpositioning/APKBUILD b/user/qt5-qtpositioning/APKBUILD
index 9f74280ef..47b957554 100644
--- a/user/qt5-qtpositioning/APKBUILD
+++ b/user/qt5-qtpositioning/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qt5-qtpositioning
-_pkgname=qtlocation-opensource-src
-pkgver=5.9.7
+_pkgname=qtlocation-everywhere-src
+pkgver=5.12.6
 pkgrel=0
-pkgdesc="Qt 5 - Geolocation services"
+pkgdesc="Geolocation services for Qt 5"
 url="https://www.qt.io/"
 arch="all"
 options="!check"
-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="icu-dev qt5-qtbase-dev"
 subpackages="$pkgname-dev"
@@ -18,7 +18,6 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu
 builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
-	cd "$builddir"
 	qmake
 	# too memory hungry
 	if [ -z "$JOBS" ] || [ $JOBS -gt 16 ]; then
@@ -29,9 +28,8 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make install INSTALL_ROOT="$pkgdir"
 }
 
-sha512sums="a0ee0d699ecf568eb9371ff0743f9ec65f568e235e8964a2e3187a3135fc943795101c8922fbe560779f7878f44a630383234a65ed67aea35d084ce04eeb7a96  qtlocation-opensource-src-5.9.7.tar.xz
+sha512sums="89fa4ea878331423dba90dd3bad7340991b7b24b66b2b1947f53d3a7fe0bdc6465a5cd085d25c6fa0018be5d0931ddb5da021c0c3eb6b5f5eddd5499641b4b4b  qtlocation-everywhere-src-5.12.6.tar.xz
 8590335ae90ade1c685ff99fb4319d1b7448d2ae15ba999e3dc9a29e62eda3db587d8ee366dc68fad6eb9e0872532d50f0bdc74f4689a554ca095ad24967418c  no-getting-thread-names.patch"
diff --git a/user/qt5-qtquickcontrols/APKBUILD b/user/qt5-qtquickcontrols/APKBUILD
index 7666875ce..9468c6bf8 100644
--- a/user/qt5-qtquickcontrols/APKBUILD
+++ b/user/qt5-qtquickcontrols/APKBUILD
@@ -1,30 +1,28 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qt5-qtquickcontrols
-_pkgname=qtquickcontrols-opensource-src
-pkgver=5.9.7
+_pkgname=qtquickcontrols-everywhere-src
+pkgver=5.12.6
 pkgrel=0
-pkgdesc="Qt 5 - controls for use with Qt Quick"
+pkgdesc="Controls for use with Qt Quick"
 url="https://www.qt.io/"
 arch="all"
-license="(LGPL-2.0 with exceptions OR GPL-3.0 with exceptions) AND GFDL-1.3"
+license="(LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0) AND GFDL-1.3"
+depends=""
 makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev"
 source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz"
 builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
-	cd "$builddir"
 	qmake
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make install INSTALL_ROOT="$pkgdir"
 }
 
-sha512sums="87b8af09035f77bf02e6995a173d381536c50896604dcd884f7adede4d70464d5ee28161fda7b449ad851a728254cee00b7984099c4c9f024623a16157c0a656  qtquickcontrols-opensource-src-5.9.7.tar.xz"
+sha512sums="901bcf7c800406f2749ebc251a7b0419fdbab4599881475aae7f74ce4eac5347837f5e667f78774ad914a1c3fbf42e144606c9592bff3f34e899870709fb4c87  qtquickcontrols-everywhere-src-5.12.6.tar.xz"
diff --git a/user/qt5-qtquickcontrols2/APKBUILD b/user/qt5-qtquickcontrols2/APKBUILD
index 274ff17bf..4a0593d05 100644
--- a/user/qt5-qtquickcontrols2/APKBUILD
+++ b/user/qt5-qtquickcontrols2/APKBUILD
@@ -1,30 +1,27 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qt5-qtquickcontrols2
-_pkgname=qtquickcontrols2-opensource-src
-pkgver=5.9.7
+_pkgname=qtquickcontrols2-everywhere-src
+pkgver=5.12.6
 pkgrel=0
-pkgdesc="Qt 5 - Quick Controls 2.0"
+pkgdesc="Qt Quick Controls 2.0"
 url="https://www.qt.io/"
 arch="all"
 options="!check"  # Impossible to test with accelerated X desktop
-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=""
-depends_dev="qt5-qtdeclarative-dev"
-makedepends="$depends_dev qt5-qtbase-dev"
+makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev"
 subpackages="$pkgname-dev"
 source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz"
 builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
-	cd "$builddir"
 	qmake
 	make
 }
 
 package() {
-	cd "$builddir"
 	make install INSTALL_ROOT="$pkgdir"
 }
 
-sha512sums="591a3b5ee53f681d1c9906451db76c89c12e9ccdc0cdbbb18937550612149505ba415f85d3acf2c01ab6c6b9aab279388fb2e6b501daf9ac49095b20eaeac032  qtquickcontrols2-opensource-src-5.9.7.tar.xz"
+sha512sums="89cd9dc3589367d6c5687426e347d8b51cc3f74777ff2538236d8cee8fbf255d7cbf0d7f0eef584e29750d3d7cb1a34325782112bd0d1a2a70973e3c5feefd25  qtquickcontrols2-everywhere-src-5.12.6.tar.xz"
diff --git a/user/qt5-qtscript/APKBUILD b/user/qt5-qtscript/APKBUILD
index 4f56a9e7d..1b22dbc9c 100644
--- a/user/qt5-qtscript/APKBUILD
+++ b/user/qt5-qtscript/APKBUILD
@@ -1,34 +1,29 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qt5-qtscript
-_pkgname=qtscript-opensource-src
-pkgver=5.9.7
-pkgrel=1
-pkgdesc="Qt 5 - Deprecated scripting framework for Qt applications"
+_pkgname=qtscript-everywhere-src
+pkgver=5.12.6
+pkgrel=0
+pkgdesc="Deprecated scripting framework for Qt applications"
 url="https://www.qt.io/"
 arch="all"
-license="LGPL-2.0 with exceptions OR GPL-3.0 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"
 subpackages="$pkgname-dev"
-source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz
-	gcc8.patch
-	"
+source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz"
 builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
-	cd "$builddir"
 	qmake
-	make
+	make 2>build.log
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make INSTALL_ROOT="$pkgdir" install
 }
 
-sha512sums="e019d2e7aa29e1183636503822db960d97f1787fa7517f286acbe42645f2c5daa099cc251ac6640e3243dedb4ef64e509f2e22bca798a7e583063e0ac7635662  qtscript-opensource-src-5.9.7.tar.xz
-426174235ab57b14edf58166327372ba215dfce092b9d4cc07686b326c999d4d6348460a75343791de96b6ad7352c393b4a748d0592865e0d78dc119c12657f2  gcc8.patch"
+sha512sums="31fdcd008c68ab1b17d0a648441e97bba2186a93c8f0e13381e655125a1b1c282682f9db24428c4bb84b28ab5da0dfd7cbea63d326855580a206d81387a2fcc8  qtscript-everywhere-src-5.12.6.tar.xz"
diff --git a/user/qt5-qtscript/gcc8.patch b/user/qt5-qtscript/gcc8.patch
deleted file mode 100644
index 2fb04a708..000000000
--- a/user/qt5-qtscript/gcc8.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-From 97ec1d1882a83c23c91f0f7daea48e05858d8c32 Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Mon, 28 Jan 2019 14:33:12 -0800
-Subject: Fix build with GCC 8.3
-
-Qualifiers in the asm statement are not allowed in the global scope. I
-thought they were necessary for LTO, but I the commit to this file that
-added them predates my work on setting up LTO for GCC.
-
-Change-Id: Id98140e1c2f0426cabbefffd157e23e5ece67a49
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- .../javascriptcore/JavaScriptCore/jit/JITStubs.cpp | 48 +++++++++++-----------
- 1 file changed, 24 insertions(+), 24 deletions(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
-index 1abdf8b..9f60761 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
-@@ -116,7 +116,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x3c, JITStackFrame_s
- COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, JITStackFrame_callFrame_offset_matches_ctiTrampoline);
- COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x50, JITStackFrame_code_offset_matches_ctiTrampoline);
- 
--asm volatile (
-+asm (
- ".text\n"
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
- HIDE_SYMBOL(ctiTrampoline) "\n"
-@@ -138,7 +138,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
-     "ret" "\n"
- );
- 
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
- HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
- SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-@@ -154,7 +154,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-     "ret" "\n"
- );
-     
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
- HIDE_SYMBOL(ctiOpThrowNotCaught) "\n"
- SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
-@@ -179,7 +179,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x48, JITStackFrame_s
- COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x90, JITStackFrame_callFrame_offset_matches_ctiTrampoline);
- COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x80, JITStackFrame_code_offset_matches_ctiTrampoline);
- 
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
- HIDE_SYMBOL(ctiTrampoline) "\n"
- SYMBOL_STRING(ctiTrampoline) ":" "\n"
-@@ -206,7 +206,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
-     "ret" "\n"
- );
- 
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
- HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
- SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-@@ -222,7 +222,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-     "ret" "\n"
- );
- 
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
- HIDE_SYMBOL(ctiOpThrowNotCaught) "\n"
- SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
-@@ -242,7 +242,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
- #error "JIT_STUB_ARGUMENT_VA_LIST not supported on ARMv7."
- #endif
- 
--asm volatile (
-+asm (
- ".text" "\n"
- ".align 2" "\n"
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
-@@ -269,7 +269,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
-     "bx lr" "\n"
- );
- 
--asm volatile (
-+asm (
- ".text" "\n"
- ".align 2" "\n"
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
-@@ -287,7 +287,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-     "bx lr" "\n"
- );
- 
--asm volatile (
-+asm (
- ".text" "\n"
- ".align 2" "\n"
- ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
-@@ -305,7 +305,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
- 
- #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL)
- 
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
- HIDE_SYMBOL(ctiTrampoline) "\n"
- SYMBOL_STRING(ctiTrampoline) ":" "\n"
-@@ -323,7 +323,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
-     "mov pc, lr" "\n"
- );
- 
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
- HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
- SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-@@ -418,7 +418,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x38, JITStackFrame_
- COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x30, JITStackFrame_code_offset_matches_ctiTrampoline);
- COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x1c, JITStackFrame_stub_argument_space_matches_ctiTrampoline);
- 
--asm volatile (
-+asm (
- ".text\n"
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
- HIDE_SYMBOL(ctiTrampoline) "\n"
-@@ -440,7 +440,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
-     "ret" "\n"
- );
- 
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
- HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
- SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-@@ -456,7 +456,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-     "ret" "\n"
- );
-     
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
- HIDE_SYMBOL(ctiOpThrowNotCaught) "\n"
- SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
-@@ -480,7 +480,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, JITStackFrame_
- COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x48, JITStackFrame_code_offset_matches_ctiTrampoline);
- COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x78, JITStackFrame_stub_argument_space_matches_ctiTrampoline);
- 
--asm volatile (
-+asm (
- ".text\n"
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
- HIDE_SYMBOL(ctiTrampoline) "\n"
-@@ -515,7 +515,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
-     "ret" "\n"
- );
- 
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
- HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
- SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-@@ -531,7 +531,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-     "ret" "\n"
- );
- 
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
- HIDE_SYMBOL(ctiOpThrowNotCaught) "\n"
- SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
-@@ -551,7 +551,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
- #error "JIT_STUB_ARGUMENT_VA_LIST not supported on ARMv7."
- #endif
- 
--asm volatile (
-+asm (
- ".text" "\n"
- ".align 2" "\n"
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
-@@ -578,7 +578,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
-     "bx lr" "\n"
- );
- 
--asm volatile (
-+asm (
- ".text" "\n"
- ".align 2" "\n"
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
-@@ -596,7 +596,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-     "bx lr" "\n"
- );
- 
--asm volatile (
-+asm (
- ".text" "\n"
- ".align 2" "\n"
- ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
-@@ -614,7 +614,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
- 
- #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL)
- 
--asm volatile (
-+asm (
- ".text\n"
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
- HIDE_SYMBOL(ctiTrampoline) "\n"
-@@ -632,7 +632,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
-     "mov pc, lr" "\n"
- );
- 
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
- HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
- SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-@@ -1024,7 +1024,7 @@ static NEVER_INLINE void throwStackOverflowError(CallFrame* callFrame, JSGlobalD
-     extern "C" { \
-         rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \
-     }; \
--    asm volatile ( \
-+    asm ( \
-         ".text" "\n" \
-         ".align 2" "\n" \
-         ".globl " SYMBOL_STRING(cti_##op) "\n" \
-@@ -1053,7 +1053,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, thunkReturnAddress) == THUNK_RETUR
-     extern "C" { \
-         rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \
-     }; \
--    asm volatile ( \
-+    asm ( \
-         ".globl " SYMBOL_STRING(cti_##op) "\n" \
-         HIDE_SYMBOL(cti_##op) "\n"             \
-         SYMBOL_STRING(cti_##op) ":" "\n" \
--- 
-cgit v1.2.1
-
diff --git a/user/qt5-qtsensors/APKBUILD b/user/qt5-qtsensors/APKBUILD
index bc363c58b..1a4abe625 100644
--- a/user/qt5-qtsensors/APKBUILD
+++ b/user/qt5-qtsensors/APKBUILD
@@ -1,29 +1,27 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qt5-qtsensors
-_pkgname=qtsensors-opensource-src
-pkgver=5.9.7
+_pkgname=qtsensors-everywhere-src
+pkgver=5.12.6
 pkgrel=0
-pkgdesc="Qt 5 - Library for interfacing with sensors"
+pkgdesc="Library for interfacing with sensors using Qt"
 url="https://www.qt.io/"
 arch="all"
 options="!check"
-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"
 subpackages="$pkgname-dev"
-source="http://download.qt-project.org/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz"
+source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz"
 builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
-	cd "$builddir"
 	qmake
 	make
 }
 
 package() {
-	cd "$builddir"
 	make install INSTALL_ROOT="$pkgdir"
 }
 
-sha512sums="b07c5a79e9f1db5d64bef6fb92954c7467858d5f00f9bc96f8f7c8651121c1c57de7d21b273827830814919b5fa19720515d3a2dab77bf87876e60fdaedae788  qtsensors-opensource-src-5.9.7.tar.xz"
+sha512sums="82921de2fac2e0dcccd7b8ce2a0f5ce83d0e6d9a92a5294a59bc3d5a498de0fd644e284ba69f1ddf61c6f467627ef37bedfa0b8b6890b509cb7755109f444a49  qtsensors-everywhere-src-5.12.6.tar.xz"
diff --git a/user/qt5-qtserialport/APKBUILD b/user/qt5-qtserialport/APKBUILD
index afbf09362..c90c7eee9 100644
--- a/user/qt5-qtserialport/APKBUILD
+++ b/user/qt5-qtserialport/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qt5-qtserialport
-_pkgname=qtserialport-opensource-src
-pkgver=5.9.7
+_pkgname=qtserialport-everywhere-src
+pkgver=5.12.6
 pkgrel=0
-pkgdesc="Qt 5 - Connect Qt applications to serial ports"
+pkgdesc="Connect Qt applications to serial ports"
 url="https://www.qt.io/"
 arch="all"
 options="!check"
-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="eudev-dev qt5-qtbase-dev"
 subpackages="$pkgname-dev"
@@ -16,14 +16,12 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu
 builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
-	cd "$builddir"
 	qmake
 	make
 }
 
 package() {
-	cd "$builddir"
 	make install INSTALL_ROOT="$pkgdir"
 }
 
-sha512sums="a90cfec383f2c1e8240bbcb0fe18c99773833d0749499e3b379d669b6053eaceea7813665068b2512cdc5c57cef5dafbdd9928e8f3d133405fb02c4c0c44e80b  qtserialport-opensource-src-5.9.7.tar.xz"
+sha512sums="5994ddfafbe21438b5c79667ff32ff19bc9c4a09c798801698584baf5709968ad3e33aec5fac3064769270d94331ae99d223349220610f577ee8b00fcf950403  qtserialport-everywhere-src-5.12.6.tar.xz"
diff --git a/user/qt5-qtspeech/APKBUILD b/user/qt5-qtspeech/APKBUILD
index 408e95824..e6b368602 100644
--- a/user/qt5-qtspeech/APKBUILD
+++ b/user/qt5-qtspeech/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qt5-qtspeech
-_pkgname=qtspeech-opensource-src
-pkgver=5.9.7
+_pkgname=qtspeech-everywhere-src
+pkgver=5.12.6
 pkgrel=0
-pkgdesc="Qt 5 - Library for speech processing and Text-to-Speech (TTS)"
+pkgdesc=" Library for speech processing and Text-to-Speech (TTS) in Qt"
 url="https://www.qt.io/"
 arch="all"
 options="!check"
-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 qt5-qtmultimedia-dev speech-dispatcher-dev"
 subpackages="$pkgname-dev"
@@ -18,15 +18,13 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu
 builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
-	cd "$builddir"
 	qmake
 	make
 }
 
 package() {
-	cd "$builddir"
 	make install INSTALL_ROOT="$pkgdir"
 }
 
-sha512sums="e2d1f2f73bc6595572d18b1c17caf27878851adf164dbca25925301b94916cce96b2ea3db4c2c7e6a23d6e79c37c35b28239aa613adaf6cb9eb340f40c396099  qtspeech-opensource-src-5.9.7.tar.xz
+sha512sums="f2355de53e10d6ec9dcbc6371bfde73c2a69e5b3dbf1d97c840c665c9f38efd62d70aa2912f0000813efb072d15291037e4f8eb2edbeaa7549b0e2c348bd918a  qtspeech-everywhere-src-5.12.6.tar.xz
 7bce4bd52aa0b60fbd0ec781fc18ac518a8fe76c99e61be03170f00d27747e989b1562a45435be78d0d166ab0fdf523055620ba7c63f49e328704e1cd6aa4718  fix-linking-order.patch"
diff --git a/user/qt5-qtsvg/APKBUILD b/user/qt5-qtsvg/APKBUILD
index d0c96bdc6..ec6aaa074 100644
--- a/user/qt5-qtsvg/APKBUILD
+++ b/user/qt5-qtsvg/APKBUILD
@@ -1,31 +1,28 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qt5-qtsvg
-_pkgname=qtsvg-opensource-src
-pkgver=5.9.7
+_pkgname=qtsvg-everywhere-src
+pkgver=5.12.6
 pkgrel=0
-pkgdesc="Qt 5 - SVG rendering library"
+pkgdesc="Qt SVG rendering library"
 url="https://www.qt.io/"
 arch="all"
-license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions"
+license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0"
 makedepends="qt5-qtbase-dev zlib-dev"
 subpackages="$pkgname-dev"
 source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz"
 builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
-	cd "$builddir"
 	qmake
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make install INSTALL_ROOT="$pkgdir"
 }
 
-sha512sums="d2e58ff0321fd40031dbbc0d0b0a8bb321cae2dc64bb4afec3c72ed9b5a25d67b156971d7a5ea4f74d966a3e8cda779474ee932ab129fa0b26f12978feebcd84  qtsvg-opensource-src-5.9.7.tar.xz"
+sha512sums="a0200f38566ba526a9366c0b240d4e3e0ba0662209fa1225145d3c2f2f371c77ba804239f96a6d351f117413240adce17c53f16205285d6aed6978bc5435a942  qtsvg-everywhere-src-5.12.6.tar.xz"
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
diff --git a/user/qt5-qtwebchannel/APKBUILD b/user/qt5-qtwebchannel/APKBUILD
index 95a4371fd..d90c0ad28 100644
--- a/user/qt5-qtwebchannel/APKBUILD
+++ b/user/qt5-qtwebchannel/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qt5-qtwebchannel
-_pkgname=qtwebchannel-opensource-src
-pkgver=5.9.7
+_pkgname=qtwebchannel-everywhere-src
+pkgver=5.12.6
 pkgrel=0
-pkgdesc="Qt 5 - Connect Qt applications to WebSockets"
+pkgdesc="Connect Qt applications to WebSockets"
 url="https://www.qt.io/"
 arch="all"
 options="!check"
-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"
 subpackages="$pkgname-dev"
@@ -16,14 +16,12 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu
 builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
-	cd "$builddir"
 	qmake
 	make
 }
 
 package() {
-	cd "$builddir"
 	make install INSTALL_ROOT="$pkgdir"
 }
 
-sha512sums="0109f11dd9c83e8dbf50921abb642a5e185fda98ead87973bd1b24c1f490268f2a9c7d264da659f7eac1f98942aecc839d7418abce0e7d2a66093b9b89eb4bca  qtwebchannel-opensource-src-5.9.7.tar.xz"
+sha512sums="3f0a1732cd81506c2e5aa467e0233a909e6241943ed973ce12f6c8f1d1a8bf61b2a9bae7f5ea0655c071e6832f5a767554124ac27950597b146c36273e9e189e  qtwebchannel-everywhere-src-5.12.6.tar.xz"
diff --git a/user/qt5-qtwebsockets/APKBUILD b/user/qt5-qtwebsockets/APKBUILD
index 70f2ce8f0..d324d58e5 100644
--- a/user/qt5-qtwebsockets/APKBUILD
+++ b/user/qt5-qtwebsockets/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qt5-qtwebsockets
-_pkgname=qtwebsockets-opensource-src
-pkgver=5.9.7
+_pkgname=qtwebsockets-everywhere-src
+pkgver=5.12.6
 pkgrel=0
-pkgdesc="Qt 5 - Pure Qt implementation of WebSockets"
+pkgdesc="Qt implementation of WebSockets"
 url="https://www.qt.io/"
 arch="all"
 options="!check"
-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"
 subpackages="$pkgname-dev"
@@ -16,14 +16,12 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu
 builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
-	cd "$builddir"
 	qmake
 	make
 }
 
 package() {
-	cd "$builddir"
 	make install INSTALL_ROOT="$pkgdir"
 }
 
-sha512sums="ee5d1eab254a55791ca7414066c1661614605d6a193305d687aa3321bb69fb59fe6c877153cee1ea4321a91721e42b8fafcaa4cda418c6edc057dc3683c73756  qtwebsockets-opensource-src-5.9.7.tar.xz"
+sha512sums="1d7de6e642869eb0863bea219183ed66c94e172d67d7c6d5d607b43368ef1f4f47f994aad5a56df35294f6dcd541474e7fec04691da17cee16df59d799b64e40  qtwebsockets-everywhere-src-5.12.6.tar.xz"
diff --git a/user/qt5-qtx11extras/APKBUILD b/user/qt5-qtx11extras/APKBUILD
index ed049fe33..259faa328 100644
--- a/user/qt5-qtx11extras/APKBUILD
+++ b/user/qt5-qtx11extras/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qt5-qtx11extras
-_pkgname=qtx11extras-opensource-src
-pkgver=5.9.7
+_pkgname=qtx11extras-everywhere-src
+pkgver=5.12.6
 pkgrel=0
-pkgdesc="Qt 5 - Extra libraries for X11 support"
+pkgdesc="Qt 5 libraries for X11 support"
 url="https://www.qt.io/"
 arch="all"
 options="!check"
-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"
 subpackages="$pkgname-dev"
@@ -16,14 +16,12 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu
 builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
-	cd "$builddir"
 	qmake
 	make
 }
 
 package() {
-	cd "$builddir"
 	make install INSTALL_ROOT="$pkgdir"
 }
 
-sha512sums="04803755cabc449dd35c20a5ec7f4836fec5e9f4e28daf8a577e66385e9698139a1ae23a29ade8f0c5a766665a137497eaff3c55746879b9c2fe85c38710d37f  qtx11extras-opensource-src-5.9.7.tar.xz"
+sha512sums="b0ad7bf9d9fa9a30abc7bab16cb71a904e7c93d280fcb3306623b0edc56aef72d0ec9fe904571df381c76c6dd15eb8e043ce27957a370432fcf6e09c2f4e1ee5  qtx11extras-everywhere-src-5.12.6.tar.xz"
diff --git a/user/qt5-qtxmlpatterns/APKBUILD b/user/qt5-qtxmlpatterns/APKBUILD
index 7885359f2..90b79fc96 100644
--- a/user/qt5-qtxmlpatterns/APKBUILD
+++ b/user/qt5-qtxmlpatterns/APKBUILD
@@ -1,31 +1,29 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qt5-qtxmlpatterns
-_pkgname=qtxmlpatterns-opensource-src
-pkgver=5.9.7
+_pkgname=qtxmlpatterns-everywhere-src
+pkgver=5.12.6
 pkgrel=0
-pkgdesc="Qt 5 - Support for XPath, XQuery, XSLT, and XML schema validation"
+pkgdesc="Qt support library for XPath, XQuery, XSLT, and XML schema validation"
 url="https://www.qt.io/"
 arch="all"
-license="LGPL-2.0 with exceptions OR GPL-3.0 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"
 subpackages="$pkgname-dev"
 source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz"
 builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
-	cd "$builddir"
 	qmake
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make install INSTALL_ROOT="$pkgdir"
 }
 
-sha512sums="d24f983eaf0414b5b5dbbd8e60cfc87d4d742aae82b457e5d77c01a0534620f30f4507e1c71ce4bbe2a16eeafd6dde566c8d11bccea04c5668189936cc44aca3  qtxmlpatterns-opensource-src-5.9.7.tar.xz"
+sha512sums="ae59abcb01ddeeb521f0966df818c933e997a5a98b95d6254d3ea964eddcdb437ad497aa59b1b9cb70246026afd4973234bb3690d4f1cfbbc7e538cde968e5c0  qtxmlpatterns-everywhere-src-5.12.6.tar.xz"
author	A. Wilcox <AWilcox@Wilcox-Tech.com>	2019-12-27 04:02:42 -0600
committer	A. Wilcox <AWilcox@Wilcox-Tech.com>	2019-12-27 04:02:42 -0600
commit	47d18b13213ccd7c51894796760f97571c3eb424 (patch)
tree	6e31cc5d066c199564a5c8f34a40d313a08c44aa /user
parent	9b07de55dfe6d50baeda3a8feda7f9fcade9c647 (diff)
download	packages-47d18b13213ccd7c51894796760f97571c3eb424.tar.gz packages-47d18b13213ccd7c51894796760f97571c3eb424.tar.bz2 packages-47d18b13213ccd7c51894796760f97571c3eb424.tar.xz packages-47d18b13213ccd7c51894796760f97571c3eb424.zip