From 3b8993181763fe28647d8166b288e999e71a7b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sat, 17 Sep 2022 20:09:19 +0200 Subject: [PATCH] Update to 43.0 --- .gitignore | 1 + 2472.patch | 30 ------------------------------ 2487.patch | 36 ------------------------------------ gnome-shell.spec | 17 +++++------------ sources | 2 +- 5 files changed, 7 insertions(+), 79 deletions(-) delete mode 100644 2472.patch delete mode 100644 2487.patch diff --git a/.gitignore b/.gitignore index 61fabdc..2469123 100644 --- a/.gitignore +++ b/.gitignore @@ -207,3 +207,4 @@ gnome-shell-2.31.5.tar.bz2 /gnome-shell-43.alpha.tar.xz /gnome-shell-43.beta.tar.xz /gnome-shell-43.rc.tar.xz +/gnome-shell-43.0.tar.xz diff --git a/2472.patch b/2472.patch deleted file mode 100644 index 99f6e57..0000000 --- a/2472.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6866af94832d55ca79162a6ccafdd00fc897bf41 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Tue, 6 Sep 2022 16:37:25 +0200 -Subject: [PATCH] loginManager: Fix canRebootToBootLoaderMenu() result - -Since commit a3db9093834, the `result` variable holds the -destructured result of the D-Bus call, not the results array -as previously. ---- - js/misc/loginManager.js | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/js/misc/loginManager.js b/js/misc/loginManager.js -index 6549fe5adc..94d62e8192 100644 ---- a/js/misc/loginManager.js -+++ b/js/misc/loginManager.js -@@ -164,8 +164,8 @@ var LoginManagerSystemd = class extends Signals.EventEmitter { - - try { - const [result] = await this._proxy.CanRebootToBootLoaderMenuAsync(); -- needsAuth = result[0] === 'challenge'; -- canRebootToBootLoaderMenu = needsAuth || result[0] === 'yes'; -+ needsAuth = result === 'challenge'; -+ canRebootToBootLoaderMenu = needsAuth || result === 'yes'; - } catch (error) { - canRebootToBootLoaderMenu = false; - needsAuth = false; --- -GitLab - diff --git a/2487.patch b/2487.patch deleted file mode 100644 index 85fb95d..0000000 --- a/2487.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 5e3353ef22f84d3f61d494e3171f5d4295308a6c Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho -Date: Wed, 14 Sep 2022 20:20:14 +0200 -Subject: [PATCH] status: Use fixed sorting of input sources on empty MRU - -When updating the MRU sources if there was no prior MRU, we want -to go with the unmodified list of sources in visibility order. - -However iterating over object properties happens in an undetermined -order, so the initial MRU list ends up picking a value at random. - -In order to prefer the sources list in the same order than they -appear in the menu if there was no prior MRU, order the keys -when accessing it and building the initial list of sources. - -Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5873 ---- - js/ui/status/keyboard.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js -index 76a42f6bd7..65b3962731 100644 ---- a/js/ui/status/keyboard.js -+++ b/js/ui/status/keyboard.js -@@ -492,7 +492,7 @@ var InputSourceManager = class extends Signals.EventEmitter { - - _updateMruSources() { - let sourcesList = []; -- for (let i in this._inputSources) -+ for (let i of Object.keys(this._inputSources).sort((a, b) => a - b)) - sourcesList.push(this._inputSources[i]); - - this._keyboardManager.setUserLayouts(sourcesList.map(x => x.xkbId)); --- -GitLab - diff --git a/gnome-shell.spec b/gnome-shell.spec index 84fbf7a..c14bd39 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,24 +1,14 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-shell -Version: 43~rc -Release: 3%{?dist} +Version: 43.0 +Release: 1%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ URL: https://wiki.gnome.org/Projects/GnomeShell Source0: https://download.gnome.org/sources/gnome-shell/43/%{name}-%{tarball_version}.tar.xz -# Backported from upstream -# https://bugzilla.redhat.com/show_bug.cgi?id=2124043 -# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2472 -Patch0: 2472.patch - -# Backported from upstream -# https://bugzilla.redhat.com/show_bug.cgi?id=2121110 -# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2487 -Patch1: 2487.patch - # Replace Epiphany with Firefox in the default favourite apps list Patch10001: gnome-shell-favourite-apps-firefox.patch @@ -241,6 +231,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de %{_mandir}/man1/gnome-shell.1* %changelog +* Sat Sep 17 2022 Florian Müllner - 43.0-1 +- Update to 43.0 + * Thu Sep 15 2022 Kalev Lember - 43~rc-3 - Backport a fix for initial setup session input sources sorting (#2121110) diff --git a/sources b/sources index b222087..48c64d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-shell-43.rc.tar.xz) = 7f5c6dc7fbe2a61c671025f39e8e22d0a95b3b7474c575318425017a9031b561b9fcfcd6a04c67ae8ab289cd5cb642d8b38f708d5b493f98d37ea0bcdf5a5dd7 +SHA512 (gnome-shell-43.0.tar.xz) = 6f3609c8bac923f052d51fce44a448dba997cac543331b56229f46b56e8770de9370deb7759d4bf0e7385794232715b9b34e41f90dd1da30e88d5cfbf3f095eb