diff --git a/3e3967d5f69180644519936991cad10136e84ca9.patch b/3e3967d5f69180644519936991cad10136e84ca9.patch new file mode 100644 index 0000000..e2698b5 --- /dev/null +++ b/3e3967d5f69180644519936991cad10136e84ca9.patch @@ -0,0 +1,44 @@ +From 3e3967d5f69180644519936991cad10136e84ca9 Mon Sep 17 00:00:00 2001 +From: Patrick Griffis +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 dd8da0f08..b2ab763c9 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) +-- +GitLab + diff --git a/libadwaita.changes b/libadwaita.changes index 2980a9b..607a605 100644 --- a/libadwaita.changes +++ b/libadwaita.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 22 10:48:46 UTC 2023 - Bjørn Lie + +- Add 3e3967d5f69180644519936991cad10136e84ca9.patch: Fix building + against libappstream 1.0 (boo#1217047). + ------------------------------------------------------------------- Thu Nov 16 12:29:43 UTC 2023 - bjorn.lie@gmail.com diff --git a/libadwaita.spec b/libadwaita.spec index 6f1c413..0baa7d1 100644 --- a/libadwaita.spec +++ b/libadwaita.spec @@ -23,6 +23,8 @@ Summary: Building blocks for modern GNOME applications License: LGPL-2.1-or-later URL: https://gitlab.gnome.org/GNOME/libadwaita Source: %{name}-%{version}.tar.zst +# PATCH-FIX-UPSTREAM 3e3967d5f69180644519936991cad10136e84ca9.patch -- Fix building against libappstream 1.0 +Patch0: https://gitlab.gnome.org/GNOME/libadwaita/-/commit/3e3967d5f69180644519936991cad10136e84ca9.patch BuildRequires: fdupes BuildRequires: meson >= 0.59.0