diff --git a/fix-geary-crashes.patch b/fix-geary-crashes.patch new file mode 100644 index 0000000..4f3067c --- /dev/null +++ b/fix-geary-crashes.patch @@ -0,0 +1,30 @@ +From f2ec0b3e1589093c7436c1317785b399c2db1d20 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Sun, 18 Apr 2021 16:55:48 -0500 +Subject: [PATCH] avatar: fix crash when loading icons + +This function crashes whenever it succeeds. Oops. Let's make sure to +only print an error message when there's actually an error. + +Fixes #433 +--- + src/hdy-avatar.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/hdy-avatar.c b/src/hdy-avatar.c +index 63786c14..2148f455 100644 +--- a/src/hdy-avatar.c ++++ b/src/hdy-avatar.c +@@ -348,7 +348,8 @@ load_from_gicon_async_for_export_cb (HdyAvatar *self, + + pixbuf = load_from_gicon_async_finish (res, &error); + +- if (!g_error_matches (error, HDY_AVATAR_ICON_ERROR, HDY_AVATAR_ICON_ERROR_EMPTY) && ++ if (error && ++ !g_error_matches (error, HDY_AVATAR_ICON_ERROR, HDY_AVATAR_ICON_ERROR_EMPTY) && + !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { + g_warning ("Failed to load icon: %s", error->message); + } +-- +GitLab + diff --git a/libhandy.spec b/libhandy.spec index 8f9cfb1..cba3a35 100644 --- a/libhandy.spec +++ b/libhandy.spec @@ -1,6 +1,6 @@ Name: libhandy Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Building blocks for modern adaptive GNOME apps License: LGPLv2+ @@ -8,6 +8,9 @@ URL: https://gitlab.gnome.org/GNOME/libhandy %global majmin %(echo %{version} | cut -d . -f -2) Source0: https://download.gnome.org/sources/libhandy/%{majmin}/libhandy-%{version}.tar.xz +# https://gitlab.gnome.org/GNOME/libhandy/-/issues/433 +Patch0: fix-geary-crashes.patch + BuildRequires: gcc BuildRequires: gtk-doc BuildRequires: meson @@ -91,6 +94,9 @@ developing applications that use %{name}. %changelog +* Mon Apr 19 2021 Michael Catanzaro - 1.2.1-2 +- Add patch to fix Geary crashes + * Tue Apr 13 2021 Kalev Lember - 1.2.1-1 - Update to 1.2.1