Update to 40.beta

.gitignore

@@ -187,3 +187,4 @@ gnome-shell-2.31.5.tar.bz2
 /gnome-shell-40.alpha.1.1.tar.xz
 /gnome-shell-40.alpha.1.1-94-g9ce666ac1.tar.xz
 /gnome-shell-40.alpha.1.1-228-g829a096ba.tar.xz
+/gnome-shell-40.beta.tar.xz

0001-overviewControls-Everything-is-lava.patch

@@ -1,108 +0,0 @@
-From 6817bec35d2036e8f56a0a4c94843b5fd7b4984f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Thu, 11 Feb 2021 18:10:56 +0100
-Subject: [PATCH 1/2] overviewControls: Everything is lava!
-
-Account for the increased distance from Activities button to the
-show-apps button by allowing clicks on the background to bring up
-the app grid.
----
- js/ui/overviewControls.js | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js
-index 32388621e..cd394e56a 100644
---- a/js/ui/overviewControls.js
-+++ b/js/ui/overviewControls.js
-@@ -247,6 +247,7 @@ class ControlsManager extends St.Widget {
-             style_class: 'controls-manager',
-             x_expand: true,
-             y_expand: true,
-+            reactive: true,
-             clip_to_allocation: true,
-         });
- 
-@@ -321,6 +322,14 @@ class ControlsManager extends St.Widget {
-         this.dash.showAppsButton.connect('notify::checked',
-             this._onShowAppsButtonToggled.bind(this));
- 
-+        const clickAction = new Clutter.ClickAction();
-+        clickAction.connect('clicked', () => {
-+            const button = clickAction.get_button();
-+            if (button === 0 || button === 1)
-+                this.dash.showAppsButton.checked = true;
-+        });
-+        this.add_action(clickAction);
-+
-         Main.ctrlAltTabManager.addGroup(
-             this.appDisplay,
-             _('Applications'),
--- 
-2.29.2
-
-
-From 20a31bd0d726fd7e0f7bcf6636ce6a9a453cb0f7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Sun, 14 Feb 2021 19:24:52 +0100
-Subject: [PATCH 2/2] workspaceThumbnail: Always consume button/touch events on
- thumbnails
-
-Now that the background is reactive and opens the app grid, we have to
-be more careful when consuming or propagating events: Thumbnails must
-consume events, non-thumbnail parts should let them through.
----
- js/ui/workspaceThumbnail.js | 28 ++++++++++++++++++----------
- 1 file changed, 18 insertions(+), 10 deletions(-)
-
-diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
-index 40a33fe3a..6489a7eca 100644
---- a/js/ui/workspaceThumbnail.js
-+++ b/js/ui/workspaceThumbnail.js
-@@ -708,26 +708,34 @@ var ThumbnailsBox = GObject.registerClass({
-                 workspaceManager.n_workspaces > 1;
-     }
- 
--    _activateThumbnailAtPoint(stageX, stageY, time) {
-+    _findThumbnailAtPoint(stageX, stageY) {
-         const [r_, x] = this.transform_stage_point(stageX, stageY);
-+        return this._thumbnails.find(t => x >= t.x && x <= t.x + t.width);
-+    }
- 
--        const thumbnail = this._thumbnails.find(t => x >= t.x && x <= t.x + t.width);
--        if (thumbnail)
--            thumbnail.activate(time);
-+    vfunc_button_press_event(buttonEvent) {
-+        const { x, y } = buttonEvent;
-+        return this._findThumbnailAtPoint(x, y)
-+            ? Clutter.EVENT_STOP : Clutter.EVENT_PROPAGATE;
-     }
- 
-     vfunc_button_release_event(buttonEvent) {
--        let { x, y } = buttonEvent;
--        this._activateThumbnailAtPoint(x, y, buttonEvent.time);
-+        const { x, y } = buttonEvent;
-+        const thumbnail = this._findThumbnailAtPoint(x, y);
-+        if (!thumbnail)
-+            return Clutter.EVENT_PROPAGATE;
-+        thumbnail.activate(buttonEvent.time);
-         return Clutter.EVENT_STOP;
-     }
- 
-     vfunc_touch_event(touchEvent) {
-+        const { x, y } = touchEvent;
-+        const thumbnail = this._findThumbnailAtPoint(x, y);
-+        if (!thumbnail)
-+            return Clutter.EVENT_PROPAGATE;
-         if (touchEvent.type == Clutter.EventType.TOUCH_END &&
--            global.display.is_pointer_emulating_sequence(touchEvent.sequence)) {
--            let { x, y } = touchEvent;
--            this._activateThumbnailAtPoint(x, y, touchEvent.time);
--        }
-+            global.display.is_pointer_emulating_sequence(touchEvent.sequence))
-+            thumbnail.activate(touchEvent.time);
- 
-         return Clutter.EVENT_STOP;
-     }
--- 
-2.29.2
-

gnome-shell.spec

@@ -1,17 +1,15 @@
 Name:           gnome-shell
-Version:        40.0~alpha.1.1
+Version:        40.0~beta
-Release:        9.20210212git829a096ba%{?dist}
+Release:        1%{?dist}
 Summary:        Window management and application launching for GNOME
 
 License:        GPLv2+
 URL:            https://wiki.gnome.org/Projects/GnomeShell
-Source0: http://download.gnome.org/sources/gnome-shell/40/%{name}-40.alpha.1.1-228-g829a096ba.tar.xz
+Source0: http://download.gnome.org/sources/gnome-shell/40/%{name}-40.beta.tar.xz
 
 # Replace Epiphany with Firefox in the default favourite apps list
 Patch1: gnome-shell-favourite-apps-firefox.patch
 
-Patch2: 0001-overviewControls-Everything-is-lava.patch
-
 %define eds_version 3.33.1
 %define gnome_desktop_version 3.35.91
 %define glib2_version 2.56.0
@@ -225,6 +223,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
 %{_mandir}/man1/gnome-shell.1*
 
 %changelog
+* Tue Feb 23 2021 Florian Müllner <fmuellner@redhat.com> - 40.0~beta-1
+- Update to 40.beta
+
 * Mon Feb 22 2021 Kalev Lember <klember@redhat.com> - 40.0~alpha.1.1-9.20210212git829a096ba
 - Add missing requires on gstreamer1-plugins-good and xdg-user-dirs-gtk (#1931342)
 

sources

@@ -1 +1 @@
-SHA512 (gnome-shell-40.alpha.1.1-228-g829a096ba.tar.xz) = 2b20b764a4ed1791bec501dd5dc63302a84b2258a8318019d136a9bd2468d44adde3d58d7138c36131fa4519f90e57f3b6c89d34df6ef086dd20a7c055e42d00
+SHA512 (gnome-shell-40.beta.tar.xz) = 6f673c429d0b1b26979de72f945ab5cb47023a28d63b55fbc30d807aeace7389212dc0100aed4ff95300853598d08fda7a82c9da14ae8190619c04dd9ad95c50