From unknown Tue Jun 17 01:43:35 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75185] [PATCH] gnu: plan9port: Fix fontsrv and font substitutes. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Dec 2024 02:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 75185 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75185@debbugs.gnu.org Cc: Homo X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173552696214585 (code B ref -1); Mon, 30 Dec 2024 02:50:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Dec 2024 02:49:22 +0000 Received: from localhost ([127.0.0.1]:56787 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tS5qM-0003nA-6a for submit@debbugs.gnu.org; Sun, 29 Dec 2024 21:49:22 -0500 Received: from lists.gnu.org ([209.51.188.17]:43190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tS5qJ-0003mz-Nm for submit@debbugs.gnu.org; Sun, 29 Dec 2024 21:49:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tS5q9-0005jJ-47 for guix-patches@gnu.org; Sun, 29 Dec 2024 21:49:09 -0500 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tS5q6-0001rW-AX for guix-patches@gnu.org; Sun, 29 Dec 2024 21:49:08 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id C752B25B78; Mon, 30 Dec 2024 03:49:01 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id kaIuVmyN_8wh; Mon, 30 Dec 2024 03:48:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1735526937; bh=Q5CwqsRHcrFRxb81eURtBUxnGkoTrdEx2JgblwSBt6w=; h=From:To:Cc:Subject:Date; b=DFbdmi3MG40eLIR5ihvrpBaQmj6NAFP0WBtz7ILhbReL5fvp18O0RA6V+Ilpm4B0i 6kH6tb3i92iQSYCvb3UAZNFATWpUjakzD8sUbGu1Q9FkNepEYCxBAiP53kxhF5UX2z mmRvVd830cF/QcgknzRAv/xYZNPqdNq2Y8Kb7h/jL1Py24F+AUEp6nfFcI/cB5Xpcz 3j73GOs/jccvBBl3ECVvwrPFU+u1/iSommv/EVSwZcjT35GEIJkwswkBoailEj0qb0 gPxtmGs0yiF7A1upFcJSx/ALOlJYnN+PK0PI+TJpcXfyQgQkNjL8u7Vba3RbNv0mvs pK1zwxcnvacaA== From: Homo Date: Mon, 30 Dec 2024 04:48:39 +0200 Message-ID: <20241230024839.25186-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=gay@disroot.org; helo=layka.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) src/libdraw/openfont.c already substitutes "/lib/font/bit/" to "$PLAN9/font/", so it's not necessary to do that in [arguments]. * gnu/packages/patches/plan9port-fontsrv.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/plan9.scm (plan9port)[source]: Use it. [arguments] Remove "/lib/font/bit" substitute and substitute more fonts. Change-Id: Ic99b5ed29e13bcdfde62e065fb189a9c6b5a9580 --- gnu/local.mk | 1 + gnu/packages/patches/plan9port-fontsrv.patch | 30 ++++++++++++++++ gnu/packages/plan9.scm | 36 +++++++++++++++----- 3 files changed, 58 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/plan9port-fontsrv.patch diff --git a/gnu/local.mk b/gnu/local.mk index 84160f407a..5e37af1d8a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1959,6 +1959,7 @@ dist_patch_DATA = \ %D%/packages/patches/pdfpc-build-with-vala-0.56.patch \ %D%/packages/patches/pdl-2.019-glut-bitmap-fonts.patch \ %D%/packages/patches/petri-foo-0.1.87-fix-recent-file-not-exist.patch \ + %D%/packages/patches/plan9port-fontsrv.patch \ %D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \ %D%/packages/patches/plasp-fix-normalization.patch \ %D%/packages/patches/plasp-include-iostream.patch \ diff --git a/gnu/packages/patches/plan9port-fontsrv.patch b/gnu/packages/patches/plan9port-fontsrv.patch new file mode 100644 index 0000000000..60620508f4 --- /dev/null +++ b/gnu/packages/patches/plan9port-fontsrv.patch @@ -0,0 +1,30 @@ +Remove unnecessary check that prevents fontsrv from building. + +diff --git a/INSTALL b/INSTALL +index bfc08d52..c84e750c 100755 +--- a/INSTALL ++++ b/INSTALL +@@ -112,23 +112,6 @@ if [ `uname` = Darwin ]; then + rm -f ./a.out + fi + +-if [ `uname` != Darwin ]; then +- # Determine whether fontsrv X11 files are available. +- rm -f a.out +- cc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \ +- -I/usr/X11R7/include -I/usr/X11R7/include/freetype2 \ +- -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 src/cmd/fontsrv/x11.c >/dev/null 2>&1 +- if [ -f a.out ]; then +- echo " fontsrv dependencies found." +- echo "FONTSRV=fontsrv" >>$PLAN9/config +- else +- echo " fontsrv dependencies not found." +- echo "FONTSRV=" >>$PLAN9/config +- rm -f bin/fontsrv +- fi +- rm -f a.out +-fi +- + if [ -f LOCAL.config ]; then + echo Using LOCAL.config options: + sed 's/^/ /' LOCAL.config diff --git a/gnu/packages/plan9.scm b/gnu/packages/plan9.scm index 5f6a47d5a7..f83e8c62bf 100644 --- a/gnu/packages/plan9.scm +++ b/gnu/packages/plan9.scm @@ -24,6 +24,7 @@ (define-module (gnu packages plan9) #:use-module (guix gexp) #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages fontutils) @@ -104,6 +105,7 @@ (define-public plan9port (sha256 (base32 "01343jvn8kr63i78h8xlgscn6wihdsr44xzh1cylvhigjbqw8n2x")) + (patches (search-patches "plan9port-fontsrv.patch")) (modules '((guix build utils))) (snippet #~(for-each delete-file-recursively '("font/luc" ;nonfree @@ -118,16 +120,32 @@ (define-public plan9port (lambda _ (let ((dest (string-append #$output "/plan9"))) (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"))) -- 2.47.1 From unknown Tue Jun 17 01:43:35 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75185] [PATCH] gnu: plan9port: Fix fontsrv and font substitutions. References: <20241230024839.25186-1-gay@disroot.org> In-Reply-To: <20241230024839.25186-1-gay@disroot.org> Resent-From: gay@disroot.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Dec 2024 03:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75185 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75185@debbugs.gnu.org Received: via spool by 75185-submit@debbugs.gnu.org id=B75185.173552947122019 (code B ref 75185); Mon, 30 Dec 2024 03:32:01 +0000 Received: (at 75185) by debbugs.gnu.org; 30 Dec 2024 03:31:11 +0000 Received: from localhost ([127.0.0.1]:56850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tS6Uo-0005j5-Je for submit@debbugs.gnu.org; Sun, 29 Dec 2024 22:31:10 -0500 Received: from layka.disroot.org ([178.21.23.139]:44814) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tS6Ui-0005ia-Oy for 75185@debbugs.gnu.org; Sun, 29 Dec 2024 22:31:09 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 20D6B25984 for <75185@debbugs.gnu.org>; Mon, 30 Dec 2024 04:31:02 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 1xlKeHUbLvT3 for <75185@debbugs.gnu.org>; Mon, 30 Dec 2024 04:30:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1735529457; bh=Bz1cZfAfS5xFxrWSgOOivaPzf91svwCHe/oRLG1EhxQ=; h=Date:From:To:Subject; b=HAA+2K8AInffXar20Je8GwLU/d95+EHwyS3edE50vSHq5KC4R/rWEB1KCHbkqd1kt CF186Gn+cQ1hJZt0EJnX0yDEDJrGRzYuUeJbasSwYhLtvZt2gtyRu8BtBNeMf+h+Gs wlsAUSUnB9msMhj96y6bdj3UMjrsOWhFxNJoH1tA5K4IvBF2RWGxB8DPde5QUoUj6+ yTQe1XSfauhGbyhGuipq/4vgGz+jCetdxQ4gvq87rBm0M01zaf2C9NLGwCGkS7zRrG Vgm0RsuLpmJCIOP4ybOzzh67ceQ0WWHZnKkVb5mW1L60jQhJQb5RuclyG5DhwS7imo ezrkpCo2WgiXA== MIME-Version: 1.0 Date: Mon, 30 Dec 2024 03:30:57 +0000 From: gay@disroot.org Message-ID: X-Sender: gay@disroot.org Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) I forgot to mention the reasoning for using bigger fonts - because removed fonts aren't so tiny. From unknown Tue Jun 17 01:43:35 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Homo Subject: bug#75185: closed (Re: [bug#75185] [PATCH] gnu: plan9port: Fix fontsrv and font substitutes.) Message-ID: References: <87ikr1ojd7.fsf@envs.net> <20241230024839.25186-1-gay@disroot.org> X-Gnu-PR-Message: they-closed 75185 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 75185@debbugs.gnu.org Date: Mon, 30 Dec 2024 04:58:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1735534682-4063-1" This is a multi-part message in MIME format... ------------=_1735534682-4063-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #75185: [PATCH] gnu: plan9port: Fix fontsrv and font substitutes. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 75185@debbugs.gnu.org. --=20 75185: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D75185 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1735534682-4063-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 75185-done) by debbugs.gnu.org; 30 Dec 2024 04:57:35 +0000 Received: from localhost ([127.0.0.1]:56953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tS7qQ-00012l-Pr for submit@debbugs.gnu.org; Sun, 29 Dec 2024 23:57:35 -0500 Received: from mail.envs.net ([5.199.136.28]:42768) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tS7qO-00012d-Pb for 75185-done@debbugs.gnu.org; Sun, 29 Dec 2024 23:57:33 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 583A938A3E20; Mon, 30 Dec 2024 04:57:32 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id EIQ2iw0l6dvH; Mon, 30 Dec 2024 04:57:29 +0000 (UTC) Received: from localhost (unknown [112.44.106.216]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Mon, 30 Dec 2024 04:57:29 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 5d551522; Mon, 30 Dec 2024 05:00:36 +0000 (UTC) From: =?utf-8?B?5a6L5paH5q2m?= To: Homo Subject: Re: [bug#75185] [PATCH] gnu: plan9port: Fix fontsrv and font substitutes. In-Reply-To: <20241230024839.25186-1-gay@disroot.org> (Homo's message of "Mon, 30 Dec 2024 04:48:39 +0200") References: <20241230024839.25186-1-gay@disroot.org> Date: Mon, 30 Dec 2024 13:00:36 +0800 Message-ID: <87ikr1ojd7.fsf@envs.net> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75185-done Cc: 75185-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Homo writes: > src/libdraw/openfont.c already substitutes "/lib/font/bit/" to "$PLAN9/font/", > so it's not necessary to do that in [arguments]. > > * gnu/packages/patches/plan9port-fontsrv.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register it. > * gnu/packages/plan9.scm (plan9port)[source]: Use it. > [arguments] Remove "/lib/font/bit" substitute and substitute more fonts. I replace the patch with a 'substitute' to remove 'rm -f bin/fontsrv' in INSTALL, pushed to master now, thank you! ------------=_1735534682-4063-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 30 Dec 2024 02:49:22 +0000 Received: from localhost ([127.0.0.1]:56787 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tS5qM-0003nA-6a for submit@debbugs.gnu.org; Sun, 29 Dec 2024 21:49:22 -0500 Received: from lists.gnu.org ([209.51.188.17]:43190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tS5qJ-0003mz-Nm for submit@debbugs.gnu.org; Sun, 29 Dec 2024 21:49:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tS5q9-0005jJ-47 for guix-patches@gnu.org; Sun, 29 Dec 2024 21:49:09 -0500 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tS5q6-0001rW-AX for guix-patches@gnu.org; Sun, 29 Dec 2024 21:49:08 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id C752B25B78; Mon, 30 Dec 2024 03:49:01 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id kaIuVmyN_8wh; Mon, 30 Dec 2024 03:48:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1735526937; bh=Q5CwqsRHcrFRxb81eURtBUxnGkoTrdEx2JgblwSBt6w=; h=From:To:Cc:Subject:Date; b=DFbdmi3MG40eLIR5ihvrpBaQmj6NAFP0WBtz7ILhbReL5fvp18O0RA6V+Ilpm4B0i 6kH6tb3i92iQSYCvb3UAZNFATWpUjakzD8sUbGu1Q9FkNepEYCxBAiP53kxhF5UX2z mmRvVd830cF/QcgknzRAv/xYZNPqdNq2Y8Kb7h/jL1Py24F+AUEp6nfFcI/cB5Xpcz 3j73GOs/jccvBBl3ECVvwrPFU+u1/iSommv/EVSwZcjT35GEIJkwswkBoailEj0qb0 gPxtmGs0yiF7A1upFcJSx/ALOlJYnN+PK0PI+TJpcXfyQgQkNjL8u7Vba3RbNv0mvs pK1zwxcnvacaA== From: Homo To: guix-patches@gnu.org Subject: [PATCH] gnu: plan9port: Fix fontsrv and font substitutes. Date: Mon, 30 Dec 2024 04:48:39 +0200 Message-ID: <20241230024839.25186-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=gay@disroot.org; helo=layka.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Homo X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) src/libdraw/openfont.c already substitutes "/lib/font/bit/" to "$PLAN9/font/", so it's not necessary to do that in [arguments]. * gnu/packages/patches/plan9port-fontsrv.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/plan9.scm (plan9port)[source]: Use it. [arguments] Remove "/lib/font/bit" substitute and substitute more fonts. Change-Id: Ic99b5ed29e13bcdfde62e065fb189a9c6b5a9580 --- gnu/local.mk | 1 + gnu/packages/patches/plan9port-fontsrv.patch | 30 ++++++++++++++++ gnu/packages/plan9.scm | 36 +++++++++++++++----- 3 files changed, 58 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/plan9port-fontsrv.patch diff --git a/gnu/local.mk b/gnu/local.mk index 84160f407a..5e37af1d8a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1959,6 +1959,7 @@ dist_patch_DATA = \ %D%/packages/patches/pdfpc-build-with-vala-0.56.patch \ %D%/packages/patches/pdl-2.019-glut-bitmap-fonts.patch \ %D%/packages/patches/petri-foo-0.1.87-fix-recent-file-not-exist.patch \ + %D%/packages/patches/plan9port-fontsrv.patch \ %D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \ %D%/packages/patches/plasp-fix-normalization.patch \ %D%/packages/patches/plasp-include-iostream.patch \ diff --git a/gnu/packages/patches/plan9port-fontsrv.patch b/gnu/packages/patches/plan9port-fontsrv.patch new file mode 100644 index 0000000000..60620508f4 --- /dev/null +++ b/gnu/packages/patches/plan9port-fontsrv.patch @@ -0,0 +1,30 @@ +Remove unnecessary check that prevents fontsrv from building. + +diff --git a/INSTALL b/INSTALL +index bfc08d52..c84e750c 100755 +--- a/INSTALL ++++ b/INSTALL +@@ -112,23 +112,6 @@ if [ `uname` = Darwin ]; then + rm -f ./a.out + fi + +-if [ `uname` != Darwin ]; then +- # Determine whether fontsrv X11 files are available. +- rm -f a.out +- cc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \ +- -I/usr/X11R7/include -I/usr/X11R7/include/freetype2 \ +- -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 src/cmd/fontsrv/x11.c >/dev/null 2>&1 +- if [ -f a.out ]; then +- echo " fontsrv dependencies found." +- echo "FONTSRV=fontsrv" >>$PLAN9/config +- else +- echo " fontsrv dependencies not found." +- echo "FONTSRV=" >>$PLAN9/config +- rm -f bin/fontsrv +- fi +- rm -f a.out +-fi +- + if [ -f LOCAL.config ]; then + echo Using LOCAL.config options: + sed 's/^/ /' LOCAL.config diff --git a/gnu/packages/plan9.scm b/gnu/packages/plan9.scm index 5f6a47d5a7..f83e8c62bf 100644 --- a/gnu/packages/plan9.scm +++ b/gnu/packages/plan9.scm @@ -24,6 +24,7 @@ (define-module (gnu packages plan9) #:use-module (guix gexp) #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages fontutils) @@ -104,6 +105,7 @@ (define-public plan9port (sha256 (base32 "01343jvn8kr63i78h8xlgscn6wihdsr44xzh1cylvhigjbqw8n2x")) + (patches (search-patches "plan9port-fontsrv.patch")) (modules '((guix build utils))) (snippet #~(for-each delete-file-recursively '("font/luc" ;nonfree @@ -118,16 +120,32 @@ (define-public plan9port (lambda _ (let ((dest (string-append #$output "/plan9"))) (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"))) -- 2.47.1 ------------=_1735534682-4063-1--