From 6aa00f4084610d083ea7ac7c9ad53f9d25cb4e53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 22 Jan 2026 16:49:56 +0100 Subject: [PATCH] gnu: ttf2pt1: Modernize. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fontutils.scm (ttf2pt1)[source, arguments]: Use gexps. Change-Id: I1974419be8a95823e29c45bd4c25c16e099002e0 Signed-off-by: Ludovic Courtès Merges: #5826 --- gnu/packages/fontutils.scm | 58 +++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index d6743c26fca..3f24ffc2cf3 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -1316,38 +1316,38 @@ TTF (TrueType/OpenType Font) files.") "1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf")) (modules '((guix build utils))) (snippet - '(begin - ;; Include for the 'getopt' declaration. - (substitute* "t1asm.c" - (("#include " all) - (string-append all "\n" - "#include \n"))) + #~(begin + ;; Include for the 'getopt' declaration. + (substitute* "t1asm.c" + (("#include " all) + (string-append all "\n" + "#include \n"))) - ;; Remove trailing backslashes in the sed expression of the - ;; 'install' rule since sed would otherwise fail. - (substitute* "Makefile" - (("\\|;\\\\[[:space:]]*$") "|; ")) - #t)))) + ;; Remove trailing backslashes in the sed expression of the + ;; 'install' rule since sed would otherwise fail. + (substitute* "Makefile" + (("\\|;\\\\[[:space:]]*$") "|; ")) + #t)))) (build-system gnu-build-system) (arguments - '(#:tests? #f ;no tests - #:phases (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile" - (("INSTDIR =.*") - (string-append "INSTDIR = " out "\n")) - (("OWNER = .*") - "OWNER = `id -un`\n") - (("GROUP = .*") - "GROUP = `id -g`\n")) - #t))) - (replace 'build - (lambda _ - (invoke "make" "-j" - (number->string (parallel-job-count)) - "all" "CC=gcc")))))) + (list #:tests? #f ;no tests + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile" + (("INSTDIR =.*") + (string-append "INSTDIR = " out "\n")) + (("OWNER = .*") + "OWNER = `id -un`\n") + (("GROUP = .*") + "GROUP = `id -g`\n")) #t))) + (replace 'build + (lambda _ + (invoke "make" "-j" + (number->string (parallel-job-count)) + "all" "CC=gcc")))))) (inputs (list perl)) (synopsis "Convert TrueType fonts to Postscript Type 1") (description