diff --git a/.gitignore b/.gitignore index 338e97c..1b07aa4 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /gnome-characters-44.rc.tar.xz /gnome-characters-44.0.tar.xz /gnome-characters-45.alpha.tar.xz +/gnome-characters-45.0.tar.xz diff --git a/9ed597b027d32574bb3ebe45091f4123560ad42a.patch b/9ed597b027d32574bb3ebe45091f4123560ad42a.patch deleted file mode 100644 index 362d2d2..0000000 --- a/9ed597b027d32574bb3ebe45091f4123560ad42a.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 5b1aeca..0247f83 100644 --- a/gnome-characters.spec +++ b/gnome-characters.spec @@ -7,8 +7,8 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-characters -Version: 45~alpha -Release: 3%{?dist} +Version: 45.0 +Release: 1%{?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,8 +16,6 @@ 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 @@ -72,6 +70,9 @@ desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/%{appname}.deskto %changelog +* Tue Sep 19 2023 Kalev Lember - 45.0-1 +- Update to 45.0 + * Fri Jul 28 2023 Kevin Fenzi - 45~alpha-3 - Add patch to fix gjs crash diff --git a/sources b/sources index 4c45343..6e82f50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-characters-45.alpha.tar.xz) = 83fbdd47e354d23538cc638f068c0276b79c12fac9fca5214a6950deb996008e8279ccbca7dd04214eff978706422e08db1bd14292ed40b1154da38605f4acd8 +SHA512 (gnome-characters-45.0.tar.xz) = e7fa6c6caa684ab13c61d6fbf9dee69c0b67f8680dd27b130aaa2248a490e7b234ee541af56fdc6a5d56158636760b25da30a0d479d7f7f5403c35916f93a8ce