From c5bf5eb2b8589b43ae5a95aa71cf796f44537a58 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 17 Feb 2024 18:44:36 +0000
Subject: [PATCH] extra/qt6-base to 6.6.2-4

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

diff --git a/extra/qt6-base/.SRCINFO b/extra/qt6-base/.SRCINFO
index a8975618a..5416cd7ed 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.6.2
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.qt.io
 	arch = x86_64
 	groups = qt6
@@ -78,11 +78,9 @@ pkgbase = qt6-base
 	source = https://download.qt.io/official_releases/qt/6.6/6.6.2/submodules/qtbase-everywhere-src-6.6.2.tar.xz
 	source = qt6-base-cflags.patch
 	source = qt6-base-nostrip.patch
-	source = qt-6.6.2-revert-ABI-break.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=fb92bb07
 	sha256sums = b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b
 	sha256sums = 5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78
 	sha256sums = 4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094
-	sha256sums = ff0de01b5afafab6d36f0a18ac1ab3ade2107ca75f03123da024a07d7eba2d97
 
 pkgname = qt6-base
 	pkgdesc = A cross-platform application and UI framework
diff --git a/extra/qt6-base/PKGBUILD b/extra/qt6-base/PKGBUILD
index ee45b6ad7..0f5076cee 100644
--- a/extra/qt6-base/PKGBUILD
+++ b/extra/qt6-base/PKGBUILD
@@ -10,7 +10,7 @@ pkgbase=qt6-base
 pkgname=(qt6-base qt6-xcb-private-headers)
 _qtver=6.6.2
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=4
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
@@ -85,17 +85,14 @@ groups=(qt6)
 _pkgfn=${pkgbase/6-/}-everywhere-src-$_qtver
 source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
         qt6-base-cflags.patch
-        qt6-base-nostrip.patch
-        qt-6.6.2-revert-ABI-break.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=fb92bb07)
+        qt6-base-nostrip.patch)
 sha256sums=('b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b'
             '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
-            '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094'
-            'ff0de01b5afafab6d36f0a18ac1ab3ade2107ca75f03123da024a07d7eba2d97')
+            '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094')
 
 prepare() {
   patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS
   patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with qmake
-  patch -d $_pkgfn -Rp1 < qt-6.6.2-revert-ABI-break.patch # Revert ABI break in 6.6.2
 }
 
 build() {