Update to 40.10

Resolves: #2066169

.gitignore

@@ -199,3 +199,4 @@ gnome-shell-2.31.5.tar.bz2
 /gnome-shell-40.7.tar.xz
 /gnome-shell-40.8.tar.xz
 /gnome-shell-40.9.tar.xz
+/gnome-shell-40.10.tar.xz

0001-Revert-dash-Subtract-vertical-margins-from-availHeig.patch

@@ -0,0 +1,25 @@
+From a8c8b7ef31f7219157b94148b771f6f663928dea Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Tue, 19 Apr 2022 19:17:48 +0200
+Subject: [PATCH] Revert "dash: Subtract vertical margins from availHeight"
+
+This reverts commit 0de0a1f5940784eb4a7ca9ecf5e92f5277ceb0d8.
+---
+ js/ui/dash.js | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/js/ui/dash.js b/js/ui/dash.js
+index f35cc2e25..0f1ca2c4c 100644
+--- a/js/ui/dash.js
++++ b/js/ui/dash.js
+@@ -610,7 +610,6 @@ var Dash = GObject.registerClass({
+                        (iconChildren.length - 1) * spacing;
+ 
+         let availHeight = this._maxHeight;
+-        availHeight -= this.margin_top + this.margin_bottom;
+         availHeight -= this._background.get_theme_node().get_vertical_padding();
+         availHeight -= themeNode.get_vertical_padding();
+         availHeight -= buttonHeight - iconHeight;
+-- 
+2.35.1
+

0001-workspaceAnimation-Fix-warning-on-restacking.patch

@@ -1,37 +0,0 @@
-From a8b8bff8a9d32b5c80dd2fdd1f7cbe7615835b76 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Tue, 22 Feb 2022 21:16:52 +0100
-Subject: [PATCH] workspaceAnimation: Fix warning on restacking
-
-Only workspace groups that are associated with a workspace have a
-background. As a result, when restacking window previews we end up
-passing `undefined` to clutter_actor_set_child_above_sibling()
-instead of null, triggering a warning.
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2209>
----
- js/ui/workspaceAnimation.js | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/js/ui/workspaceAnimation.js b/js/ui/workspaceAnimation.js
-index d240fe156..1731e4027 100644
---- a/js/ui/workspaceAnimation.js
-+++ b/js/ui/workspaceAnimation.js
-@@ -73,11 +73,13 @@ class WorkspaceGroup extends Clutter.Actor {
-             this._shouldShowWindow(w.meta_window));
- 
-         let lastRecord;
-+        const bottomActor = this._background ?? null;
- 
-         for (const windowActor of windowActors) {
-             const record = this._windowRecords.find(r => r.windowActor === windowActor);
- 
--            this.set_child_above_sibling(record.clone, lastRecord ? lastRecord.clone : this._background);
-+            this.set_child_above_sibling(record.clone,
-+                lastRecord ? lastRecord.clone : bottomActor);
-             lastRecord = record;
-         }
-     }
--- 
-2.35.1
-

gnome-shell.spec

@@ -1,8 +1,8 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:           gnome-shell
-Version:        40.9
-Release:        5%{?dist}
+Version:        40.10
+Release:        1%{?dist}
 Summary:        Window management and application launching for GNOME
 
 License:        GPLv2+
@@ -41,8 +41,8 @@ Patch39: 0001-status-network-Use-wwan-settings-panel-for-GSM-LTE-M.patch
 Patch40: 0001-welcomeDialog-Adapt-dialog-title.patch
 Patch41: 0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
 Patch42: fix-markup-in-highlighter.patch
-Patch43: 0001-workspaceAnimation-Fix-warning-on-restacking.patch
-Patch44: restrict-dbus-callers.patch
+Patch43: restrict-dbus-callers.patch
+Patch44: 0001-Revert-dash-Subtract-vertical-margins-from-availHeig.patch
 
 %define eds_version 3.33.1
 %define gnome_desktop_version 3.35.91
@@ -261,6 +261,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
 %{_mandir}/man1/gnome-shell.1*
 
 %changelog
+* Tue Apr 19 2022 Florian Müllner <fmuellner@redhat.com> - 40.10-1
+- Update to 40.10
+  Related: #2066169
+
 * Tue Apr 05 2022 Florian Müllner <fmuellner@redhat.com>- 40.9-5
 - Keep new ShimMetaContext type private
   Related: #2055366

sources

@@ -1 +1 @@
-SHA512 (gnome-shell-40.9.tar.xz) = 2f00b0f1627abd2344050bec9ec74fddf99b7a67c0be44b480d1d4ef6eb2f69cce9649f076ab2a359e21afab0bcded2db26a7cf1fb95ae22c7a32cd56cabae8b
+SHA512 (gnome-shell-40.10.tar.xz) = d53c51a8d60b2933531372160bf2d4088319686c7ccfa7aea2e8a3c1777c86772d70712228ec55d8907f7e3085f5f2b0fd6d0acdb62a67fc469c30e24ed6c1f7