From 63ef569e1050d3babb4c8e2f461582a04a588a96 Mon Sep 17 00:00:00 2001
From: Artem Polishchuk <ego.cordatus@gmail.com>
Date: Fri, 1 Dec 2023 18:11:43 +0200
Subject: [PATCH] Update to 1.4.1 (rhbz#2252428)

---
 .gitignore                             |  1 +
 Fix-the-build-with-appstream-1.0.patch | 73 --------------------------
 libadwaita.spec                        |  7 +--
 sources                                |  2 +-
 4 files changed, 4 insertions(+), 79 deletions(-)
 delete mode 100644 Fix-the-build-with-appstream-1.0.patch

diff --git a/.gitignore b/.gitignore
index 5fe6c0f..d02a78d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /libadwaita-1.4.beta.tar.xz
 /libadwaita-1.4.rc.tar.xz
 /libadwaita-1.4.0.tar.xz
+/libadwaita-1.4.1.tar.xz
diff --git a/Fix-the-build-with-appstream-1.0.patch b/Fix-the-build-with-appstream-1.0.patch
deleted file mode 100644
index 0921348..0000000
--- a/Fix-the-build-with-appstream-1.0.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From ba9b19772c792978b57a9d032e277c0ef46ee231 Mon Sep 17 00:00:00 2001
-From: Alice Mikhaylenko <alicem@gnome.org>
-Date: Mon, 25 Sep 2023 02:00:32 +0400
-Subject: [PATCH] about-window: Fix build with newer libappstream
-
-(cherry picked from commit c579fbe0c10d2b761cfe1fe4e825aaa19fe81c77)
----
- src/adw-about-window.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/adw-about-window.c b/src/adw-about-window.c
-index e861dcd0..dd8da0f0 100644
---- a/src/adw-about-window.c
-+++ b/src/adw-about-window.c
-@@ -2004,7 +2004,11 @@ adw_about_window_new_from_appdata (const char *resource_path,
-     g_free (appid_desktop);
-   }
- 
-+#if AS_CHECK_VERSION (1, 0, 0)
-+  releases = as_component_get_releases_plain (component);
-+#else
-   releases = as_component_get_releases (component);
-+#endif
- 
-   if (release_notes_version) {
-     guint release_index = 0;
--- 
-2.41.0
-
-From 70f6ae278c17994cd5a121f1e75e83829b2e7833 Mon Sep 17 00:00:00 2001
-From: Patrick Griffis <pgriffis@igalia.com>
-Date: Wed, 1 Nov 2023 09:52:47 -0500
-Subject: [PATCH] Fix building against libappstream 1.0
-
----
- src/adw-about-window.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/adw-about-window.c b/src/adw-about-window.c
-index dd8da0f0..b2ab763c 100644
---- a/src/adw-about-window.c
-+++ b/src/adw-about-window.c
-@@ -2005,7 +2005,7 @@ adw_about_window_new_from_appdata (const char *resource_path,
-   }
- 
- #if AS_CHECK_VERSION (1, 0, 0)
--  releases = as_component_get_releases_plain (component);
-+  releases = as_release_list_get_entries (as_component_get_releases_plain (component));
- #else
-   releases = as_component_get_releases (component);
- #endif
-@@ -2042,12 +2042,17 @@ adw_about_window_new_from_appdata (const char *resource_path,
-   }
- 
-   name = as_component_get_name (component);
--  developer_name = as_component_get_developer_name (component);
-   project_license = as_component_get_project_license (component);
-   issue_url = as_component_get_url (component, AS_URL_KIND_BUGTRACKER);
-   support_url = as_component_get_url (component, AS_URL_KIND_HELP);
-   website_url = as_component_get_url (component, AS_URL_KIND_HOMEPAGE);
- 
-+#if AS_CHECK_VERSION (1, 0, 0)
-+  developer_name = as_developer_get_name (as_component_get_developer (component));
-+#else
-+  developer_name = as_component_get_developer_name (component);
-+#endif
-+
-   adw_about_window_set_application_icon (self, application_id);
- 
-   if (name)
--- 
-2.41.0
-
diff --git a/libadwaita.spec b/libadwaita.spec
index e02ca0e..cb01606 100644
--- a/libadwaita.spec
+++ b/libadwaita.spec
@@ -4,7 +4,7 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:           libadwaita
-Version:        1.4.0
+Version:        1.4.1
 Release:        %autorelease
 Summary:        Building blocks for modern GNOME applications
 
@@ -13,9 +13,6 @@ License:        LGPL-2.1-or-later AND MIT
 URL:            https://gitlab.gnome.org/GNOME/libadwaita
 Source0:        https://download.gnome.org/sources/%{name}/1.4/%{name}-%{tarball_version}.tar.xz
 
-# Patches to fix the build with appstream 1.0, backported from upstream
-Patch:          Fix-the-build-with-appstream-1.0.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc
 BuildRequires:  gettext
@@ -23,12 +20,12 @@ BuildRequires:  gi-docgen
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.59.0
 BuildRequires:  vala
-
 BuildRequires:  pkgconfig(appstream)
 BuildRequires:  pkgconfig(fribidi)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gtk4) >= %{gtk_version}
+
 Requires:       gtk4%{?_isa} >= %{gtk_version}
 
 %description
diff --git a/sources b/sources
index dfb9727..9ae0f2e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libadwaita-1.4.0.tar.xz) = b20dfc6240db4c70ad982b1e57281bf3cd0c1a0b6e7ce57a8a6aa5c6d96e0b95834dd9209a474010b618022ee6e079bd126fcc3e7c9c91d487e16af8281c7b53
+SHA512 (libadwaita-1.4.1.tar.xz) = 7311687a97fe372da5ef510f02c7f55d303dc6d312fcfa2cba91ab2113008c0361ff435146520acc1e2b5c19177c6717d6363f5fe849aad32c6e698167236af0