@@ -55,7 +55,7 @@
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Ahmad Draidi <a.r.draidi@redscript.org>
;;; Copyright © 2023 Arnaud Lechevallier <arnaud.lechevallier@free.fr>
-;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
+;;; Copyright © 2023, 2024 gemmaro <gemmaro.dev@gmail.com>
;;; Copyright © 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
;;; Copyright © 2023 chris <chris@bumblehead.com>
;;; Copyright © 2023, 2024 Luis Felipe López Acevedo <sirgazil@zoho.com>
@@ -1065,7 +1065,7 @@ (define-public font-anonymous-pro-minus
(define-public font-gnu-unifont
(package
(name "font-gnu-unifont")
- (version "15.1.05")
+ (version "16.0.01")
(source
(origin
(method url-fetch)
@@ -1075,11 +1075,16 @@ (define-public font-gnu-unifont
(string-append "mirror://gnu/unifont/unifont-"
version "/unifont-" version ".tar.gz")))
(sha256
- (base32 "1yi33kxlgw7ds99za5bclh537sw8ggl94nrhhq7hwxaq8dgzaxfj"))
+ (base32 "0l3sv12s0n70ddj2g3g2rdmsqrdc5m1gqbylaj1qq8skryw80qax"))
(snippet
'(begin
(use-modules (guix build utils))
- (delete-file-recursively "font/precompiled")))))
+ (delete-file-recursively "font/precompiled")
+ ;; Skip thumbnail generation as it requires ImageMagick and the generated
+ ;; thumbnails will not be installed.
+ (substitute* "font/Makefile"
+ (("^(compiled-files:.+)thumbnails(.+)" _ pre post)
+ (string-append pre post "\n")))))))
(build-system gnu-build-system)
(outputs '("out" ; TrueType/OpenType version
"pcf" ; PCF (bitmap) version
@@ -1097,7 +1102,7 @@ (define-public font-gnu-unifont
(add-after 'unpack 'patch-source
(lambda _
(substitute* (find-files "." "Makefile")
- (("/bin/sh -s") (string-append (which "sh") " -s")))))
+ (("/bin/sh\\b") (which "sh")))))
(replace 'install
(lambda* (#:key make-flags outputs #:allow-other-keys)
(let* ((ttf (string-append (assoc-ref outputs "out")