From f6ef62d9c9132a6c8b9eb17f05a187359760aa94 Mon Sep 17 00:00:00 2001 From: Rmys Date: Sat, 2 Dec 2023 12:02:22 +0300 Subject: [PATCH] libadwaita-1.4.2 --- .../library/libadwaita/files/3e3967d5.patch | 44 ------------------- .../library/libadwaita/files/c579fbe0.patch | 28 ------------ programming/library/libadwaita/pspec.xml | 4 +- 3 files changed, 2 insertions(+), 74 deletions(-) delete mode 100644 programming/library/libadwaita/files/3e3967d5.patch delete mode 100644 programming/library/libadwaita/files/c579fbe0.patch diff --git a/programming/library/libadwaita/files/3e3967d5.patch b/programming/library/libadwaita/files/3e3967d5.patch deleted file mode 100644 index 16e01a2959..0000000000 --- a/programming/library/libadwaita/files/3e3967d5.patch +++ /dev/null @@ -1,44 +0,0 @@ -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/programming/library/libadwaita/files/c579fbe0.patch b/programming/library/libadwaita/files/c579fbe0.patch deleted file mode 100644 index 34c8ca8a7c..0000000000 --- a/programming/library/libadwaita/files/c579fbe0.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c579fbe0c10d2b761cfe1fe4e825aaa19fe81c77 Mon Sep 17 00:00:00 2001 -From: Alice Mikhaylenko -Date: Mon, 25 Sep 2023 02:00:32 +0400 -Subject: [PATCH] about-window: Fix build with newer libappstream - ---- - 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 e861dcd09..dd8da0f08 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; --- -GitLab - diff --git a/programming/library/libadwaita/pspec.xml b/programming/library/libadwaita/pspec.xml index 301297a56a..ee453bc9ca 100644 --- a/programming/library/libadwaita/pspec.xml +++ b/programming/library/libadwaita/pspec.xml @@ -30,8 +30,8 @@ appstream-1.0-test.patch - c579fbe0.patch - 3e3967d5.patch + +