From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id iDqiGGsKcmeQTgEAe85BDQ:P1 (envelope-from ) for ; Mon, 30 Dec 2024 02:50:19 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id iDqiGGsKcmeQTgEAe85BDQ (envelope-from ) for ; Mon, 30 Dec 2024 03:50:19 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=ZA2v0EGC; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=DFbdmi3M; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735527019; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=UBdoEkBGxaCB9vHxmTPEHe/cgV+r7Eh3D5/deW/rgjc=; b=b/wJWrilvOvZorSDSDkKTH4421QaRb9puLYeIBbMFNXWVJmPxFRHUpu5Vi/MeFNxdWbaXS PXUf93YyUfnZKFV8gz0bnAL+ZjNYrANhiJJ8f8yp0B8DLIRmdK1BupZwZt5qjujUqE4MKL xm8AqW8DVV7XlrXho0/PtZ//3JGhssXVtU6hTzjbYXyfa+iZLDzT8pr4ldhiu3MQ1e3O0A bomi+SeK/lZzlRr1arGV08bFQqvIxNGNYSBP2GLgXVwLBhHBpaQL87pWFkbAZI6vmfk2jN kYMMOAL5w2QxAxdUx2hEmXPAxNQf+3i6rMJ8ZxENSXxoWVc6CZT9aDfdnWA/vw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=ZA2v0EGC; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=DFbdmi3M; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1735527019; a=rsa-sha256; cv=none; b=CKDzWYs+mhgoOHb1m4jq2jhM1rAaIu8p8ciu5lrmfn4+DSmpKhLABdnN7beiCZk4ErNjPE /jXCtjeMnRY9I/tyz20IX4CB2vuZsmLaiyTWH+suD4qd7AMDFPieY6Hb9QgJMed5Hcm3Cp AoKc0kEf4MWLbALgnViJt+4HgpYGO2EWLChU7wdgvRkJIqSrHiHcYdol+d8d8yCdh96r/M 7Q6R+cIaNDzROARGwyFuzu8ywMAZZKgANH8wy2QUVdGZhnfMU8uBoHcLcF73MvXRT3Ec2q y6/1nUmbV1dNvHVXPxTeWo7W6v+zsILJgbvNQbijC4T3ifHvTimYcGLjVNvr2Q== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E391F4A1D for ; Mon, 30 Dec 2024 03:50:18 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tS5r6-0005lf-5Y; Sun, 29 Dec 2024 21:50:08 -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 1tS5r2-0005lK-GS for guix-patches@gnu.org; Sun, 29 Dec 2024 21:50:05 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tS5r0-0001vN-LC for guix-patches@gnu.org; Sun, 29 Dec 2024 21:50:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=UBdoEkBGxaCB9vHxmTPEHe/cgV+r7Eh3D5/deW/rgjc=; b=ZA2v0EGClTQmqN/p1kThrTNx1CeXPwWLcwfiQOXSpoopb1Qsy5NFlzL9XvQ8munSJ+dyo6OkC5rdj0hw05RvILWLEYiDeira3vzF2ewtKjk5PUZUk4o3EtR9rr3IjZEMLer+KECWRAooBsTHanBrktzCpVEex/nMAXQy7/bRMcBHeAYxzKPbCAjqgq8EC7xyo11hWXUGl5BO7vCupie7zOgdMnDTiB2nWVg30Z4qklKTqia8un+PBMvkrp4OUTJw5lnOm6tw2O0qb89d07ikTBUC0bsXjh+thXQLuKH35flNJ1osInqxHvLjuPUHaiTtyIn1At5ukytIrmunAEfKlQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tS5r0-0003oV-D7 for guix-patches@gnu.org; Sun, 29 Dec 2024 21:50:02 -0500 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== 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Homo X-ACL-Warn: , Homo via Guix-patches From: Homo via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: 1.30 X-Spam-Score: 1.30 X-Migadu-Queue-Id: E391F4A1D X-TUID: ZBqeNzJA7Ucl 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