Fix monitor config switches with <super>p

Resolves #2073406

0001-switchMonitor-Fix-switching-configuration.patch

@@ -0,0 +1,70 @@
+From 6c44162c17033fa8cbd2bcd58be9b2d3bb9a714a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Sat, 19 Mar 2022 16:53:59 +0100
+Subject: [PATCH] switchMonitor: Fix switching configuration
+
+Since commit 37271ffe709fc957, we pass an explicit `switchType` instead
+of the selected item's index to select a configuration. Alas, the item
+use `switchMode` as property name, so we always end up passing `undefined`.
+
+Change both to `configType` which matches the API on the other end.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5217
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2245>
+---
+ js/ui/switchMonitor.js | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/js/ui/switchMonitor.js b/js/ui/switchMonitor.js
+index 733858218..10b4a50cd 100644
+--- a/js/ui/switchMonitor.js
++++ b/js/ui/switchMonitor.js
+@@ -18,7 +18,7 @@ class SwitchMonitorPopup extends SwitcherPopup.SwitcherPopup {
+              * Try to keep it under around 15 characters.
+              */
+             label: _('Mirror'),
+-            switchMode: Meta.MonitorSwitchConfigType.ALL_MIRROR,
++            configType: Meta.MonitorSwitchConfigType.ALL_MIRROR,
+         });
+ 
+         items.push({
+@@ -27,7 +27,7 @@ class SwitchMonitorPopup extends SwitcherPopup.SwitcherPopup {
+              * Try to keep it under around 15 characters.
+              */
+             label: _('Join Displays'),
+-            switchMode: Meta.MonitorSwitchConfigType.ALL_LINEAR,
++            configType: Meta.MonitorSwitchConfigType.ALL_LINEAR,
+         });
+ 
+         if (global.backend.get_monitor_manager().has_builtin_panel) {
+@@ -37,7 +37,7 @@ class SwitchMonitorPopup extends SwitcherPopup.SwitcherPopup {
+                  * Try to keep it under around 15 characters.
+                  */
+                 label: _('External Only'),
+-                switchMode: Meta.MonitorSwitchConfigType.EXTERNAL,
++                configType: Meta.MonitorSwitchConfigType.EXTERNAL,
+             });
+             items.push({
+                 icon: 'computer-symbolic',
+@@ -45,7 +45,7 @@ class SwitchMonitorPopup extends SwitcherPopup.SwitcherPopup {
+                  * Try to keep it under around 15 characters.
+                  */
+                 label: _('Built-in Only'),
+-                switchMode: Meta.MonitorSwitchConfigType.BUILTIN,
++                configType: Meta.MonitorSwitchConfigType.BUILTIN,
+             });
+         }
+ 
+@@ -86,7 +86,7 @@ class SwitchMonitorPopup extends SwitcherPopup.SwitcherPopup {
+         const monitorManager = global.backend.get_monitor_manager();
+         const item = this._items[this._selectedIndex];
+ 
+-        monitorManager.switch_config(item.switchType);
++        monitorManager.switch_config(item.configType);
+     }
+ });
+ 
+-- 
+2.35.1
+

gnome-shell.spec

@@ -2,7 +2,7 @@
 
 Name:           gnome-shell
 Version:        42.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Window management and application launching for GNOME
 
 License:        GPLv2+
@@ -24,6 +24,10 @@ Patch60003: 0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=2064473
 Patch80001: 0001-Avoid-double-slash-in-path-when-creating-default-fol.patch
 
+# Fix <super>p handling
+# https://bugzilla.redhat.com/show_bug.cgi?id=2073406
+Patch80002: 0001-switchMonitor-Fix-switching-configuration.patch
+
 %define eds_version 3.33.1
 %define gnome_desktop_version 3.35.91
 %define glib2_version 2.56.0
@@ -237,6 +241,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
 %{_mandir}/man1/gnome-shell.1*
 
 %changelog
+* Mon Apr 18 2022 Florian Müllner <fmuellner@redhat.com> - 42.0-3
+- Fix monitor config switches with <super>p (#2073406)
+
 * Tue Mar 15 2022 Adam Williamson <awilliam@redhat.com> - 42.0-2
 - Backport MR #2242 to fix new user default folder creation (#2064473)