From fa8dee0ea0c29b6ebfcdb4a3528d3d9c933c0fc8 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 16 Feb 2024 14:03:27 +0000
Subject: [PATCH] extra/qt6-base to 6.6.2-3

---
 extra/qt6-base/.SRCINFO        | 17 +++++++++++++----
 extra/qt6-base/.nvchecker.toml |  5 +++++
 extra/qt6-base/PKGBUILD        | 33 ++++++++++++++++++++++++++-------
 3 files changed, 44 insertions(+), 11 deletions(-)
 create mode 100644 extra/qt6-base/.nvchecker.toml

diff --git a/extra/qt6-base/.SRCINFO b/extra/qt6-base/.SRCINFO
index cd9a237b9..a8975618a 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.1
-	pkgrel = 2
+	pkgver = 6.6.2
+	pkgrel = 3
 	url = https://www.qt.io
 	arch = x86_64
 	groups = qt6
@@ -75,14 +75,17 @@ pkgbase = qt6-base
 	optdepends = postgresql-libs: PostgreSQL driver
 	optdepends = qt6-wayland: to run Qt6 applications in a Wayland session
 	optdepends = unixodbc: ODBC driver
-	source = https://download.qt.io/official_releases/qt/6.6/6.6.1/submodules/qtbase-everywhere-src-6.6.1.tar.xz
+	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
-	sha256sums = 450c5b4677b2fe40ed07954d7f0f40690068e80a94c9df86c2c905ccd59d02f7
+	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
 	depends = brotli
 	depends = dbus
 	depends = double-conversion
@@ -127,3 +130,9 @@ pkgname = qt6-base
 	depends = zlib
 	depends = zstd
 	depends = qt6-translations
+
+pkgname = qt6-xcb-private-headers
+	pkgdesc = Private headers for Qt6 Xcb
+	groups = 
+	depends = qt6-base=6.6.2
+	optdepends = 
diff --git a/extra/qt6-base/.nvchecker.toml b/extra/qt6-base/.nvchecker.toml
new file mode 100644
index 000000000..15106b64d
--- /dev/null
+++ b/extra/qt6-base/.nvchecker.toml
@@ -0,0 +1,5 @@
+[qt6-base]
+source = 'git'
+git = 'git://code.qt.io/qt/qtbase.git'
+prefix = 'v'
+exclude_regex = '.*(alpha|beta|rc).*'
diff --git a/extra/qt6-base/PKGBUILD b/extra/qt6-base/PKGBUILD
index cd924e863..ee45b6ad7 100644
--- a/extra/qt6-base/PKGBUILD
+++ b/extra/qt6-base/PKGBUILD
@@ -6,8 +6,9 @@
 #  - disable ibase for now, FTBFS
 #  - removed -DFEATURE_no_direct_extern_access=ON
 
-pkgname=qt6-base
-_qtver=6.6.1
+pkgbase=qt6-base
+pkgname=(qt6-base qt6-xcb-private-headers)
+_qtver=6.6.2
 pkgver=${_qtver/-/}
 pkgrel=3
 arch=(x86_64)
@@ -81,17 +82,20 @@ optdepends=('freetds: MS SQL driver'
             'qt6-wayland: to run Qt6 applications in a Wayland session'
             'unixodbc: ODBC driver')
 groups=(qt6)
-_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+_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)
-sha256sums=('450c5b4677b2fe40ed07954d7f0f40690068e80a94c9df86c2c905ccd59d02f7'
+        qt6-base-nostrip.patch
+        qt-6.6.2-revert-ABI-break.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=fb92bb07)
+sha256sums=('b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b'
             '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
-            '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094')
+            '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094'
+            'ff0de01b5afafab6d36f0a18ac1ab3ade2107ca75f03123da024a07d7eba2d97')
 
 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() {
@@ -117,7 +121,8 @@ build() {
   cmake --build build
 }
 
-package() {
+package_qt6-base() {
+  pkgdesc='A cross-platform application and UI framework'
   depends+=(qt6-translations)
   DESTDIR="$pkgdir" cmake --install build
 
@@ -130,3 +135,17 @@ package() {
     ln -s $_line
   done < "$srcdir"/build/user_facing_tool_links.txt
 }
+
+package_qt6-xcb-private-headers() {
+  pkgdesc='Private headers for Qt6 Xcb'
+
+  depends=("qt6-base=$pkgver")
+  optdepends=()
+  groups=()
+
+  cd $_pkgfn
+  install -d -m755 "$pkgdir"/usr/include/qt6xcb-private/{gl_integrations,nativepainting}
+  cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qt6xcb-private/
+  cp -r src/plugins/platforms/xcb/gl_integrations/*.h "$pkgdir"/usr/include/qt6xcb-private/gl_integrations/
+  cp -r src/plugins/platforms/xcb/nativepainting/*.h "$pkgdir"/usr/include/qt6xcb-private/nativepainting/
+}