From a1c87346d27ee17bf02c58c1b2fab819d7c64f0f Mon Sep 17 00:00:00 2001 From: Rmys Date: Fri, 17 Nov 2023 17:22:14 +0300 Subject: [PATCH] qt6-6.0.0 --- .../toolkit/qt6/qt6-base/files/197e5915.patch | 42 +++++++++++++++++++ .../toolkit/qt6/qt6-base/files/8af35d27.patch | 42 +++++++++++++++++++ desktop/toolkit/qt6/qt6-base/pspec.xml | 13 ++++-- 3 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 desktop/toolkit/qt6/qt6-base/files/197e5915.patch create mode 100644 desktop/toolkit/qt6/qt6-base/files/8af35d27.patch diff --git a/desktop/toolkit/qt6/qt6-base/files/197e5915.patch b/desktop/toolkit/qt6/qt6-base/files/197e5915.patch new file mode 100644 index 0000000000..cd219172b9 --- /dev/null +++ b/desktop/toolkit/qt6/qt6-base/files/197e5915.patch @@ -0,0 +1,42 @@ +From 197e5915585e8978e8b98a861f71f2d22b0d930e Mon Sep 17 00:00:00 2001 +From: Harald Sitter +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 +(cherry picked from commit 918fed39156c90540a12557c7a6630ae3d7d841e) +Reviewed-by: Qt Cherry-pick Bot +--- + 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 + diff --git a/desktop/toolkit/qt6/qt6-base/files/8af35d27.patch b/desktop/toolkit/qt6/qt6-base/files/8af35d27.patch new file mode 100644 index 0000000000..0be9f45b8a --- /dev/null +++ b/desktop/toolkit/qt6/qt6-base/files/8af35d27.patch @@ -0,0 +1,42 @@ +From 8af35d27e8f02bbb99aef4ac495ed406e50e3cca Mon Sep 17 00:00:00 2001 +From: Liang Qi +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ø +--- + 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, + Xkb2Qt, + Xkb2Qt, ++/* 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, + Xkb2Qt, + Xkb2Qt, + Xkb2Qt, ++#endif + + // Special keys from X.org - This include multimedia keys, + // wireless/bluetooth/uwb keys, special launcher keys, etc. +-- +cgit v1.2.3 + diff --git a/desktop/toolkit/qt6/qt6-base/pspec.xml b/desktop/toolkit/qt6/qt6-base/pspec.xml index 1ad7dcc526..bf463a3a6b 100755 --- a/desktop/toolkit/qt6/qt6-base/pspec.xml +++ b/desktop/toolkit/qt6/qt6-base/pspec.xml @@ -11,7 +11,7 @@ Cross platform application and UI framework Cross platform application and UI development framework 'GPL3' 'LGPL3' 'FDL' 'custom' - https://download.qt.io/official_releases/qt/6.5/6.5.3/submodules/qtbase-everywhere-src-6.5.3.tar.xz + https://download.qt.io/official_releases/qt/6.6/6.6.0/submodules/qtbase-everywhere-src-6.6.0.tar.xz @@ -100,8 +100,8 @@ fedora/qtbase-mysql.patch fedora/qtbase-libglvnd.patch - fedora/qtbase-gcc11.patch - qtbase-6.5.3-xkbcommon160.patch + 8af35d27.patch + 197e5915.patch @@ -297,6 +297,13 @@ --> + + 2023-11-17 + 6.6.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-10-23 6.5.3