guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.

commit 13dd03f0916dccbf1e617c6c9c0110c407f5a21d
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Mon Sep 28 14:27:30 2026 +0900

    gnu: libadwaita: Fix build on i686-linux.
    
    * gnu/packages/patches/libadwaita-appstream-1.2.0.patch: New file.
    * gnu/packages/gnome.scm (libadwaita): Apply it.
    
    Signed-off-by: Liliana Marie Prikler <[email protected]>
---
 gnu/packages/gnome.scm                             |  3 +-
 .../patches/libadwaita-appstream-1.2.0.patch       | 46 ++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 97e533a9031..14c468c371c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13688,7 +13688,8 @@ Document Analysis and Recognition program.")
                                   "libadwaita-" version ".tar.xz"))
               (sha256
                (base32
-                "08z7260nna76wlapfyd1h1q2502fdqpmv03viqq2c0gy51qb6ngw"))))
+                "08z7260nna76wlapfyd1h1q2502fdqpmv03viqq2c0gy51qb6ngw"))
+              (patches (search-patches "libadwaita-appstream-1.2.0.patch"))))
     (build-system meson-build-system)
     (outputs (list "doc" "out"))
     (arguments
diff --git a/gnu/packages/patches/libadwaita-appstream-1.2.0.patch 
b/gnu/packages/patches/libadwaita-appstream-1.2.0.patch
new file mode 100644
index 00000000000..df5a042b4d6
--- /dev/null
+++ b/gnu/packages/patches/libadwaita-appstream-1.2.0.patch
@@ -0,0 +1,46 @@
+Upstream-status: 
<https://gitlab.gnome.org/GNOME/libadwaita/-/merge_requests/1812>
+
+diff --git a/tests/test-about-dialog.c b/tests/test-about-dialog.c
+index 752505dd..913599d6 100644
+--- a/tests/test-about-dialog.c
++++ b/tests/test-about-dialog.c
+@@ -19,7 +19,7 @@ test_adw_about_dialog_from_appdata (void)
+   g_assert_nonnull (dialog);
+ 
+   g_assert_cmpstr (adw_about_dialog_get_appdata_resource_path (dialog), ==, 
"/org/gnome/Adwaita1/Test/org.gnome.Adwaita1.Test.metainfo.xml");
+-  g_assert_cmpstr (adw_about_dialog_get_release_notes (dialog), ==, 
"<p>Testing Build</p>\n");
++  g_assert_cmpstr (g_strchomp (adw_about_dialog_get_release_notes (dialog)), 
==, "<p>Testing Build</p>");
+   g_assert_cmpstr (adw_about_dialog_get_release_notes_version (dialog), ==, 
"1.0");
+   g_assert_cmpstr (adw_about_dialog_get_version (dialog), ==, "1.0");
+   g_assert_cmpstr (adw_about_dialog_get_application_icon (dialog), ==, 
"org.gnome.Adwaita1.Test");
+@@ -37,7 +37,7 @@ test_adw_about_dialog_from_appdata (void)
+   g_assert_nonnull (dialog);
+ 
+   g_assert_cmpstr (adw_about_dialog_get_appdata_resource_path (dialog), ==, 
"/org/gnome/Adwaita1/Test/org.gnome.Adwaita1.Test.metainfo.xml");
+-  g_assert_cmpstr (adw_about_dialog_get_release_notes (dialog), ==, 
"<p>Testing Build Older</p>\n");
++  g_assert_cmpstr (g_strchomp (adw_about_dialog_get_release_notes (dialog)), 
==, "<p>Testing Build Older</p>");
+   g_assert_cmpstr (adw_about_dialog_get_release_notes_version (dialog), ==, 
"0.1");
+   g_assert_cmpstr (adw_about_dialog_get_version (dialog), ==, "1.0");
+ 
+diff --git a/tests/test-about-window.c b/tests/test-about-window.c
+index ed0aa9d4..c4599710 100644
+--- a/tests/test-about-window.c
++++ b/tests/test-about-window.c
+@@ -17,7 +17,7 @@ test_adw_about_window_from_appdata (void)
+ 
+   g_assert_nonnull (window);
+ 
+-  g_assert_cmpstr (adw_about_window_get_release_notes (window), ==, 
"<p>Testing Build</p>\n");
++  g_assert_cmpstr (g_strchomp (adw_about_window_get_release_notes (window)), 
==, "<p>Testing Build</p>");
+   g_assert_cmpstr (adw_about_window_get_release_notes_version (window), ==, 
"1.0");
+   g_assert_cmpstr (adw_about_window_get_version (window), ==, "1.0");
+   g_assert_cmpstr (adw_about_window_get_application_icon (window), ==, 
"org.gnome.Adwaita1.Test");
+@@ -34,7 +34,7 @@ test_adw_about_window_from_appdata (void)
+ 
+   g_assert_nonnull (window);
+ 
+-  g_assert_cmpstr (adw_about_window_get_release_notes (window), ==, 
"<p>Testing Build Older</p>\n");
++  g_assert_cmpstr (g_strchomp (adw_about_window_get_release_notes (window)), 
==, "<p>Testing Build Older</p>");
+   g_assert_cmpstr (adw_about_window_get_release_notes_version (window), ==, 
"0.1");
+   g_assert_cmpstr (adw_about_window_get_version (window), ==, "1.0");
+ 

Reply via email to