rpms/gnome-shell
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 44.1

Browse Source
This commit is contained in:
Florian Müllner 2023-04-25 10:15:34 +02:00
parent 391d4fff50
commit f445bccc48
6 changed files with 3 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -212,3 +212,4 @@ gnome-shell-2.31.5.tar.bz2
/gnome-shell-44.beta.tar.xz
/gnome-shell-44.rc.tar.xz
/gnome-shell-44.0.tar.xz
/gnome-shell-44.1.tar.xz

33
0001-screenshot-Fix-code-typo.patch
View File

@ -1,33 +0,0 @@
From 58af42caeaf8ef51f62aa22880c04638f21d5e06 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Mon, 13 Mar 2023 10:54:33 +0100
Subject: [PATCH] screenshot: Fix code typo
Even though commit b89d90eb8 talked about the GLib.BookmarkFile
type, this didn't stop the code from sneaking a silly typo and
refer to this GLib.BookmarksFile (i.e. extra 's').
Fix the code to refer to the right type name and constructor.
Fixes: b89d90eb8 ("screenshot: Use GLib.BookmarkFile to save recent screenshots")
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2692>
---
js/ui/screenshot.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/js/ui/screenshot.js b/js/ui/screenshot.js
index 48ca1ae76..fd84a74f8 100644
--- a/js/ui/screenshot.js
+++ b/js/ui/screenshot.js
@@ -2076,7 +2076,7 @@ function _storeScreenshot(bytes, pixbuf) {
const recentFile =
GLib.build_filenamev([GLib.get_user_data_dir(), 'recently-used.xbel']);
const uri = screenshotFile.get_uri();
- const bookmarks = new GLib.BookmarksFile();
+ const bookmarks = new GLib.BookmarkFile();
try {
bookmarks.load_from_file(recentFile);
} catch (e) {
--
2.40.0

29
0001-screenshot-fix-broken-GLib.Error.matches-call.patch
View File

@ -1,29 +0,0 @@
From ea55693f23889796d470433e6c7b198a3d6ccbe5 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Sat, 25 Mar 2023 09:19:41 -0700
Subject: [PATCH] screenshot: fix broken GLib.Error.matches call
You have to pass a domain and an error code, not just an error
code.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
js/ui/screenshot.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/js/ui/screenshot.js b/js/ui/screenshot.js
index ecbe50bcc..d25744e87 100644
--- a/js/ui/screenshot.js
+++ b/js/ui/screenshot.js
@@ -2084,7 +2084,7 @@ function _storeScreenshot(bytes, pixbuf) {
try {
bookmarks.load_from_file(recentFile);
} catch (e) {
- if (!e.matches(GLib.BookmarkFileError.FILE_NOT_FOUND)) {
+ if (!e.matches(GLib.BookmarkFileError, GLib.BookmarkFileError.FILE_NOT_FOUND)) {
log(`Could not open recent file ${uri}: ${e.message}`);
return;
}
--
2.40.0

101
fix-timed-logout.patch
View File

@ -1,101 +0,0 @@
From 34712449da3f1d897ae07fc85c0234eb3a02da5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 15 Mar 2023 20:11:39 +0100
Subject: [PATCH 1/2] endSessionDialog: Catch async errors
Otherwise the actual error is masked by an "unhandled promise
rejection" error, making it harder to track down the underlying
cause.
https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6506
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2696>
---
js/ui/endSessionDialog.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index 66fc2e6f94..3de1085ab0 100644
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -235,7 +235,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
this._loginManager = LoginManager.getLoginManager();
this._canRebootToBootLoaderMenu = false;
- this._getCanRebootToBootLoaderMenu();
+ this._getCanRebootToBootLoaderMenu().catch(logError);
this._userManager = AccountsService.UserManager.get_default();
this._user = this._userManager.get_user(GLib.get_user_name());
@@ -449,7 +449,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
action: () => {
let signalId = this.connect('closed', () => {
this.disconnect(signalId);
- this._confirm(signal);
+ this._confirm(signal).catch(logError);
});
this.close(true);
},
@@ -501,7 +501,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
_confirmRebootToBootLoaderMenu() {
this._loginManager.setRebootToBootLoaderMenu();
- this._confirm('ConfirmedReboot');
+ this._confirm('ConfirmedReboot').catch(logError);
}
async _confirm(signal) {
@@ -589,7 +589,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
let dialogContent = DialogContent[this._type];
let button = dialogContent.confirmButtons[dialogContent.confirmButtons.length - 1];
- this._confirm(button.signal);
+ this._confirm(button.signal).catch(logError);
this._timerId = 0;
return GLib.SOURCE_REMOVE;
@@ -759,7 +759,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
}
if (dialogContent.showOtherSessions)
- this._loadSessions();
+ this._loadSessions().catch(logError);
let updatesAllowed = this._updatesPermission && this._updatesPermission.allowed;
--
2.39.2
From 5766d4111ac065b37417bedcc1b998ab6bee5514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 15 Mar 2023 20:41:48 +0100
Subject: [PATCH 2/2] modalDialog: Fix fading out dialog
The dialog's state property has been read-only since
commit 2f6323afc, but the callback at the end of the
fade transition still tries to set the value directly.
https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6506
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2696>
---
js/ui/modalDialog.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js
index 64800a376d..0561b8b155 100644
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -282,7 +282,7 @@ var ModalDialog = GObject.registerClass({
opacity: 0,
duration: FADE_OUT_DIALOG_TIME,
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
- onComplete: () => (this.state = State.FADED_OUT),
+ onComplete: () => this._setState(State.FADED_OUT),
});
}
});
--
2.39.2

12
gnome-shell.spec
View File

@ -1,7 +1,7 @@
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: gnome-shell
Version: 44.0
Version: 44.1
Release: %autorelease
Summary: Window management and application launching for GNOME
@ -9,14 +9,6 @@ License: GPLv2+
URL: https://wiki.gnome.org/Projects/GnomeShell
Source0: https://download.gnome.org/sources/gnome-shell/44/%{name}-%{tarball_version}.tar.xz
# https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/58af42caeaf8ef51f62aa22880c04638f21d5e06
# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6539
# Fix a typo that broke screenshot notifications
Patch0: 0001-screenshot-Fix-code-typo.patch
# Fix a wrong call to GLib.Error.matches that also breaks them
# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2725
Patch1: 0001-screenshot-fix-broken-GLib.Error.matches-call.patch
# Replace Epiphany with Firefox in the default favourite apps list
Patch10001: gnome-shell-favourite-apps-firefox.patch
@ -24,8 +16,6 @@ Patch10001: gnome-shell-favourite-apps-firefox.patch
# downstream patch to stop trying on configuration errors.
Patch40001: 0001-gdm-Work-around-failing-fingerprint-auth.patch
Patch40002: fix-timed-logout.patch
%define eds_version 3.45.1
%define gnome_desktop_version 40
%define glib2_version 2.56.0

2
sources
View File

@ -1 +1 @@
SHA512 (gnome-shell-44.0.tar.xz) = 5e19e3e3b06be6b06699f49501dee85fd21e5f4f394902732c505c24baa16a719848e31034d98718deb06cb004d3e8daf886a086412c2b67614eafecd1676bde
SHA512 (gnome-shell-44.1.tar.xz) = f21211e5e5146b885345d3e1a99702a3119e4dfc25860fe4f7bdbc3a04db2480f03f4e9898e46e4485048035584cbbcf6ef17c396b857c194ad5645aa7d78be7