[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
23/31: gnu: fontconfig: Build fix for the Hurd.
From: |
guix-commits |
Subject: |
23/31: gnu: fontconfig: Build fix for the Hurd. |
Date: |
Tue, 24 Mar 2020 18:38:54 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit e46b8fe634a3e1895d80e315cd25a3145e30bb4b
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 | 17 +++++++++++++++++
3 files changed, 19 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index 5f5b449..2ab58b9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -886,6 +886,7 @@ dist_patch_DATA =
\
%D%/packages/patches/foobillard++-pkg-config.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \
+ %D%/packages/patches/fontconfig-hurd-path-max.patch \
%D%/packages/patches/freeimage-unbundle.patch \
%D%/packages/patches/fuse-overlapping-headers.patch
\
%D%/packages/patches/gawk-shell.patch \
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 6784dc7..ba0d075 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -296,6 +296,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..f804e68
--- /dev/null
+++ b/gnu/packages/patches/fontconfig-hurd-path-max.patch
@@ -0,0 +1,17 @@
+Avoid usage of PATH_MAX.
+
+Taken from
https://salsa.debian.org/freedesktop-team/fontconfig/-/blob/master/debian/patches/path_max.patch
+
+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)
- 27/31: gnu: inetutils: Support for the Hurd., (continued)
- 27/31: gnu: inetutils: Support for the Hurd., guix-commits, 2020/03/24
- 03/31: gnu: glibc: Add clock patches for the Hurd., guix-commits, 2020/03/24
- 13/31: gnu: commencement: hurd-headers-boot0: Build from tarball., guix-commits, 2020/03/24
- 15/31: gnu: commencement: glibc-intermediate: Build fixes for the Hurd., guix-commits, 2020/03/24
- 20/31: daemon: Do not use clone on the Hurd., guix-commits, 2020/03/24
- 22/31: gnu: less: Build fix for the Hurd., guix-commits, 2020/03/24
- 24/31: gnu: shadow: Add linux-pam dependency for the Hurd., guix-commits, 2020/03/24
- 29/31: gnu: shadow: Build fix for the Hurd., guix-commits, 2020/03/24
- 31/31: llvm: Add support for the Hurd., guix-commits, 2020/03/24
- 07/31: gnu: bootstrap: gcc-static: Use gcc-5., guix-commits, 2020/03/24
- 23/31: gnu: fontconfig: Build fix for the Hurd.,
guix-commits <=
- 26/31: gnu: shepherd: Build fix for the Hurd., guix-commits, 2020/03/24
- 11/31: gnu: make: Support for the Hurd., guix-commits, 2020/03/24
- 16/31: gnu: commencement: hurd-source: Update to latest git., guix-commits, 2020/03/24
- 30/31: gnu: mit-krb5: Supprt for the Hurd., guix-commits, 2020/03/24