6.6.1
This commit is contained in:
Jan Grulich
parent
4d5e0869d8
commit
0916bd3f34
1
.gitignore
vendored
1
.gitignore
vendored
@ -24,3 +24,4 @@
|
||||
/qt-everywhere-src-6.5.3.tar.xz
|
||||
/qtbase-everywhere-src-6.5.3.tar.xz
|
||||
/qtbase-everywhere-src-6.6.0.tar.xz
|
||||
/qtbase-everywhere-src-6.6.1.tar.xz
|
||||
|
||||
@ -37,8 +37,8 @@ BuildRequires: pkgconfig(libsystemd)
|
||||
|
||||
Name: qt6-qtbase
|
||||
Summary: Qt6 - QtBase components
|
||||
Version: 6.6.0
|
||||
Release: 7%{?dist}
|
||||
Version: 6.6.1
|
||||
Release: 1%{?dist}
|
||||
|
||||
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
||||
Url: http://qt-project.org/
|
||||
@ -87,9 +87,6 @@ Patch56: qtbase-mysql.patch
|
||||
# fix FTBFS against libglvnd-1.3.4+
|
||||
Patch58: qtbase-libglvnd.patch
|
||||
|
||||
# fix FTBS against libxkbcommon 1.6.0
|
||||
Patch59: qtbase-libxkbcommon-1.6.0.patch
|
||||
|
||||
# Bug 1954359 - Many emoji don't show up in Qt apps because qt does not handle 'emoji' font family
|
||||
# FIXME: this change seems to completely break font rendering for some people
|
||||
# Patch60: qtbase-cache-emoji-font.patch
|
||||
@ -100,7 +97,6 @@ Patch100: qtbase-use-qgnomeplatform-as-default-platform-theme-on-gnome.patch
|
||||
%endif
|
||||
|
||||
## upstream patches
|
||||
Patch200: qtbase-a11y-fix-race-condition-on-atspi-startup-on-wayland.patch
|
||||
|
||||
# Do not check any files in %%{_qt6_plugindir}/platformthemes/ for requires.
|
||||
# Those themes are there for platform integration. If the required libraries are
|
||||
@ -422,7 +418,7 @@ translationdir=%{_qt6_translationdir}
|
||||
|
||||
Name: Qt6
|
||||
Description: Qt6 Configuration
|
||||
Version: 6.6.0
|
||||
Version: 6.6.1
|
||||
EOF
|
||||
|
||||
# rpm macros
|
||||
@ -839,6 +835,9 @@ make check -k ||:
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Nov 27 2023 Jan Grulich <jgrulich@redhat.com> - 6.6.1-1
|
||||
- 6.6.1
|
||||
|
||||
* Fri Nov 10 2023 Alessandro Astone <ales.astone@gmail.com> - 6.6.0-7
|
||||
- Add xkbcommon as a devel dependency
|
||||
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
From 197e5915585e8978e8b98a861f71f2d22b0d930e Mon Sep 17 00:00:00 2001
|
||||
From: Harald Sitter <sitter@kde.org>
|
||||
Date: Tue, 01 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 <liang.qi@qt.io>
|
||||
(cherry picked from commit 918fed39156c90540a12557c7a6630ae3d7d841e)
|
||||
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
||||
---
|
||||
|
||||
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 @@
|
||||
// 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);
|
||||
});
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
diff --git a/src/gui/platform/unix/qxkbcommon.cpp b/src/gui/platform/unix/qxkbcommon.cpp
|
||||
index d254aeec..fab21226 100644
|
||||
--- a/src/gui/platform/unix/qxkbcommon.cpp
|
||||
+++ b/src/gui/platform/unix/qxkbcommon.cpp
|
||||
@@ -239,10 +239,15 @@ 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>,
|
||||
- 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>,
|
||||
+ // These were removed in libxkbcommon 1.6.0
|
||||
+ // XK_dead_lowline
|
||||
+ Xkb2Qt<0xfe90, Qt::Key_Dead_Lowline>,
|
||||
+ // XK_dead_aboveverticalline
|
||||
+ Xkb2Qt<0xfe91, Qt::Key_Dead_Aboveverticalline>,
|
||||
+ // XK_dead_belowverticalline
|
||||
+ Xkb2Qt<0xfe92, Qt::Key_Dead_Belowverticalline>,
|
||||
+ // XK_dead_longsolidusoverlay
|
||||
+ Xkb2Qt<0xfe93, Qt::Key_Dead_Longsolidusoverlay>,
|
||||
|
||||
// Special keys from X.org - This include multimedia keys,
|
||||
// wireless/bluetooth/uwb keys, special launcher keys, etc.
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (qtbase-everywhere-src-6.6.0.tar.xz) = 4e85acefeddc0a3cd6ba615b4768f435c4e237a605172153a1777a10285dab83d9cf220c18ce6d723d051b8b432f3e92be94925b54c2eb972c2c1d9ace849e17
|
||||
SHA512 (qtbase-everywhere-src-6.6.1.tar.xz) = 93e77b9b077a3acd5607b643db282fdd7ed0bdfa07df74c3f0d2285afeb1672a6fa229a7e7a6c8a462701305fc22ffef20c212d906484e50fb5cdb706a7b72e1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user