Merge pull request #12930 from Rmys/master

qt6-6.0.0

desktop/toolkit/qt6/qt6-base/files/197e5915.patch

@@ -0,0 +1,42 @@
+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
+

desktop/toolkit/qt6/qt6-base/files/8af35d27.patch

@@ -0,0 +1,42 @@
+From 8af35d27e8f02bbb99aef4ac495ed406e50e3cca Mon Sep 17 00:00:00 2001
+From: Liang Qi <liang.qi@qt.io>
+Date: Tue, 10 Oct 2023 14:08:48 +0200
+Subject: xkb: fix build with libxkbcommon 1.6.0 and later
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+A few XKB_KEY_dead_* defines got removed from 1.6.0. See also
+https://github.com/xkbcommon/libxkbcommon/blob/6073565903488cb5b9a8d37fdc4a7c2f9d7ad04d/NEWS#L9-L14
+https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/70/diffs?commit_id=cb44799b72f611eb4c9d7cc185bc3b09e070be08
+
+Pick-to: 6.6 6.5 6.2 5.15
+Fixes: QTBUG-117950
+Change-Id: I55861868f2bb29c553d68365fa9b9b6ed01c9aea
+Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
+---
+ src/gui/platform/unix/qxkbcommon.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/gui/platform/unix/qxkbcommon.cpp b/src/gui/platform/unix/qxkbcommon.cpp
+index 26d87c5ff5..7b611790c6 100644
+--- a/src/gui/platform/unix/qxkbcommon.cpp
++++ b/src/gui/platform/unix/qxkbcommon.cpp
+@@ -237,10 +237,14 @@ static constexpr const auto KeyTbl = qMakeArray(
+         Xkb2Qt<XKB_KEY_dead_small_schwa,        Qt::Key_Dead_Small_Schwa>,
+         Xkb2Qt<XKB_KEY_dead_capital_schwa,      Qt::Key_Dead_Capital_Schwa>,
+         Xkb2Qt<XKB_KEY_dead_greek,              Qt::Key_Dead_Greek>,
++/* The following four XKB_KEY_dead keys got removed in libxkbcommon 1.6.0
++   The define check is kind of version check here. */
++#ifdef XKB_KEY_dead_lowline
+         Xkb2Qt<XKB_KEY_dead_lowline,            Qt::Key_Dead_Lowline>,
+         Xkb2Qt<XKB_KEY_dead_aboveverticalline,  Qt::Key_Dead_Aboveverticalline>,
+         Xkb2Qt<XKB_KEY_dead_belowverticalline,  Qt::Key_Dead_Belowverticalline>,
+         Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
++#endif
+ 
+         // Special keys from X.org - This include multimedia keys,
+         // wireless/bluetooth/uwb keys, special launcher keys, etc.
+-- 
+cgit v1.2.3
+

desktop/toolkit/qt6/qt6-base/pspec.xml

@@ -11,7 +11,7 @@
         <Summary>Cross platform application and UI framework</Summary>
         <Description>Cross platform application and UI development framework</Description>
         <License>'GPL3' 'LGPL3' 'FDL' 'custom'</License>
-        <Archive sha1sum="0287ec91079e5d12349aa91c1389661967a73c97" type="tarxz">https://download.qt.io/official_releases/qt/6.5/6.5.3/submodules/qtbase-everywhere-src-6.5.3.tar.xz</Archive>
+        <Archive sha1sum="fb8c7f38c5ab71769044b723be1a6956688d55a4" type="tarxz">https://download.qt.io/official_releases/qt/6.6/6.6.0/submodules/qtbase-everywhere-src-6.6.0.tar.xz</Archive>
         <AdditionalFiles>
 <!--             <AdditionalFile target="qt6-base-nouveau-freeze.patch">qt6-base-nouveau-freeze.patch</AdditionalFile> -->
         </AdditionalFiles>
@@ -100,8 +100,8 @@
 <!--             <Patch level="1">fedora/qtbase-firebird.patch</Patch> -->
             <Patch level="1">fedora/qtbase-mysql.patch</Patch>
             <Patch level="1">fedora/qtbase-libglvnd.patch</Patch>
-            <Patch level="1">fedora/qtbase-gcc11.patch</Patch>
+            <Patch level="1">8af35d27.patch</Patch>
-            <Patch level="1">qtbase-6.5.3-xkbcommon160.patch</Patch>
+            <Patch level="1">197e5915.patch</Patch>
         </Patches>
     </Source>
 
@@ -297,6 +297,13 @@
     </Package>-->
 
     <History>
+        <Update release="7">
+            <Date>2023-11-17</Date>
+            <Version>6.6.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="6">
             <Date>2023-10-23</Date>
             <Version>6.5.3</Version>