gnu: fontconfig: update to 2.11.94.

gnu: fontconfig: update to 2.11.94.

[宋文武]

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

I change the '--with-default-fonts' to gs-fonts, and '--with-add-fonts'
to ~/.guix-profile.
which make 'test-bz89617' pass, alternative, we can set FONTCONFIG_FILE
to a file:
  <fontconfig>
    <dir>/tmp</dir>
  </fontconfig>



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-fontconfig-Update-to-2.11.94.patch --]
[-- Type: text/x-patch, Size: 2926 bytes --]

From c00d718aad3e75e7567f9d1799291e83e89f868f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Mon, 17 Aug 2015 16:16:04 +0800
Subject: [PATCH] gnu: fontconfig: Update to 2.11.94.

* gnu/packages/fontutils.scm (fontconfig): Update to 2.11.94.
  [arguments]: Pass '--with-cache-dir=/var/cache/fontconfig' to configure.
  Add #:phases.
---
 gnu/packages/fontutils.scm | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 8b5346a..a25a2ea 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -71,14 +71,14 @@ anti-aliased glyph bitmap generation with 256 gray levels.")
 (define-public fontconfig
   (package
    (name "fontconfig")
-   (version "2.11.92")
+   (version "2.11.94")
    (source (origin
             (method url-fetch)
             (uri (string-append
                    "http://www.freedesktop.org/software/fontconfig/release/fontconfig-"
                    version ".tar.bz2"))
             (sha256 (base32
-                     "18r45dcnaj93izwfr082qiwg8ka7ll6j0c9yf1slblm542d5pmd9"))))
+                     "1psrl4b4gi4wmbvwwh43lk491wsl8lgvqj146prlcha3vwjc0qyp"))))
    (build-system gnu-build-system)
    (propagated-inputs `(("expat" ,expat)
                         ("freetype" ,freetype)))
@@ -86,13 +86,24 @@ anti-aliased glyph bitmap generation with 256 gray levels.")
    (native-inputs
       `(("pkg-config" ,pkg-config)))
    (arguments
-     `(#:configure-flags
-               ;; point to user profile instead of /usr/share/fonts in /etc/fonts.conf
-        (list "--with-default-fonts=~/.guix-profile/share/fonts"
-              ;; register gs-fonts
-              (string-append "--with-add-fonts="
-                             (assoc-ref %build-inputs "gs-fonts")
-                             "/share/fonts"))))
+    `(#: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 profile
+            "--with-add-fonts=~/.guix-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;
-- 
2.4.3

Re: gnu: fontconfig: update to 2.11.94.

[Ricardo Wurmus]

Nice!  This is needed to fix score generation with lilypond (or rather
ghostscript conversion from ps to pdf).

This is for core-updates, right?

~~ Ricardo

Re: gnu: fontconfig: update to 2.11.94.

[宋文武]

Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> writes:

> Nice!  This is needed to fix score generation with lilypond (or rather
> ghostscript conversion from ps to pdf).
>
> This is for core-updates, right?
Yes, that's the intention.