From d1d211d96f846aecf9400fc8a51423a8bddf4c3c Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 28 Jul 2023 15:24:23 -0700 Subject: [PATCH] Add patch to fix gjs crash --- ...97b027d32574bb3ebe45091f4123560ad42a.patch | 26 +++++++++++++++++++ gnome-characters.spec | 7 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 9ed597b027d32574bb3ebe45091f4123560ad42a.patch diff --git a/9ed597b027d32574bb3ebe45091f4123560ad42a.patch b/9ed597b027d32574bb3ebe45091f4123560ad42a.patch new file mode 100644 index 0000000..362d2d2 --- /dev/null +++ b/9ed597b027d32574bb3ebe45091f4123560ad42a.patch @@ -0,0 +1,26 @@ +From 9ed597b027d32574bb3ebe45091f4123560ad42a Mon Sep 17 00:00:00 2001 +From: Christopher Davis +Date: Thu, 6 Jul 2023 10:18:14 -0400 +Subject: [PATCH] window: Unpack recent-characters GValue + +Currently `get_strv()` causes a crash due to a GJS issue. +--- + src/window.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/window.js b/src/window.js +index 77305b6..712e2d8 100644 +--- a/src/window.js ++++ b/src/window.js +@@ -71,7 +71,7 @@ var MainWindow = GObject.registerClass({ + + // FIXME: Can't use GSettings.bind with 'as' from Gjs + let recentCharacters = Main.settings.get_value('recent-characters'); +- this.recentCharacters = recentCharacters.get_strv(); ++ this.recentCharacters = recentCharacters.deepUnpack(); + this._maxRecentCharacters = 100; + Main.settings.bind('max-recent-characters', this, + 'max-recent-characters', +-- +GitLab + diff --git a/gnome-characters.spec b/gnome-characters.spec index 7d342a8..5b1aeca 100644 --- a/gnome-characters.spec +++ b/gnome-characters.spec @@ -8,7 +8,7 @@ Name: gnome-characters Version: 45~alpha -Release: 2%{?dist} +Release: 3%{?dist} Summary: Character map application for GNOME # Files from gtk-js-app are licensed under 3-clause BSD. # Other files are GPL 2.0 or later. @@ -16,6 +16,8 @@ License: BSD-3-Clause AND GPL-2.0-or-later URL: https://wiki.gnome.org/Design/Apps/CharacterMap Source0: https://download.gnome.org/sources/%{name}/45/%{name}-%{tarball_version}.tar.xz +# fix crash in gjs +Patch0: https://gitlab.gnome.org/GNOME/gnome-characters/-/commit/9ed597b027d32574bb3ebe45091f4123560ad42a.patch BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gobject-introspection-devel @@ -70,6 +72,9 @@ desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/%{appname}.deskto %changelog +* Fri Jul 28 2023 Kevin Fenzi - 45~alpha-3 +- Add patch to fix gjs crash + * Wed Jul 19 2023 Fedora Release Engineering - 45~alpha-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild