guix_mirror_bot pushed a commit to branch master
in repository guix.

commit 078688643628abdbde251e9b7e64de0b9c321905
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Sun Mar 22 17:41:58 2026 +0900

    gnu: fontconfig: Update to 2.17.1.
    
    * gnu/packages/fontutils.scm (fontconfig): Update to 2.17.1.
    [source]: Adjust URI.
    * gnu/packages/patches/fontconfig-cache-ignore-mtime.patch: Rebase.
    
    Change-Id: I1e54b9fa4a7a1de81326726070b64c478bd3c615
    Signed-off-by: Noé Lopez <[email protected]>
---
 gnu/packages/fontutils.scm                               | 11 ++++++-----
 gnu/packages/patches/fontconfig-cache-ignore-mtime.patch |  7 ++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 1c77e1ad89..9686528a58 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -12,7 +12,7 @@
 ;;; Copyright © 2019, 2020, 2022 Marius Bakke <[email protected]>
 ;;; Copyright © 2020 Roel Janssen <[email protected]>
 ;;; Copyright © 2020, 2021, 2024 Nicolas Goaziou <[email protected]>
-;;; Copyright © 2021-2025 Maxim Cournoyer <[email protected]>
+;;; Copyright © 2021-2026 Maxim Cournoyer <[email protected]>
 ;;; Copyright © 2021 Sarah Morgensen <[email protected]>
 ;;; Copyright © 2022 Eric Bavier <[email protected]>
 ;;; Copyright © 2022 Felipe Balbi <[email protected]>
@@ -1422,14 +1422,15 @@ Font Format (WOFF).")
   (hidden-package
    (package
      (name "fontconfig-minimal")
-     (version "2.16.0")
+     (version "2.17.1")
      (source (origin
                (method url-fetch)
                (uri (string-append
-                     "https://www.freedesktop.org/software/";
-                     "fontconfig/release/fontconfig-" version ".tar.xz"))
+                     "https://gitlab.freedesktop.org/api/v4/projects/890";
+                     "/packages/generic/fontconfig/" version "/fontconfig-"
+                     version ".tar.xz"))
                (sha256 (base32
-                        
"086jdsdxmc9ryr0n0dmgs0vfnkhkxxw5hsgpr888pfn9biaxqcva"))
+                        
"0hd5dw15q0i7518w1zqjcvyhvmlcf3ycv6df0ny1zz7zyj9swp4z"))
                (patches (search-patches 
"fontconfig-cache-ignore-mtime.patch"))))
      (build-system gnu-build-system)
      ;; In Requires or Requires.private of fontconfig.pc.
diff --git a/gnu/packages/patches/fontconfig-cache-ignore-mtime.patch 
b/gnu/packages/patches/fontconfig-cache-ignore-mtime.patch
index 3afe8cfd78..1e86341ab4 100644
--- a/gnu/packages/patches/fontconfig-cache-ignore-mtime.patch
+++ b/gnu/packages/patches/fontconfig-cache-ignore-mtime.patch
@@ -1,6 +1,3 @@
-Pretend that stat's mtime is broken, so that the fontconfig cache does not
-depend upon modification time to determine if a cache is stale.
-
 diff --git a/src/fcstat.c b/src/fcstat.c
 index 9b54e2b4..76d7780e 100644
 --- a/src/fcstat.c
@@ -10,6 +7,6 @@ index 9b54e2b4..76d7780e 100644
  FcIsFsMtimeBroken (const FcChar8 *dir)
  {
 +    return FcTrue;
-     int fd = FcOpen ((const char *) dir, O_RDONLY);
+     int fd = FcOpen ((const char *)dir, O_RDONLY);
  
-     if (fd != -1)
+     if (fd != -1) {

Reply via email to