10/134: gnu: pango: Fetch from git and remove patch.

[guix-commits]

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

commit 6889a9a937250b095c0f0511e9a7b532448e5aae
Author: Liliana Marie Prikler <liliana.prik...@gmail.com>
AuthorDate: Mon Apr 21 15:47:48 2025 +0200

    gnu: pango: Fetch from git and remove patch.
    
    * gnu/packages/gtk.scm (pango): Fetch from git.
    [source]: Delete patches.
    
    Change-Id: I1ba90b3c9c54523339a5a923d460b63887c4e5bc
    Signed-off-by: Maxim Cournoyer <maxim.courno...@gmail.com>
    * gnu/packages/patches/pango-skip-libthai-test.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): De-register it.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/gtk.scm                               | 12 +++++------
 gnu/packages/patches/pango-skip-libthai-test.patch | 23 ----------------------
 3 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 924f6c2fa3..cba4d5553f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2025,7 +2025,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/p7zip-fix-build-with-gcc-11.patch       \
   %D%/packages/patches/p7zip-remove-unused-code.patch          \
   %D%/packages/patches/pam-krb5-CVE-2020-10595.patch           \
-  %D%/packages/patches/pango-skip-libthai-test.patch           \
   %D%/packages/patches/password-store-tree-compat.patch                \
   %D%/packages/patches/pciutils-hurd64.patch                   \
   %D%/packages/patches/pdl-2.019-glut-bitmap-fonts.patch       \
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 4d81b6999b..be3131b543 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -383,14 +383,14 @@ applications.")
     (name "pango")
     (version "1.56.3")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/pango/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (patches (search-patches "pango-skip-libthai-test.patch"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.gnome.org/GNOME/pango";)
+                    (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "1494p8s2hj3snirpnd1lcz6pmcvjlb1r4zkz3d7d5n2wq8mja1i6"))))
+                "0dpbh423ggbcdhajaglq86rf6hx5znzqvphjcpp7x8xn8y0ih939"))))
     (build-system meson-build-system)
     (arguments
      (list
diff --git a/gnu/packages/patches/pango-skip-libthai-test.patch 
b/gnu/packages/patches/pango-skip-libthai-test.patch
deleted file mode 100644
index 98732b5391..0000000000
--- a/gnu/packages/patches/pango-skip-libthai-test.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Skip Thai character test when libthai is unavailable.
-
-Taken from upstream bug tracker:
-https://gitlab.gnome.org/GNOME/pango/merge_requests/161
-https://gitlab.gnome.org/GNOME/pango/commit/b73284747ac937e31dc9191f84ed6e24284c88ee
-
-diff --git a/tests/test-break.c b/tests/test-break.c
-index 
8549b678bba69360d07dce3af21d915412f20d51..47fa3009165e19a331aa04a0df4351ae2323933b
 100644
---- a/tests/test-break.c
-+++ b/tests/test-break.c
-@@ -305,6 +305,12 @@ main (int argc, char *argv[])
-       if (!strstr (name, "break"))
-         continue;
- 
-+#ifndef HAVE_LIBTHAI
-+      /* four.break involves Thai, so only test it when we have libthai */
-+      if (strstr (name, "four.break"))
-+        continue;
-+#endif
-+
-       path = g_strdup_printf ("/break/%s", name);
-       g_test_add_data_func_full (path, g_test_build_filename (G_TEST_DIST, 
"breaks", name, NULL),
-                                  test_break, g_free);