qt6-base: upgrade to 6.6.1

main/qt6-base/.checksums

@@ -1,5 +1,4 @@
-f0d4f91d06be0dcede36c54dcbd0c149  qt6-base-6.6.0.tar.xz
+1996913808fcba10346b8e1e6ce82c52  qt6-base-6.6.1.tar.xz
 2065318669fb31f016b7af474eb78323  qt6-base-cflags.patch
-3da9a046d51b8aac92a97cf572ba3309  qt6-base-fix-a11y.patch
 56462f1c05a4d5c4d06cb40258101b0a  qt6-base-nostrip.patch
 516776fe66e77b0a15bf6dee857d0c1f  xkbcommon160.patch

main/qt6-base/qt6-base-fix-a11y.patch

@@ -1,42 +0,0 @@
-From 197e5915585e8978e8b98a861f71f2d22b0d930e Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Tue, 1 Aug 2023 13:56:24 +0200
-Subject: a11y: fix race condition on atspi startup on Wayland
-
-This amends db346e711c9af50566c234cfc21199680e6cb499 .
-
-Previously we could race between dbus connecting and our "manual"
-enabled call since we didn't take into account whether dbus is
-connected or not.
-
-This lead to scenarios where opening an application (in particular under
-Wayland) would result in the application not being able to register on
-the a11y bus because registration was attempted too early.
-By simply taking connectedness into account we'll make sure to not
-run registration too early anymore.
-
-Pick-to: 6.5
-Change-Id: I46a3c0b57f8a0c83d3e5fae9e355c2061954031f
-Reviewed-by: Liang Qi <liang.qi@qt.io>
-(cherry picked from commit 918fed39156c90540a12557c7a6630ae3d7d841e)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
- src/gui/accessible/linux/qspiaccessiblebridge.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gui/accessible/linux/qspiaccessiblebridge.cpp b/src/gui/accessible/linux/qspiaccessiblebridge.cpp
-index f59d8be18b..8a3f82e08b 100644
---- a/src/gui/accessible/linux/qspiaccessiblebridge.cpp
-+++ b/src/gui/accessible/linux/qspiaccessiblebridge.cpp
-@@ -38,7 +38,7 @@ QSpiAccessibleBridge::QSpiAccessibleBridge()
-     // But do that only on next loop, once dbus is really settled.
-     QTimer::singleShot(
-         0, this, [this]{
--            if (dbusConnection->isEnabled())
-+            if (dbusConnection->isEnabled() && dbusConnection->connection().isConnected())
-                 enabledChanged(true);
-         });
- }
--- 
-cgit v1.2.3
-

main/qt6-base/spkgbuild

@@ -4,20 +4,19 @@
 # optional	    : gtk3 mariadb postgresql unixodbc pulseaudio pipewire md4c tslib xmlstarlet xdg-utils libproxy
 
 name=qt6-base
-version=6.6.0
-release=3
+version=6.6.1
+release=1
 source="$name-$version.tar.xz::https://download.qt.io/official_releases/qt/${version%.*}/$version/submodules/qtbase-everywhere-src-$version.tar.xz
-	qt6-base-fix-a11y.patch qt6-base-cflags.patch qt6-base-nostrip.patch xkbcommon160.patch"
+	qt6-base-cflags.patch qt6-base-nostrip.patch xkbcommon160.patch"
 
 build() {
 	patch -d qtbase-everywhere-src-$version -p1 -i $SRC/qt6-base-cflags.patch
 	patch -d qtbase-everywhere-src-$version -p1 -i $SRC/qt6-base-nostrip.patch
 	patch -d qtbase-everywhere-src-$version -p1 -i $SRC/xkbcommon160.patch
-	patch -d qtbase-everywhere-src-$version -p1 -i $SRC/qt6-base-fix-a11y.patch
 
 
 	cmake -S qtbase-everywhere-src-$version -B build -G Ninja \
-		-D QT_USE_CCACHE=ON \
+		-D QT_USE_CCACHE=$(scratch isinstalled ccache && echo ON || echo OFF) \
 		-D QT_AVOID_CMAKE_ARCHIVING_API=ON \
 		-D CMAKE_INSTALL_PREFIX=/usr \
 		-D INSTALL_BINDIR=lib/qt6/bin \
@@ -35,6 +34,14 @@ build() {
 		-D QT_DISABLE_RPATH=TRUE \
 		-D QT_FEATURE_openssl_linked=ON \
 		-D QT_FEATURE_system_sqlite=ON \
+		-D QT_FEATURE_no_direct_extern_access=ON \
+		-D QT_FEATURE_vulkan=ON \
+		-D QT_FEATURE_xcb=ON \
+		-D QT_FEATURE_xkbcommon_x11=ON \
+		-D QT_BUILD_TESTS_BY_DEFAULT=OFF \
+		-D QT_FEATURE_reduce_relocations=OFF \
+		-D QT_FEATURE_androiddeployqt=OFF \
+		-D QT_FEATURE_rpath=OFF \
 		-Wno-dev
 
 	cmake --build build