me
/
guix
Archived
1
0
Fork 0

gnu: font-xfree86-type1: Update to 1.0.5.

* gnu/packages/xorg.scm (font-xfree86-type1): Update to 1.0.5.
[source]: Drop upstreamed snippet.
(xorg-font-origin): Drop obsolete macro.
(%xorg-font-origin): Drop unused procedure.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
master
Timotej Lazar 2023-06-12 22:53:33 +02:00 committed by Ludovic Courtès
parent bb0d93c810
commit d47a0d7fec
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 24 deletions

View File

@ -468,26 +468,6 @@ Resources file.")
(description "Xorg font encoding files.") (description "Xorg font encoding files.")
(license license:public-domain))) (license license:public-domain)))
(define (%xorg-font-origin font version hash)
(origin
(method url-fetch)
(uri (string-append "mirror://xorg/individual/font/" font "-"
version ".tar.bz2"))
(sha256 hash)
(modules '((guix build utils)))
(snippet
;; Do not include timestamps in '.pcf.gz' files.
'(begin
(substitute* "Makefile.in"
(("^COMPRESS = (.*)$" _ rest)
(string-append "COMPRESS = " (string-trim-right rest)
" --no-name\n")))
#t))))
(define-syntax-rule (xorg-font-origin font version hash)
"Expand to the 'origin' form for the given Xorg font package."
(%xorg-font-origin font version (base32 hash)))
(define-public font-adobe100dpi (define-public font-adobe100dpi
(package (package
(name "font-adobe100dpi") (name "font-adobe100dpi")
@ -893,10 +873,12 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
(define-public font-xfree86-type1 (define-public font-xfree86-type1
(package (package
(name "font-xfree86-type1") (name "font-xfree86-type1")
(version "1.0.4") (version "1.0.5")
(source (xorg-font-origin (source (origin
name version (method url-fetch)
"0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya")) (uri (string-append "mirror://xorg/individual/font/"
"font-xfree86-type1-" version ".tar.xz"))
(sha256 "0ds8xbgxy9h0bqn2p38vylfzn8cqkp7n51kwmw1c18ayi9w2qg59")))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list mkfontdir mkfontscale)) (list mkfontdir mkfontscale))