From fd6e8c5056b8b1fda7c07a532cffdc2798de37ce Mon Sep 17 00:00:00 2001 From: Homo Date: Mon, 30 Dec 2024 04:48:39 +0200 Subject: [PATCH] gnu: plan9port: Fix fontsrv and font substitutes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit src/libdraw/openfont.c already substitutes "/lib/font/bit/" to "$PLAN9/font/", so it's not necessary to do that ourself. * gnu/packages/plan9.scm (plan9port)[arguments]: Don't remove 'fontsrv' in INSTALL. Remove "/lib/font/bit" substitute and substitute more fonts. Change-Id: Ic99b5ed29e13bcdfde62e065fb189a9c6b5a9580 Signed-off-by: 宋文武 --- gnu/packages/plan9.scm | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/gnu/packages/plan9.scm b/gnu/packages/plan9.scm index 5f6a47d5a72..692e691ea0c 100644 --- a/gnu/packages/plan9.scm +++ b/gnu/packages/plan9.scm @@ -117,17 +117,36 @@ reconstruct a Plan 9 terminal-like experience from a non-Plan 9 system.") (add-after 'unpack 'setup (lambda _ (let ((dest (string-append #$output "/plan9"))) + (substitute* "INSTALL" + ;; Install fontsrv, which is enabled in LOCAL.config. + (("rm -f bin/fontsrv") "")) (delete-file "src/cmd/mk/mk.pdf") + ;; TODO: substitute font in src/cmd/venti/srv/graph.c (substitute* "src/cmd/acme/acme.c" - (("/lib/font/bit/lucsans/euro.8.font") - (string-append dest - "/font/fixed/unicode.5x8.font")) - (("/lib/font/bit/lucm/unicode.9.font") - (string-append dest - "/font/fixed/unicode.6x9.font"))) - (substitute* (find-files "src") - (("/lib/font/bit") - (string-append dest "/font"))) + (("lucsans/euro.8.font") + "fixed/unicode.8x13.font") + (("lucm/unicode.9.font") + "fixed/unicode.9x15B.font")) + (substitute* "src/cmd/mnihongo/mnihongo.c" + (("pelm/unicode.9x24.font") + "fixed/unicode.10x20.font")) + (substitute* "src/cmd/rio/winwatch.c" + (("lucsans/unicode.8.font") + "fixed/unicode.8x13.font")) + (substitute* "src/cmd/draw/stats.c" + (("pelm/latin1.8.font") + "fixed/unicode.8x13.font")) + (substitute* "src/cmd/faces/main.c" + (("pelm/latin1.8.font") + "fixed/unicode.8x13.font")) + (substitute* "src/cmd/fossil/view.c" + (("lucsans/unicode.8.font") + "fixed/unicode.8x13.font") + (("lucidasans/unicode.8.font") + "fixed/unicode.8x13.font")) + (substitute* "src/cmd/scat/plot.c" + (("luc/unicode.6.font") + "fixed/unicode.6x9.font")) (substitute* "bin/9c" (("which") (which "which")))