From ee0955ca17538d32ccf423d9821e77aec8682fff Mon Sep 17 00:00:00 2001
From: David Beauchamp <david@archlinuxarm.org>
Date: Fri, 3 May 2024 12:37:32 -0400
Subject: [PATCH] extra/qt6-base to 6.7.0-5

---
 extra/qt6-base/.SRCINFO | 2 +-
 extra/qt6-base/PKGBUILD | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/extra/qt6-base/.SRCINFO b/extra/qt6-base/.SRCINFO
index 9f6c96657..18e6eaf90 100644
--- a/extra/qt6-base/.SRCINFO
+++ b/extra/qt6-base/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = qt6-base
 	pkgdesc = A cross-platform application and UI framework
 	pkgver = 6.7.0
-	pkgrel = 4
+	pkgrel = 5
 	url = https://www.qt.io
 	arch = x86_64
 	groups = qt6
diff --git a/extra/qt6-base/PKGBUILD b/extra/qt6-base/PKGBUILD
index c9880ce37..428d3967e 100644
--- a/extra/qt6-base/PKGBUILD
+++ b/extra/qt6-base/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=(qt6-base
          qt6-xcb-private-headers)
 _qtver=6.7.0
 pkgver=${_qtver/-/}
-pkgrel=4
+pkgrel=5
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
@@ -100,6 +100,7 @@ prepare() {
   patch -d $_pkgfn -p1 < fix-wrong-cpp-if.patch # https://bugreports.qt.io/browse/QTBUG-123937
   cd $_pkgfn
   git cherry-pick -n 7c4e1357e49baebdd2d20710fccb5604cbb36c0d # CVE-2024-33861
+  git cherry-pick -n a8ef8ea55014546e0e835cd0eacf694919702a11 # https://bugreports.qt.io/browse/QTBUG-124386
 }
 
 build() {