rpms
/
libadwaita
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the build with appstream 1.0

This commit is contained in:
Kalev Lember 2023-11-07 11:33:18 +01:00
parent ec922f1599
commit 57132ad439
2 changed files with 77 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
Fix-the-build-with-appstream-1.0.patch Normal file
View File

@ -0,0 +1,73 @@
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

5
libadwaita.spec
View File

@ -13,6 +13,9 @@ 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
@ -71,7 +74,7 @@ Demo files for %{name}.
%prep
%autosetup -n %{name}-%{tarball_version}
%autosetup -p1 -n %{name}-%{tarball_version}
%build