From 766f7a9a1efe40713d5915a2779d2a84e435d19a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 9 Oct 2019 03:26:07 +0200 Subject: [PATCH] Update to 3.34.1 --- .gitignore | 1 + fix-disappearing-icons.patch | 90 ------------------- ...emove-NOTIFY_SOCKET-from-environment.patch | 32 ------- gnome-shell.spec | 13 ++- sources | 2 +- 5 files changed, 7 insertions(+), 131 deletions(-) delete mode 100644 fix-disappearing-icons.patch delete mode 100644 gnome-shell-main-Remove-NOTIFY_SOCKET-from-environment.patch diff --git a/.gitignore b/.gitignore index 1a3108f..4895016 100644 --- a/.gitignore +++ b/.gitignore @@ -165,3 +165,4 @@ gnome-shell-2.31.5.tar.bz2 /gnome-shell-3.33.91.tar.xz /gnome-shell-3.33.92.tar.xz /gnome-shell-3.34.0.tar.xz +/gnome-shell-3.34.1.tar.xz diff --git a/fix-disappearing-icons.patch b/fix-disappearing-icons.patch deleted file mode 100644 index c88db4e..0000000 --- a/fix-disappearing-icons.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 4915a9e8e404555379aa8807ad8c53c7589f2ae7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= -Date: Sun, 8 Sep 2019 18:09:23 +0200 -Subject: [PATCH 1/2] iconGrid: Delete private child property when removing - child - -Delete a private property we set when the child got added to make sure -the reference is deleted after the child got removed from the grid. - -https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/704 ---- - js/ui/iconGrid.js | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js -index e0a1e8bd8..08d72aff1 100644 ---- a/js/ui/iconGrid.js -+++ b/js/ui/iconGrid.js -@@ -251,6 +251,7 @@ var IconGrid = GObject.registerClass({ - - _childRemoved(grid, child) { - child.disconnect(child._iconGridKeyFocusInId); -+ delete child._iconGridKeyFocusInId; - } - - vfunc_get_preferred_width(_forHeight) { --- -2.23.0 - - -From 004a5e104256da8ec3a845e86c6a10b5c7998b24 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= -Date: Fri, 6 Sep 2019 11:50:52 +0200 -Subject: [PATCH 2/2] iconGrid: Queue a relayout after child opacity changes - -We're using a vfunc override for `get_paint_volume` to exclude children -with an opacity of 0 from the paint volume and thus decrease the size of -the area we need to paint. - -Now if the paint volume is requested during the spring animation (the -real icons are hidden using an opacity of 0 and clones are used for the -animation), `get_paint_volume` returns a paint volume with a height of -0. After that, the spring animation finishes and the icon-opacities are -set to 255 in `_resetAnimationActors`, and since we cache paint volumes -and there's no reason for Clutter to assume it got invalid, the icons -end up not being painted. - -Fix this by queuing a relayout of the grid when the opacity of a child -is changed from or to 0, which manually invalidates the paint volume. - -The reason why this is not an issue with the paginated icon grid -(all-apps view) is probably because StScrollView invalidates the paint -volume a lot more often than regular containers. - -Fixes https://gitlab.gnome.org/GNOME/gnome-shell/issues/1502 ---- - js/ui/iconGrid.js | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js -index 08d72aff1..1d22e821a 100644 ---- a/js/ui/iconGrid.js -+++ b/js/ui/iconGrid.js -@@ -247,11 +247,23 @@ var IconGrid = GObject.registerClass({ - - _childAdded(grid, child) { - child._iconGridKeyFocusInId = child.connect('key-focus-in', this._keyFocusIn.bind(this)); -+ -+ child._paintVisible = child.opacity > 0; -+ child._opacityChangedId = child.connect('notify::opacity', () => { -+ let paintVisible = child._paintVisible; -+ child._paintVisible = child.opacity > 0; -+ if (paintVisible !== child._paintVisible) -+ this.queue_relayout(); -+ }); - } - - _childRemoved(grid, child) { - child.disconnect(child._iconGridKeyFocusInId); - delete child._iconGridKeyFocusInId; -+ -+ child.disconnect(child._opacityChangedId); -+ delete child._opacityChangedId; -+ delete child._paintVisible; - } - - vfunc_get_preferred_width(_forHeight) { --- -2.23.0 - diff --git a/gnome-shell-main-Remove-NOTIFY_SOCKET-from-environment.patch b/gnome-shell-main-Remove-NOTIFY_SOCKET-from-environment.patch deleted file mode 100644 index e95e0fe..0000000 --- a/gnome-shell-main-Remove-NOTIFY_SOCKET-from-environment.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0fdbde9101ee5bfe87344cbb2ee43dad32a7f7a6 Mon Sep 17 00:00:00 2001 -From: Benjamin Berg -Date: Mon, 23 Sep 2019 11:04:18 +0200 -Subject: [PATCH] main: Remove NOTIFY_SOCKET from environment - -It is only used exactly once to notify systemd about the service -startup. So unset it as soon as possible as it can leak into -subprocesses we spawn otherwise. - -https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/741 ---- - src/main.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/main.c b/src/main.c -index 8be1395f7099..489026b76573 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -532,7 +532,9 @@ main (int argc, char **argv) - shell_init_debug (g_getenv ("SHELL_DEBUG")); - - shell_dbus_init (meta_get_replace_current_wm ()); -- sd_notify (0, "READY=1"); -+ /* We only use NOTIFY_SOCKET exactly once; unset it so it doesn't remain in -+ * our environment. */ -+ sd_notify (1, "READY=1"); - shell_a11y_init (); - shell_perf_log_init (); - shell_introspection_init (); --- -2.20.1 - diff --git a/gnome-shell.spec b/gnome-shell.spec index b6e3218..8c4d092 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,6 +1,6 @@ Name: gnome-shell -Version: 3.34.0 -Release: 3%{?dist} +Version: 3.34.1 +Release: 1%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ @@ -17,12 +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://bugzilla.redhat.com/show_bug.cgi?id=1753337 -Patch4: fix-disappearing-icons.patch - -# https://bugzilla.redhat.com/show_bug.cgi?id=1753328 -Patch5: gnome-shell-main-Remove-NOTIFY_SOCKET-from-environment.patch - %define libcroco_version 0.6.8 %define eds_version 3.33.1 %define gnome_desktop_version 3.33.4 @@ -217,6 +211,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de %{_mandir}/man1/gnome-shell.1* %changelog +* Wed Oct 09 2019 Florian Müllner - 3.34.1-1 +- Update to 3.34.1 + * Tue Sep 24 2019 Debarshi Ray - 3.34.0-3 - Stop NOTIFY_SOCKET from leaking into the GNOME environment diff --git a/sources b/sources index 7d359d6..cc18dfe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-shell-3.34.0.tar.xz) = 581b64260bef7f730262deba2f3d2c082c705dfdb68b85a1df184e39170e987776d590319488f7599015f14861b58a0c407a4afd7f9cb7f577c0830ac0373631 +SHA512 (gnome-shell-3.34.1.tar.xz) = 66adc3223394ce7e32b153e7243236b0c68e4c394627247e6eba2c31b5ff0bc0c33718c0d8111dffb986abb958391ebe2c5a4930a6da4c1c2c03a64d60cfdbba