diff --git a/0001-a11y-fix-race-condition-on-atspi-startup-on-Wayland.patch b/0001-a11y-fix-race-condition-on-atspi-startup-on-Wayland.patch deleted file mode 100644 index 2fd8b0f..0000000 --- a/0001-a11y-fix-race-condition-on-atspi-startup-on-Wayland.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f6d97b7a9578074de6a5eee0e801eaafda1d9fdd Mon Sep 17 00:00:00 2001 -From: Harald Sitter -Date: Tue, 1 Aug 2023 13:56:24 +0200 -Subject: [PATCH] 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) ---- - 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 f59d8be..8a3f82e 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); - }); - } --- -2.42.0 - diff --git a/0001-xcb-replace-a-warning-with-debug-info-in-qxcbconnect.patch b/0001-xcb-replace-a-warning-with-debug-info-in-qxcbconnect.patch deleted file mode 100644 index b53b2ea..0000000 --- a/0001-xcb-replace-a-warning-with-debug-info-in-qxcbconnect.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c9cb83d2127485be6a9ae62b9daf934eb5306928 Mon Sep 17 00:00:00 2001 -From: Liang Qi -Date: Fri, 6 Oct 2023 09:48:33 +0200 -Subject: [PATCH] xcb: replace a warning with debug info in - qxcbconnection_xi2.cpp - -Fixes: QTBUG-117820 -Pick-to: 6.5 -Change-Id: I3b89305e1a8d92a02166efee7067108572f7a97a -Reviewed-by: Shawn Rutledge -(cherry picked from commit 42d9c1913a504423783397adf6e6a77545f857ac) -Reviewed-by: Qt Cherry-pick Bot ---- - src/plugins/platforms/xcb/qxcbconnection_xi2.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp -index 897a429970..c94b3edb69 100644 ---- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp -+++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp -@@ -766,7 +766,7 @@ void QXcbConnection::xi2HandleEvent(xcb_ge_event_t *event) - if (auto device = QPointingDevicePrivate::pointingDeviceById(sourceDeviceId)) - xi2HandleScrollEvent(event, device); - else -- qCWarning(lcQpaXInputEvents) << "scroll event from unregistered device" << sourceDeviceId; -+ qCDebug(lcQpaXInputEvents) << "scroll event from unregistered device" << sourceDeviceId; - - if (xiDeviceEvent) { - switch (xiDeviceEvent->event_type) { --- -2.42.0 - diff --git a/0001-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch b/0001-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch deleted file mode 100644 index e10ba00..0000000 --- a/0001-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 450aabeeb075a77fe648a67569391ddb2a0bbf53 Mon Sep 17 00:00:00 2001 -From: Liang Qi -Date: Tue, 10 Oct 2023 14:08:48 +0200 -Subject: [PATCH] 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 d254aee..56eb8a3 100644 ---- a/src/gui/platform/unix/qxkbcommon.cpp -+++ b/src/gui/platform/unix/qxkbcommon.cpp -@@ -239,10 +239,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. --- -2.42.0 - diff --git a/qt6-base.changes b/qt6-base.changes index 59c9f64..f255eea 100644 --- a/qt6-base.changes +++ b/qt6-base.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Nov 27 14:00:05 UTC 2023 - Christophe Marin + +- Update to 6.6.1: + * https://www.qt.io/blog/qt-6.6.1-released +- Drop patches, merged upstream: + * 0001-xcb-replace-a-warning-with-debug-info-in-qxcbconnect.patch + * 0001-a11y-fix-race-condition-on-atspi-startup-on-Wayland.patch + * 0001-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch + ------------------------------------------------------------------- Thu Nov 16 09:14:40 UTC 2023 - Christophe Marin diff --git a/qt6-base.spec b/qt6-base.spec index 94fb06c..3078248 100644 --- a/qt6-base.spec +++ b/qt6-base.spec @@ -16,7 +16,7 @@ # -%define real_version 6.6.0 +%define real_version 6.6.1 %define short_version 6.6 %define tar_name qtbase-everywhere-src %define tar_suffix %{nil} @@ -30,7 +30,7 @@ %global with_gles 1 %endif Name: qt6-base%{?pkg_suffix} -Version: 6.6.0 +Version: 6.6.1 Release: 0 Summary: Qt 6 core components (Core, Gui, Widgets, Network...) # Legal: qtpaths is BSD-3-Clause @@ -39,9 +39,6 @@ URL: https://www.qt.io Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source99: qt6-base-rpmlintrc # Patches 0-100 are upstream patches # -Patch0: 0001-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch -Patch1: 0001-xcb-replace-a-warning-with-debug-info-in-qxcbconnect.patch -Patch2: 0001-a11y-fix-race-condition-on-atspi-startup-on-Wayland.patch # Patches 100-200 are openSUSE and/or non-upstream(able) patches # Patch100: 0001-Tell-the-truth-about-private-API.patch # No need to pollute the library dir with object files, install them in the qt6 subfolder diff --git a/qtbase-everywhere-src-6.6.0.tar.xz b/qtbase-everywhere-src-6.6.0.tar.xz deleted file mode 100644 index ba4c471..0000000 --- a/qtbase-everywhere-src-6.6.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e -size 48350308 diff --git a/qtbase-everywhere-src-6.6.1.tar.xz b/qtbase-everywhere-src-6.6.1.tar.xz new file mode 100644 index 0000000..ce55da5 --- /dev/null +++ b/qtbase-everywhere-src-6.6.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:450c5b4677b2fe40ed07954d7f0f40690068e80a94c9df86c2c905ccd59d02f7 +size 48370760