Update to 3.35.92

This commit is contained in:
Florian Müllner 2020-03-01 01:39:15 +01:00
parent 888c715e72
commit dfd888df46
5 changed files with 7 additions and 94 deletions

1
.gitignore vendored
View File

@ -171,3 +171,4 @@ gnome-shell-2.31.5.tar.bz2
/gnome-shell-3.35.3.tar.xz
/gnome-shell-3.35.90.tar.xz
/gnome-shell-3.35.91.tar.xz
/gnome-shell-3.35.92.tar.xz

View File

@ -1,29 +0,0 @@
From 496b43f59928266822e465a7c086ba38a1da1bc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Mon, 7 Oct 2019 15:00:19 +0200
Subject: [PATCH 1/2] magnifier: Use own showSystemCursor() instead of
set_pointer_visible()
We already have our own function to show the system cursor, use it!
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/754
---
js/ui/magnifier.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/js/ui/magnifier.js b/js/ui/magnifier.js
index d7d3506a5..e9fa4c5d0 100644
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -169,7 +169,7 @@ var Magnifier = class Magnifier {
// Make sure system mouse pointer is shown when all zoom regions are
// invisible.
if (!activate)
- this._cursorTracker.set_pointer_visible(true);
+ this.showSystemCursor();
// Notify interested parties of this change
this.emit('active-changed', activate);
--
2.24.1

View File

@ -1,54 +0,0 @@
From 39fe94ecf3221d60c0a1197e2aaaf904ee99fdb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Mon, 7 Oct 2019 15:02:17 +0200
Subject: [PATCH 2/2] magnifier: Use new cursor tracker API to keep wayland
focus while hidden
Since commit a2a8f0cda we force the focus surface of the
meta-wayland-pointer to NULL while the pointer is hidden. This
introduced an issue with the magnifier, where we use
`set_pointer_visible` to hide the real cursor and show our own cursor at
the correct position: Because the meta-wayland-pointer is still used to
communicate with Wayland clients, the UI of the windows will not respond
to mouse movement anymore as soon as the real cursor is hidden.
To fix this, use the newly added API of MetaCursorTracker to switch back
to the old behavior while the magnifier is hiding the system cursor.
In the future and as a more correct fix, we might want to rewrite the
magnifier so it doesn't have to hide the cursor and can simply show the
default one (eg. by scaling the actual view instead of a clone of the
view).
Fixes https://gitlab.gnome.org/GNOME/mutter/issues/826
Depends on https://gitlab.gnome.org/GNOME/mutter/merge_requests/832
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/754
---
js/ui/magnifier.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/js/ui/magnifier.js b/js/ui/magnifier.js
index e9fa4c5d0..49fb321d3 100644
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -127,6 +127,7 @@ var Magnifier = class Magnifier {
* Show the system mouse pointer.
*/
showSystemCursor() {
+ this._cursorTracker.set_keep_focus_while_hidden(false);
this._cursorTracker.set_pointer_visible(true);
}
@@ -135,6 +136,7 @@ var Magnifier = class Magnifier {
* Hide the system mouse pointer.
*/
hideSystemCursor() {
+ this._cursorTracker.set_keep_focus_while_hidden(true);
this._cursorTracker.set_pointer_visible(false);
}
--
2.24.1

View File

@ -1,5 +1,5 @@
Name: gnome-shell
Version: 3.35.91
Version: 3.35.92
Release: 1%{?dist}
Summary: Window management and application launching for GNOME
@ -17,14 +17,6 @@ Patch1: gnome-shell-favourite-apps-firefox.patch
Patch2: 0001-endSessionDialog-Immediately-add-buttons-to-the-dial.patch
Patch3: 0002-endSessionDialog-Support-rebooting-into-the-bootload.patch
# https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/754
# Fixes accessibility cursor zoom bug:
# https://bugzilla.redhat.com/show_bug.cgi?id=1749433
# https://gitlab.gnome.org/GNOME/mutter/issues/826
# Depends on a corresponding patch in mutter 3.34.1-2+
Patch4: 0001-magnifier-Use-own-showSystemCursor-instead-of-set_po.patch
Patch5: 0002-magnifier-Use-new-cursor-tracker-API-to-keep-wayland.patch
%define libcroco_version 0.6.8
%define eds_version 3.33.1
%define gnome_desktop_version 3.33.4
@ -32,7 +24,7 @@ Patch5: 0002-magnifier-Use-new-cursor-tracker-API-to-keep-wayland.patch
%define gobject_introspection_version 1.49.1
%define gjs_version 1.57.3
%define gtk3_version 3.15.0
%define mutter_version 3.35.91
%define mutter_version 3.35.92
%define polkit_version 0.100
%define gsettings_desktop_schemas_version 3.33.1
%define ibus_version 1.5.2
@ -224,6 +216,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
%{_mandir}/man1/gnome-shell.1*
%changelog
* Sun Mar 01 2020 Florian Müllner <fmuellner@redhat.com> - 3.35.92-1
- Update to 3.35.92
* Tue Feb 18 2020 Florian Müllner <fmuellner@redhat.com> - 3.35.91-1
- Update to 3.35.91

View File

@ -1 +1 @@
SHA512 (gnome-shell-3.35.91.tar.xz) = 89e7deba088dfb5377151a311dd2b677102617316791c6d20dc7a4ef07b816b2be9ed35a4bed26dad6fab6c64fc07666d25978681f21f257785beaac9afe0ad1
SHA512 (gnome-shell-3.35.92.tar.xz) = 8d1d3e91d7fd9bc711baadd3e0068db6406d88bc8eb5e2c7fd86345f11ca2994550a63b502212174d47b97bb3cc3a0ce8db03c70106b92eb8bc897a3974b204c