Update to 40.4

Resolves: #1995095

.gitignore

@@ -147,3 +147,4 @@
 /gnome-shell-extensions-40.1.tar.xz
 /gnome-shell-extensions-40.2.tar.xz
 /gnome-shell-extensions-40.3.tar.xz
+/gnome-shell-extensions-40.4.tar.xz

backport-drive-menu-fix.patch

@@ -1,76 +0,0 @@
-From cc021589b848077811b592bbe2d23a60525a85bf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Tue, 13 Jul 2021 11:40:31 +0200
-Subject: [PATCH 1/2] drive-menu: Fix indicator visibility
-
-Commit 519269be9d made the check for network mounts non-blocking, and
-we now update the indicator's visibility before a newly-added network
-mount is hidden.
-
-Address this by monitoring the item itself for visibility changes.
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/176>
----
- extensions/drive-menu/extension.js | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js
-index 3fac2360..6c6fd763 100644
---- a/extensions/drive-menu/extension.js
-+++ b/extensions/drive-menu/extension.js
-@@ -189,6 +189,8 @@ class DriveMenu extends PanelMenu.Button {
-         let item = new MountMenuItem(mount);
-         this._mounts.unshift(item);
-         this.menu.addMenuItem(item, 0);
-+
-+        item.connect('notify::visible', () => this._updateMenuVisibility());
-     }
- 
-     _removeMount(mount) {
--- 
-2.31.1
-
-
-From 15c83db79379532b72df1989463fc102a90fdfc2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Tue, 13 Jul 2021 11:54:21 +0200
-Subject: [PATCH 2/2] drive-menu: Hide items initially
-
-Now that the check for network mounts is non-blocking, the initial
-sync doesn't take effect immediately. We don't want hidden items
-to briefly flash the indicator, so create them initially hidden.
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/176>
----
- extensions/drive-menu/extension.js | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js
-index 6c6fd763..f60dab75 100644
---- a/extensions/drive-menu/extension.js
-+++ b/extensions/drive-menu/extension.js
-@@ -41,6 +41,8 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
-         ejectButton.connect('clicked', this._eject.bind(this));
-         this.add(ejectButton);
- 
-+        this.hide();
-+
-         this._changedId = mount.connect('changed', this._syncVisibility.bind(this));
-         this._syncVisibility();
-     }
-@@ -155,10 +157,8 @@ class DriveMenu extends PanelMenu.Button {
-         this.add_child(icon);
- 
-         this._monitor = Gio.VolumeMonitor.get();
--        this._addedId = this._monitor.connect('mount-added', (monitor, mount) => {
--            this._addMount(mount);
--            this._updateMenuVisibility();
--        });
-+        this._addedId = this._monitor.connect('mount-added',
-+            (monitor, mount) => this._addMount(mount));
-         this._removedId = this._monitor.connect('mount-removed', (monitor, mount) => {
-             this._removeMount(mount);
-             this._updateMenuVisibility();
--- 
-2.31.1
-

gnome-shell-extensions.spec

@@ -6,8 +6,8 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:           gnome-shell-extensions
-Version:        40.3
+Version:        40.4
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Modify and extend GNOME Shell functionality and behavior
 
 License:        GPLv2+
@@ -29,7 +29,6 @@ Patch006: 0001-Include-top-icons-in-classic-session.patch
 Patch007: 0001-desktop-icons-Update-Japanese-translation.patch
 Patch008: desktop-icons-40-fixes.patch
 Patch009: 0001-top-icons-Don-t-use-wm_class-as-role.patch
-Patch010: backport-drive-menu-fix.patch
 
 %description
 GNOME Shell Extensions is a collection of extensions providing additional and
@@ -350,6 +349,10 @@ workspaces.
 
 
 %changelog
+* Mon Aug 23 2021 Florian Müllner <fmuellner@redhat.com> - 40.4-1
+- Update to 40.4
+  Resolves: #1995095
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 40.3-2
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688

sources

@@ -1 +1 @@
-SHA512 (gnome-shell-extensions-40.3.tar.xz) = 3773b0a5ec81b6663a3b2c5f5d1f8e7619fdba49ce67b25ee0f5555d17ea7c9740c3698b7a4e4f7fa78241c8738663c602cb5ed1ff9874b8ad2321fec0dbc737
+SHA512 (gnome-shell-extensions-40.4.tar.xz) = 79f087c9fbc7764241751441190819b3e768530257ffe3a7b39b1004f8997de9c8ea381338ec0544a39b8cc6866137d315e56f3f058c9b66a9ed566ec40712ef