Re: [PATCH] gnu: fontconfig: Fix for PATH_MAX.

[Manolis Ragkousis]

Hello Ludo,

On 03/06/2017 11:25 PM, Ludovic Courtès wrote:
> 
> BTW, I’d encourage you to team up with the Debian folks so that all the
> PATH_MAX patches end up upstream.  Otherwise they’ll end up occupying
> half of our repo.  ;-)

Thank to Rene's effort this one is already in upstream :). Next time
fontconfig has a new release we will remove this patch.

Manolis

Re: [PATCH] gnu: fontconfig: Fix for PATH_MAX.

[Ludovic Courtès]

Hi,

Manolis Ragkousis  skribis:

> I added a line in your commit message saying in which file you apply the
> patch and also removed all the one space indentation changes, with the
> purpose of making the patch more clear.
>
> I pushed it in core-updates.

Right in time, thanks.  :-)

BTW, I’d encourage you to team up with the Debian folks so that all the
PATH_MAX patches end up upstream.  Otherwise they’ll end up occupying
half of our repo.  ;-)

Ludo’.

[PATCH] gnu: fontconfig: Fix for PATH_MAX.

[rennes]

Hello,

This patch for fontconfig was accepted in upstream!.

The patch fix the error on build phase, because PATH_MAX is not defined 
on GNU/Hurd.

ThanksFrom f1746b8be0fade9cc759715aa5f80375c3abd19a Mon Sep 17 00:00:00 2001
From: rennes <ren...@openmailbox.org>
Date: Wed, 1 Mar 2017 19:19:01 -0600
Subject: [PATCH] gnu: fontconfig: Fix for PATH_MAX.

* gnu/packages/patches/fontconfig-path-max.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk   |   3 +-
 gnu/packages/fontutils.scm |  90 +-
 gnu/packages/patches/fontconfig-path-max.patch | 124 +
 3 files changed, 172 insertions(+), 45 deletions(-)
 create mode 100644 gnu/packages/patches/fontconfig-path-max.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index f356a124b..dd0ff795e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -5,7 +5,7 @@
 # Copyright © 2013, 2014, 2015, 2016 Mark H Weaver <m...@netris.org>
 # Copyright © 2016 Chris Marusich <cmmarus...@gmail.com>
 # Copyright © 2016, 2017 Kei Kebreau <k...@openmailbox.org>
-# Copyright © 2016 Rene Saavedra <ren...@openmailbox.org>
+# Copyright © 2016, 2017 Rene Saavedra <ren...@openmailbox.org>
 # Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adf...@openmailbox.org>
 # Copyright © 2016, 2017 Ricardo Wurmus <rek...@elephly.net>
 # Copyright © 2016 Ben Woodcroft <donttrust...@gmail.com>
@@ -556,6 +556,7 @@ dist_patch_DATA =		\
   %D%/packages/patches/flint-ldconfig.patch			\
   %D%/packages/patches/fltk-shared-lib-defines.patch		\
   %D%/packages/patches/fltk-xfont-on-demand.patch		\
+  %D%/packages/patches/fontconfig-path-max.patch		\
   %D%/packages/patches/fontforge-svg-modtime.patch		\
   %D%/packages/patches/freeimage-CVE-2015-0852.patch		\
   %D%/packages/patches/freeimage-CVE-2016-5684.patch		\
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 15109bfe1..6420af50e 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2014, 2016 Eric Bavier <bav...@member.fsf.org>
 ;;; Copyright © 2016 Mark H Weaver <m...@netris.org>
 ;;; Copyright © 2016 Efraim Flashner <efr...@flashner.co.il>
+;;; Copyright © 2017 Rene Saavedra <ren...@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -222,47 +223,48 @@ fonts to/from the WOFF2 format.")
 
 (define-public fontconfig
   (package
-   (name "fontconfig")
-   (version "2.12.1")
-   (source (origin
-(method url-fetch)
-(uri (string-append
-   "https://www.freedesktop.org/software/fontconfig/release/fontconfig-;
-   version ".tar.bz2"))
-(sha256 (base32
- "1wy7svvp7df6bjpg1m5vizb3ngd7rhb20vpclv3x3qa71khs6jdl"
-   (build-system gnu-build-system)
-   (propagated-inputs `(("expat" ,expat)
-("freetype" ,freetype)))
-   (inputs `(("gs-fonts" ,gs-fonts)))
-   (native-inputs
-  `(("pkg-config" ,pkg-config)))
-   (arguments
-`(#:configure-flags
-  (list "--with-cache-dir=/var/cache/fontconfig"
-;; register gs-fonts as default fonts
-(string-append "--with-default-fonts="
-   (assoc-ref %build-inputs "gs-fonts")
-   "/share/fonts")
-
-;; Register fonts from user and system profiles.
-(string-append "--with-add-fonts="
-   "~/.guix-profile/share/fonts,"
-   "/run/current-system/profile/share/fonts")
-
-;; python is not actually needed
-"PYTHON=false")
-  #:phases
-  (modify-phases %standard-phases
-(replace 'install
- (lambda _
-   ;; Don't try to create /var/cache/fontconfig.
-   (zero? (system* "make" "install"
-   "fc_cachedir=$(TMPDIR)"
-   "RUN_FC_CACHE_TEST=false")))
-   (synopsis "Library for configuring and customizing font access")
-   (description
-"Fontconfig can discover new fonts when installed automatically;
+(name "fontconfig")
+(version "2.12.1")
+(source (origin
+  (method url-fetch)
+  (uri (string-append
+"https://www.freedesktop.org/software/fontconfig/release/fontconfig-;
+version ".tar.bz2"))
+  (sha256 (base32
+   "1wy7svvp7df6bjpg1m5vizb3ngd7rhb20vpclv3x3qa71khs6jdl"))
+  (patches (