07/33: gnu: fontconfig: Build fix for the Hurd.

[guix-commits]

janneke pushed a commit to branch wip-hurd
in repository guix.

commit 8421cc78f5928fd57273772f78a2a650c5dcbae7
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Sun Mar 8 20:07:24 2020 -0400

    gnu: fontconfig: Build fix for the Hurd.
    
    * gnu/packages/patches/fontconfig-hurd-path-max.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
    * gnu/packages/fontutils.scm (fontconfig): Use it.
---
 gnu/local.mk                                        |  1 +
 gnu/packages/fontutils.scm                          |  1 +
 gnu/packages/patches/fontconfig-hurd-path-max.patch | 13 +++++++++++++
 3 files changed, 15 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 31b3cc2..f2fd8a4 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -874,6 +874,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/flann-cmake-3.11.patch                  \
   %D%/packages/patches/flex-2.6.1-hurd-path-max.patch          \
   %D%/packages/patches/flint-ldconfig.patch                    \
+  %D%/packages/patches/fontconfig-hurd-path-max.patch          \
   %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch    \
   %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch    \
   %D%/packages/patches/freeimage-unbundle.patch                \
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 71d7a19..b5abb17 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -303,6 +303,7 @@ fonts to/from the WOFF2 format.")
             (uri (string-append
                    
"https://www.freedesktop.org/software/fontconfig/release/fontconfig-";
                    version ".tar.bz2"))
+            (patches (search-patches "fontconfig-hurd-path-max.patch"))
             (sha256 (base32
                      "0hb700a68kk0ip51wdlnjjc682kvlrmb6q920mzajykdk0mdsmgn"))))
    (build-system gnu-build-system)
diff --git a/gnu/packages/patches/fontconfig-hurd-path-max.patch 
b/gnu/packages/patches/fontconfig-hurd-path-max.patch
new file mode 100644
index 0000000..aa6ee08
--- /dev/null
+++ b/gnu/packages/patches/fontconfig-hurd-path-max.patch
@@ -0,0 +1,13 @@
+Index: fontconfig-2.13.1/src/fccfg.c
+===================================================================
+--- fontconfig-2.13.1.orig/src/fccfg.c
++++ fontconfig-2.13.1/src/fccfg.c
+@@ -2231,7 +2231,7 @@ FcConfigRealFilename (FcConfig           *config,
+ 
+     if (n)
+     {
+-      FcChar8 buf[PATH_MAX];
++      FcChar8 buf[FC_PATH_MAX];
+       ssize_t len;
+ 
+       if (sysroot)