From 5881267c88f7d65e039d24d6132731effa01cb84 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 27 Apr 2021 11:29:51 +0200
Subject: [PATCH] Update to 1.2.2

---
 .gitignore              |  1 +
 fix-geary-crashes.patch | 30 ------------------------------
 libhandy.spec           | 10 +++++-----
 sources                 |  2 +-
 4 files changed, 7 insertions(+), 36 deletions(-)
 delete mode 100644 fix-geary-crashes.patch

diff --git a/.gitignore b/.gitignore
index 970502e..f491ade 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /libhandy-1.1.90.tar.xz
 /libhandy-1.2.0.tar.xz
 /libhandy-1.2.1.tar.xz
+/libhandy-1.2.2.tar.xz
diff --git a/fix-geary-crashes.patch b/fix-geary-crashes.patch
deleted file mode 100644
index 4f3067c..0000000
--- a/fix-geary-crashes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f2ec0b3e1589093c7436c1317785b399c2db1d20 Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@gnome.org>
-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 cba3a35..db722bf 100644
--- a/libhandy.spec
+++ b/libhandy.spec
@@ -1,6 +1,6 @@
 Name:           libhandy
-Version:        1.2.1
-Release:        2%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 Summary:        Building blocks for modern adaptive GNOME apps
 License:        LGPLv2+
 
@@ -8,9 +8,6 @@ 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
@@ -94,6 +91,9 @@ developing applications that use %{name}.
 
 
 %changelog
+* Tue Apr 27 2021 Kalev Lember <klember@redhat.com> - 1.2.2-1
+- Update to 1.2.2
+
 * Mon Apr 19 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 1.2.1-2
 - Add patch to fix Geary crashes
 
diff --git a/sources b/sources
index 16258dc..d45ac47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libhandy-1.2.1.tar.xz) = 0474d1f15a1572ab3f622ec703fc4167beb3ed6062f566d8b50c20894a217c66d00c5b4616d54e65fac312b9836428e8cb83753566cf67abffb9eafbb87dc926
+SHA512 (libhandy-1.2.2.tar.xz) = 2135d3e15931fa143698de9200803c90e93c87b82c96b4fff90b75075c218a8ef2f69a26210bda8c10fb7195f115b11b804bb6de0b2f65cd464a7cefe35d0af4