From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?B?5a6L5paH5q2m?= Subject: gnu: fontconfig: update to 2.11.94. Date: Mon, 17 Aug 2015 16:44:30 +0800 Message-ID: <871tf2e235.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRG10-0007WN-4w for guix-devel@gnu.org; Mon, 17 Aug 2015 04:43:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZRG0v-000740-T1 for guix-devel@gnu.org; Mon, 17 Aug 2015 04:43:34 -0400 Received: from mail-pa0-x234.google.com ([2607:f8b0:400e:c03::234]:36084) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRG0v-00073a-Kp for guix-devel@gnu.org; Mon, 17 Aug 2015 04:43:29 -0400 Received: by pawq9 with SMTP id q9so6306516paw.3 for ; Mon, 17 Aug 2015 01:43:28 -0700 (PDT) Received: from localhost ([108.61.250.36]) by smtp.gmail.com with ESMTPSA id ra10sm13847020pab.19.2015.08.17.01.43.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Aug 2015 01:43:26 -0700 (PDT) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain 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: /tmp --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-fontconfig-Update-to-2.11.94.patch >From c00d718aad3e75e7567f9d1799291e83e89f868f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= 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 --=-=-=--