mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-11 13:49:23 -05:00
gnu: font-gnu-freefont: Build with an older version of FontForge.
Fixes <https://bugs.gnu.org/40819>. Reported by Jack Hill <jackhill@jackhill.us>. * gnu/packages/fontutils.scm (fontforge-20190801): New public variable. * gnu/packages/fonts.scm (font-gnu-freefont)[native-inputs]: Change from inherited FontForge variant to FONTFORGE-20190801.
This commit is contained in:
parent
f568581c2b
commit
4affa9182d
2 changed files with 33 additions and 8 deletions
|
@ -12,7 +12,7 @@
|
||||||
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
|
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
|
||||||
;;; Copyright © 2016 Dmitry Nikolaev <cameltheman@gmail.com>
|
;;; Copyright © 2016 Dmitry Nikolaev <cameltheman@gmail.com>
|
||||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
|
;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||||
;;; Copyright © 2016 Toni Reina <areina@riseup.net>
|
;;; Copyright © 2016 Toni Reina <areina@riseup.net>
|
||||||
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2017 José Miguel Sánchez García <jmi2k@openmailbox.com>
|
;;; Copyright © 2017 José Miguel Sánchez García <jmi2k@openmailbox.com>
|
||||||
|
@ -236,6 +236,8 @@ (define-public font-lato
|
||||||
(define-public font-gnu-freefont
|
(define-public font-gnu-freefont
|
||||||
(package
|
(package
|
||||||
(name "font-gnu-freefont")
|
(name "font-gnu-freefont")
|
||||||
|
;; Note: Remove the special FontForge input and package once the 2020
|
||||||
|
;; release is out.
|
||||||
(version "20120503")
|
(version "20120503")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -289,12 +291,8 @@ (define-public font-gnu-freefont
|
||||||
(lambda (file) (string-suffix? "woff" file))
|
(lambda (file) (string-suffix? "woff" file))
|
||||||
(find-files "." "")))))))
|
(find-files "." "")))))))
|
||||||
#:test-target "tests"))
|
#:test-target "tests"))
|
||||||
;; replace python 3 with python 2
|
;; FreeFont anno 2012 requires a FontForge built with Python 2.
|
||||||
;; python 3 support commits aren't yet released in 20120503
|
(native-inputs `(("fontforge" ,fontforge-20190801)))
|
||||||
;; so freefont needs python 2 support in fontforge
|
|
||||||
(native-inputs `(("fontforge" ,(package (inherit fontforge)
|
|
||||||
(inputs `(("python-2" ,python-2)
|
|
||||||
,@(package-inputs fontforge)))))))
|
|
||||||
(home-page "https://www.gnu.org/software/freefont/")
|
(home-page "https://www.gnu.org/software/freefont/")
|
||||||
(synopsis "Unicode-encoded outline fonts")
|
(synopsis "Unicode-encoded outline fonts")
|
||||||
(description
|
(description
|
||||||
|
|
|
@ -60,7 +60,9 @@ (define-module (gnu packages fontutils)
|
||||||
#:use-module (guix build-system cmake)
|
#:use-module (guix build-system cmake)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (guix build-system python)
|
#:use-module (guix build-system python)
|
||||||
#:use-module (guix build-system meson))
|
#:use-module (guix build-system meson)
|
||||||
|
#:use-module (guix utils)
|
||||||
|
#:use-module (srfi srfi-1))
|
||||||
|
|
||||||
(define-public freetype
|
(define-public freetype
|
||||||
(package
|
(package
|
||||||
|
@ -640,6 +642,31 @@ (define-public fontforge
|
||||||
(license license:gpl3+)
|
(license license:gpl3+)
|
||||||
(home-page "https://fontforge.github.io")))
|
(home-page "https://fontforge.github.io")))
|
||||||
|
|
||||||
|
;; This is the last version that supports Python 2, which is needed for
|
||||||
|
;; GNU FreeFont. Remove once no longer required.
|
||||||
|
(define-public fontforge-20190801
|
||||||
|
(package
|
||||||
|
(inherit fontforge)
|
||||||
|
(version "20190801")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"https://github.com/fontforge/fontforge/releases/download/"
|
||||||
|
version "/fontforge-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32 "0lh8yx01asbzxm6car5cfi64njh5p4lxc7iv8dldr5rwg357a86r"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
(substitute-keyword-arguments (package-arguments fontforge)
|
||||||
|
((#:configure-flags _)
|
||||||
|
''())
|
||||||
|
((#:phases phases)
|
||||||
|
`(modify-phases ,phases
|
||||||
|
(delete 'do-not-override-RPATH)))))
|
||||||
|
(inputs
|
||||||
|
`(("python" ,python-2)
|
||||||
|
,@(alist-delete "python" (package-inputs fontforge))))))
|
||||||
|
|
||||||
(define-public python2-ufolib
|
(define-public python2-ufolib
|
||||||
(package
|
(package
|
||||||
(name "python2-ufolib")
|
(name "python2-ufolib")
|
||||||
|
|
Loading…
Reference in a new issue