From adb70854cc16bceeb39db64ae48e7491ed26b383 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 6 Mar 2024 03:37:19 +0300 Subject: [PATCH] import gnome-shell-extensions-40.7-9.el9_3 --- ...king-Only-remove-spacer-if-necessary.patch | 29 +++++++++++++++++++ SPECS/gnome-shell-extensions.spec | 7 ++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0001-docking-Only-remove-spacer-if-necessary.patch diff --git a/SOURCES/0001-docking-Only-remove-spacer-if-necessary.patch b/SOURCES/0001-docking-Only-remove-spacer-if-necessary.patch new file mode 100644 index 0000000..35c23f2 --- /dev/null +++ b/SOURCES/0001-docking-Only-remove-spacer-if-necessary.patch @@ -0,0 +1,29 @@ +From 3edf3c0be7638bf9161c0d192dd3c2de1e3b9845 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Thu, 14 Dec 2023 14:41:04 +0100 +Subject: [PATCH] docking: Only remove spacer if necessary + +There may not be a main dock at the time when restoring the dash. + +Handle that case by not removing a non-existent spacer, instead of +triggering an error. +--- + extensions/dash-to-dock/docking.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/extensions/dash-to-dock/docking.js b/extensions/dash-to-dock/docking.js +index daa9de59..14e2ced6 100644 +--- a/extensions/dash-to-dock/docking.js ++++ b/extensions/dash-to-dock/docking.js +@@ -1796,7 +1796,7 @@ var DockManager = class DashToDock_DockManager { + + let overviewControls = Main.overview._overview._controls; + Main.overview._overview._controls.layout_manager._dash = this._oldDash; +- if (this.mainDock._dashSpacer) { ++ if (this.mainDock?._dashSpacer) { + Main.overview._overview._controls.remove_child(this.mainDock._dashSpacer); + } + +-- +2.43.0 + diff --git a/SPECS/gnome-shell-extensions.spec b/SPECS/gnome-shell-extensions.spec index 40d4ff7..b59a6f1 100644 --- a/SPECS/gnome-shell-extensions.spec +++ b/SPECS/gnome-shell-extensions.spec @@ -7,7 +7,7 @@ Name: gnome-shell-extensions Version: 40.7 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Modify and extend GNOME Shell functionality and behavior License: GPLv2+ @@ -40,6 +40,7 @@ Patch017: 0001-desktopManager-Hook-into-LayoutManager-to-create-gri.patch Patch018: 0001-gesture-inhibitor-Allow-inhibiting-workspace-switch-.patch Patch019: 0001-desktop-icons-Don-t-use-blocking-IO.patch Patch020: 0001-window-list-Explicitly-dispose-settings-on-destroy.patch +Patch022: 0001-docking-Only-remove-spacer-if-necessary.patch %description GNOME Shell Extensions is a collection of extensions providing additional and @@ -428,6 +429,10 @@ workspaces. %changelog +* Wed Jan 17 2024 Florian Müllner - 40.7-9 +- Handle missing main dock when restoring dash + Resolves: RHEL-21873 + * Thu Aug 17 2023 Florian Müllner - 40.7-8 - Rebuild for custom context menu Resolves: #2232332