Subject: [PATCH 18/18] gnu: font-xfree86-type1: Update to 1.0.5.

From: Timotej Lazar <[email-masked]>
Date: Mon, 12 Jun 2023 22:53:33 +0200

* 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.
---
 gnu/packages/xorg.scm | 30 ++++++------------------------
 1 file 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 @@ (define-public encodings
     (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 @@ (define-public font-winitzki-cyrillic
 (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))
-- 
2.40.1