From ac0bbbdc782c5301108050f489f4d1b068ef787c Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 30 May 2022 18:59:19 -0500
Subject: user/qt5: Update to 5.15.4

This includes KDE LTS patches when available.
---
 user/qt5-qtbase/APKBUILD | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'user/qt5-qtbase/APKBUILD')

diff --git a/user/qt5-qtbase/APKBUILD b/user/qt5-qtbase/APKBUILD
index b02a523ae..7cd2f2b3e 100644
--- a/user/qt5-qtbase/APKBUILD
+++ b/user/qt5-qtbase/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qt5-qtbase
-_pkgname=qtbase-everywhere-src
-pkgver=5.12.9
+_pkgname=qtbase-everywhere
+pkgver=5.15.4
 pkgrel=0
 pkgdesc="Cross-platform application and UI framework"
 url="https://www.qt.io/"
@@ -22,14 +22,11 @@ makedepends="$depends_dev
 	xcb-util-keysyms-dev xcb-util-wm-dev xcb-util-renderutil-dev cmd:which
 	"
 subpackages="$pkgname-dev $pkgname-doc $_sub"
-source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz
+source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-opensource-src-$pkgver.tar.xz
+	kde-lts.patch
 	big-endian-scroll-wheel.patch
-	forward-port-move.patch
 	link-to-execinfo.patch
 	qt-musl-iconv-no-bom.patch
-	time64.patch
-	CVE-2020-17507.patch
-	section-header.patch
 	"
 
 # secfixes: qt
@@ -49,7 +46,7 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu
 
 _qt5_prefix=/usr/lib/qt5
 _qt5_datadir=/usr/share/qt5
-builddir="$srcdir"/$_pkgname-$pkgver
+builddir="$srcdir"/$_pkgname-src-$pkgver
 
 prepare() {
 	default_prepare
@@ -95,7 +92,6 @@ build() {
 		-system-libpng \
 		-system-pcre \
 		-system-sqlite \
-		-system-xcb \
 		-system-zlib \
 		-translationdir "$_qt5_datadir"/translations \
 		-no-reduce-relocations \
@@ -181,11 +177,8 @@ x11() {
 	return 0
 }
 
-sha512sums="40916f73e44dbcab2a3196063d491d5563ec3de583436dac25ecf219aea6e7eb55c46ce8b1c761980f90495b91c89bd5239bd081636054311fee6420750319b0  qtbase-everywhere-src-5.12.9.tar.xz
+sha512sums="91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3  qtbase-everywhere-opensource-src-5.15.4.tar.xz
+44c4ec3a3e62041f948f1234492e0c6ce855be72efaee80cad010f6ee9ff7460f45924a8441747c0082236fef3745fcdebecb6fc26c6490d99f2b7bb714f1b1f  kde-lts.patch
 d00dc607b71a93132f756b952871df9197cfd6d78cc3617544bfa11d7f0eea21ce5dd0d1aeb69dd2702a5694a63d3802accc76499dbf414c01eb56421698cb0c  big-endian-scroll-wheel.patch
-e8c542a7c203e7d449f06ac16784e13aefef55f6b8ef8619c49e4604e6e4f697baef027415d1b65f69e95770479c2ed0074dc0dfff9632317eccb30701ae1ed3  forward-port-move.patch
 ee78a44e28ba5f728914bfc3d8d5b467896c7de11a02d54b0bce11e40a4338b1f776c1fcc30cbd436df4f548c1ab0b4fe801f01b162ddd5c0f892893e227acfd  link-to-execinfo.patch
-e3982b2df2ab4ba53b7a1329a9eb928eb1fee813c61cf6ac03d3300a767ffb57f019ac0fd89f633cac2330549446ff3d43344871296bf362815e7ebffadefa6b  qt-musl-iconv-no-bom.patch
-436f0bb7a89a88aa62c7b0398c4e91c325e78542e96f747c903f7e96dbf9d9b693d9688c722f2a74e287fb9ab31e861bd5ed8deb172ed28f56a1b8757663771c  time64.patch
-9ebf15139025d76ff103a1ae77973136b2f883a38dc54febfa44f08060f41ee13016668c96a29c62dcc458125516ba8bdb899b1ab5604dc976b4f72e513bb682  CVE-2020-17507.patch
-47b2973561965e3ef906f03480b3877ad0018f32d31fecb4c410abe22c68ccad7d232cfe68804b70111616e15b979fb26642225b984d8fdbfc6cf6899ad63a0d  section-header.patch"
+e3982b2df2ab4ba53b7a1329a9eb928eb1fee813c61cf6ac03d3300a767ffb57f019ac0fd89f633cac2330549446ff3d43344871296bf362815e7ebffadefa6b  qt-musl-iconv-no-bom.patch"
-- 
cgit v1.2.3-60-g2f50