summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimotej Lazar <timotej.lazar@araneo.si>2023-06-12 22:53:33 +0200
committerLudovic Courtès <ludo@gnu.org>2023-06-18 23:32:32 +0200
commitd47a0d7feca3066a1bd6daa3c3dcfd451278d069 (patch)
treea26ac512453fc70c3309d605a20b170a2502ce2b
parentbb0d93c810e475eeefdfd1880caa533138442bdb (diff)
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>
-rw-r--r--gnu/packages/xorg.scm30
1 files changed, 6 insertions, 24 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index ed3e6e0907..e41ddea28f 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -468,26 +468,6 @@ Resources file.")
(description "Xorg font encoding files.")
(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
(package
(name "font-adobe100dpi")
@@ -893,10 +873,12 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
(define-public font-xfree86-type1
(package
(name "font-xfree86-type1")
- (version "1.0.4")
- (source (xorg-font-origin
- name version
- "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"))
+ (version "1.0.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://xorg/individual/font/"
+ "font-xfree86-type1-" version ".tar.xz"))
+ (sha256 "0ds8xbgxy9h0bqn2p38vylfzn8cqkp7n51kwmw1c18ayi9w2qg59")))
(build-system gnu-build-system)
(inputs
(list mkfontdir mkfontscale))