me
/
guix
Archived
1
0
Fork 0

gnu: font-fantasque-sans: Update to 1.8.0.

* gnu/packages/fonts.scm (font-fantasque-sans): Update to 1.8.0.
[native-inputs]: Remove ttf2eot.
[arguments]: Rename the ‘xrange->range’ phase to ‘support-python@3’.  Patch another Python twoism.
master
Tobias Geerinckx-Rice 2020-01-08 16:51:05 +01:00
parent 679d41b440
commit 0d197a63d1
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 8 additions and 7 deletions

View File

@ -781,7 +781,7 @@ It contains the following fonts and styles:
(define-public font-fantasque-sans (define-public font-fantasque-sans
(package (package
(name "font-fantasque-sans") (name "font-fantasque-sans")
(version "1.7.2") (version "1.8.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -790,26 +790,27 @@ It contains the following fonts and styles:
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "17l18488qyl9gdj80r8pcym3gp3jkgsdikwalnrp5rgvwidqx507"))))
"1gjranq7qf20rfxnpxsckv1hl35nzsal0rjs475nhfbpqy5wmly6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("ttfautohint" ,ttfautohint) `(("ttfautohint" ,ttfautohint)
("woff-tools" ,woff-tools) ("woff-tools" ,woff-tools)
("fontforge" ,fontforge) ("fontforge" ,fontforge)
("woff2" ,woff2) ("woff2" ,woff2)
("ttf2eot" ,ttf2eot)
("zip" ,zip))) ("zip" ,zip)))
(arguments (arguments
`(#:tests? #f ;test target intended for visual inspection `(#:tests? #f ;test target intended for visual inspection
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(delete 'configure) ;no configuration (delete 'configure) ;no configuration
(add-before 'build 'xrange->range (add-before 'build 'support-python@3
;; Rather than use a python2 fontforge, just replace the ;; Rather than use a Python 2 fontforge, replace Python-2-
;; offending function. ;; specific code with a passable Python 3 equivalent.
(lambda _ (lambda _
(substitute* "Scripts/fontbuilder.py" (substitute* "Scripts/fontbuilder.py"
(("xrange") "range")) (("xrange") "range"))
(substitute* "Scripts/features.py"
(("f\\.write\\(fea_code\\)")
"f.write(str.encode(fea_code))"))
#t)) #t))
(replace 'install (replace 'install
;; 'make install' wants to install to ~/.fonts, install to ;; 'make install' wants to install to ~/.fonts, install to