From f55b0c81b9a3b3160c41ce45e5ec5b437d317d68 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 21 Nov 2022 09:39:51 -0800 Subject: [PATCH] Backport MR #2548 to fix keyboard shortcut inhibiting --- ...tShorcutsDialog-Fix-permission-check.patch | 31 +++++++++++++++++++ gnome-shell.spec | 11 ++++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0001-inhibitShorcutsDialog-Fix-permission-check.patch diff --git a/0001-inhibitShorcutsDialog-Fix-permission-check.patch b/0001-inhibitShorcutsDialog-Fix-permission-check.patch new file mode 100644 index 0000000..c295161 --- /dev/null +++ b/0001-inhibitShorcutsDialog-Fix-permission-check.patch @@ -0,0 +1,31 @@ +From b0befbbfbbe4a335f6c184049743202e91fcdfe8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Fri, 18 Nov 2022 22:40:31 +0100 +Subject: [PATCH] inhibitShorcutsDialog: Fix permission check + +Each permission entry is an array of strings, so checking that against +the expected string itself will always fail. + +https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6107 + +Part-of: +--- + js/ui/inhibitShortcutsDialog.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/ui/inhibitShortcutsDialog.js b/js/ui/inhibitShortcutsDialog.js +index b6f1330b2..7c3d15996 100644 +--- a/js/ui/inhibitShortcutsDialog.js ++++ b/js/ui/inhibitShortcutsDialog.js +@@ -143,7 +143,7 @@ var InhibitShortcutsDialog = GObject.registerClass({ + + if (permissions[appId] === undefined) // Not found + this._dialog.open(); +- else if (permissions[appId] === GRANTED) ++ else if (permissions[appId][0] === GRANTED) + this._emitResponse(DialogResponse.ALLOW); + else + this._emitResponse(DialogResponse.DENY); +-- +2.37.3 + diff --git a/gnome-shell.spec b/gnome-shell.spec index a025020..67f908e 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -2,7 +2,7 @@ Name: gnome-shell Version: 43.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ @@ -18,6 +18,12 @@ Patch1: 2534.patch # https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2533 Patch2: post-43.1-fixes.patch +# Backport fix for keyboard shortcut inhibit permissions +# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6107 +# https://gitlab.gnome.org/GNOME/gnome-boxes/-/issues/872 +# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2548 +Patch3: 0001-inhibitShorcutsDialog-Fix-permission-check.patch + # Replace Epiphany with Firefox in the default favourite apps list Patch10001: gnome-shell-favourite-apps-firefox.patch @@ -240,6 +246,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de %{_mandir}/man1/gnome-shell.1* %changelog +* Mon Nov 21 2022 Adam Williamson - 43.1-4 +- Backport MR #2548 to fix keyboard shortcut inhibiting + * Thu Nov 17 2022 Jonas Ådahl - 43.1-3 - Backport missing screencast if gstreamer1-vaapi is installed