reiterating for the list On 3/31/16, Ludovic Courtès <l...@gnu.org> wrote: > I understand cannot support Python 2 and 3 simultaneously, but I think > Leo was suggesting changing the ‘fontforge’ package to use Python 2.x > instead of 3.x. WDYT? python 2 has a end of life determined, 2020, https://www.python.org/dev/peps/pep-0373/ so the default should be python 3 > Also, could you explain why we need fontforge-with-python2 instead of > fontforge-with-python3? inline comment in patch >> +++ b/guix/gnu-maintenance.scm >> (define %tarball-rx >> - ;; The .zip extensions is notably used for freefont-ttf. >> ;; The "-src" pattern is for "TeXmacs-1.0.7.9-src.tar.gz". >> ;; The "-gnu[0-9]" pattern is for "icecat-38.4.0-gnu1.tar.bz2". >> (make-regexp >> "^([^.]+)-([0-9]|[^-])+(-(src|gnu[0-9]))?\\.(tar\\.|zip$)")) > > This comment remains valid because there are .zip files in > ftp.gnu.org/gnu/freefont, so I think we should keep it. .zip files in freefont and icecat are binaries, not useful for guix another patch will remove .zip support
From db9e80ea3d6e79e71b9b67e440a78f49ee8a26d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?al=C3=ADrio=20eyng?= <alirioe...@gmail.com> Date: Thu, 31 Mar 2016 12:51:47 +0000 Subject: [PATCH] gnu: font-gnu-freefont-ttf: Update to 20120503 and build from source.
* gnu/packages/fonts.scm (font-gnu-freefont-ttf): Update to 20120503. [arguments]: Build from source. --- gnu/packages/fonts.scm | 71 +++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index f07e052..3d75591 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -33,10 +33,12 @@ #:use-module (guix build-system trivial) #:use-module (gnu packages base) #:use-module (gnu packages compression) - #:use-module (gnu packages zip) + #:use-module (gnu packages fontutils) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (gnu packages xorg) - #:use-module (gnu packages pkg-config)) + #:use-module (gnu packages zip)) (define-public font-inconsolata (package @@ -260,47 +262,44 @@ sans-serif designed for on-screen reading. It is used by GNOME@tie{}3.") (define-public font-gnu-freefont-ttf (package (name "font-gnu-freefont-ttf") - (version "20100919") + (version "20120503") (source (origin (method url-fetch) - (uri (string-append "mirror://gnu/freefont/freefont-ttf-" + (uri (string-append "mirror://gnu/freefont/freefont-src-" version ".tar.gz")) (sha256 (base32 - "1q3h5jp1mbdkinkwxy0lfd0a1q7azlbagraydlzaa2ng82836wg4")))) - (build-system trivial-build-system) + "0yk58blhcd4hm7nyincmqq4jrzjjk82wif2zmk1l3y2m4vif4qhd")))) + (build-system gnu-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils) - (srfi srfi-26)) - - (let ((tar (string-append (assoc-ref %build-inputs - "tar") - "/bin/tar")) - (PATH (string-append (assoc-ref %build-inputs - "gzip") - "/bin")) - (font-dir (string-append %output - "/share/fonts/truetype")) - (doc-dir (string-append %output "/share/doc/" - ,name "-" ,version))) - (setenv "PATH" PATH) - (system* tar "xvf" (assoc-ref %build-inputs "source")) - - (mkdir-p font-dir) - (mkdir-p doc-dir) - (chdir (string-append "freefont-" ,version)) - (for-each (lambda (file) - (let ((dir (if (string-suffix? "ttf" file) - font-dir - doc-dir))) + `(#:phases (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda _ + (let ((doc-dir (string-append %output "/share/doc/" + ,name "-" ,version)) + (font-dir (string-append %output + "/share/fonts/truetype"))) + (mkdir-p doc-dir) + (substitute* "Makefile" + (("\\$\\(TMPDIR\\)") doc-dir) + (("sfd/\\*.ttf") "")) + (system* "make" "ttftar") + (mkdir-p font-dir) + (for-each (lambda (file) (copy-file file - (string-append dir "/" file)))) - (find-files "." "")))))) - (native-inputs `(("source" ,source) - ("tar" ,tar) - ("gzip" ,gzip))) + (string-append font-dir "/" + (basename file)))) + (filter + (lambda (file) (string-suffix? "ttf" file)) + (find-files "." ""))))))) + #:test-target "tests")) + ;; replace python 3 with python 2 + ;; python 3 support commits aren't yet released in 20120503 + ;; so freefont needs python 2 support in fontforge + (native-inputs `(("fontforge" ,(package (inherit fontforge) + (inputs `(("python-2" ,python-2) + ,@(package-inputs fontforge))))))) (home-page "http://www.gnu.org/software/freefont/") (synopsis "Unicode-encoded outline fonts") (description -- 1.9.1