From 6a96df185570a87fc5f359317da8cedeefbd9a97 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sat, 25 Mar 2023 09:51:27 -0700 Subject: [PATCH] Backport MR #2725 - *another* fix for screenshot notifications --- ...t-fix-broken-GLib.Error.matches-call.patch | 29 +++++++++++++++++++ gnome-shell.spec | 8 ++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0001-screenshot-fix-broken-GLib.Error.matches-call.patch diff --git a/0001-screenshot-fix-broken-GLib.Error.matches-call.patch b/0001-screenshot-fix-broken-GLib.Error.matches-call.patch new file mode 100644 index 0000000..16f1782 --- /dev/null +++ b/0001-screenshot-fix-broken-GLib.Error.matches-call.patch @@ -0,0 +1,29 @@ +From ea55693f23889796d470433e6c7b198a3d6ccbe5 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +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 +--- + 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 + diff --git a/gnome-shell.spec b/gnome-shell.spec index 5bddef5..4e09b91 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -2,7 +2,7 @@ Name: gnome-shell Version: 44.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ @@ -13,6 +13,9 @@ Source0: https://download.gnome.org/sources/gnome-shell/44/%{name}-%{tarb # 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 @@ -233,6 +236,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.Porta %{_mandir}/man1/gnome-shell.1* %changelog +* Sat Mar 25 2023 Adam Williamson - 44.0-4 +- Backport MR #2725 - *another* fix for screenshot notifications + * Fri Mar 24 2023 Adam Williamson - 44.0-3 - Backport a fix for screenshot notifications