From c7da9957008068c4712bef5bd9a13cfb239a948b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Mon, 20 Jun 2022 14:00:13 +0200 Subject: [PATCH] Fix keyboard a11y confirmation dialog Resolves: #2047644 --- ...A11yDialog-Use-MetaKeyboardA11yFlags.patch | 51 +++++++++++++++++++ gnome-shell.spec | 7 ++- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 0001-kbdA11yDialog-Use-MetaKeyboardA11yFlags.patch diff --git a/0001-kbdA11yDialog-Use-MetaKeyboardA11yFlags.patch b/0001-kbdA11yDialog-Use-MetaKeyboardA11yFlags.patch new file mode 100644 index 0000000..2ff43aa --- /dev/null +++ b/0001-kbdA11yDialog-Use-MetaKeyboardA11yFlags.patch @@ -0,0 +1,51 @@ +From bd4fef8354ff0730c1e96a47d77adbb4a4d7beaa Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan +Date: Tue, 14 Jun 2022 16:38:27 +0200 +Subject: [PATCH] kbdA11yDialog: Use MetaKeyboardA11yFlags + +The change in mutter to move keyboard accessibility into backends needs +to be applied in gnome-shell as well, otherwise the keyboard +accessibility dialog cannot work. + +Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2306 +Part-of: +--- + js/ui/kbdA11yDialog.js | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/js/ui/kbdA11yDialog.js b/js/ui/kbdA11yDialog.js +index a45e02443..60ec161a6 100644 +--- a/js/ui/kbdA11yDialog.js ++++ b/js/ui/kbdA11yDialog.js +@@ -1,5 +1,5 @@ + /* exported KbdA11yDialog */ +-const { Clutter, Gio, GObject } = imports.gi; ++const { Clutter, Gio, GObject, Meta } = imports.gi; + + const Dialog = imports.ui.dialog; + const ModalDialog = imports.ui.modalDialog; +@@ -25,17 +25,17 @@ class KbdA11yDialog extends GObject.Object { + let title, description; + let key, enabled; + +- if (whatChanged & Clutter.KeyboardA11yFlags.SLOW_KEYS_ENABLED) { ++ if (whatChanged & Meta.KeyboardA11yFlags.SLOW_KEYS_ENABLED) { + key = KEY_SLOW_KEYS_ENABLED; +- enabled = (newFlags & Clutter.KeyboardA11yFlags.SLOW_KEYS_ENABLED) > 0; ++ enabled = (newFlags & Meta.KeyboardA11yFlags.SLOW_KEYS_ENABLED) > 0; + title = enabled + ? _("Slow Keys Turned On") + : _("Slow Keys Turned Off"); + description = _('You just held down the Shift key for 8 seconds. This is the shortcut ' + + 'for the Slow Keys feature, which affects the way your keyboard works.'); +- } else if (whatChanged & Clutter.KeyboardA11yFlags.STICKY_KEYS_ENABLED) { ++ } else if (whatChanged & Meta.KeyboardA11yFlags.STICKY_KEYS_ENABLED) { + key = KEY_STICKY_KEYS_ENABLED; +- enabled = (newFlags & Clutter.KeyboardA11yFlags.STICKY_KEYS_ENABLED) > 0; ++ enabled = (newFlags & Meta.KeyboardA11yFlags.STICKY_KEYS_ENABLED) > 0; + title = enabled + ? _("Sticky Keys Turned On") + : _("Sticky Keys Turned Off"); +-- +2.36.1 + diff --git a/gnome-shell.spec b/gnome-shell.spec index d76b4c7..4c92db5 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -2,7 +2,7 @@ Name: gnome-shell Version: 40.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ @@ -44,6 +44,7 @@ Patch42: fix-markup-in-highlighter.patch Patch43: restrict-dbus-callers.patch Patch44: 0001-Revert-dash-Subtract-vertical-margins-from-availHeig.patch Patch45: 0001-status-volume-Hide-sliders-initially.patch +Patch46: 0001-kbdA11yDialog-Use-MetaKeyboardA11yFlags.patch %define eds_version 3.33.1 %define gnome_desktop_version 3.35.91 @@ -262,6 +263,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de %{_mandir}/man1/gnome-shell.1* %changelog +* Mon Jun 20 2022 Florian Müllner - 40.10-3 +- Fix keyboard a11y confirmation dialog + Resolves: #2047644 + * Wed May 11 2022 Florian Müllner - 40.10-2 - Hide volume sliders initially Related: #2052808