From patchwork Wed Jan 22 13:56:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ashvith Shetty X-Patchwork-Id: 37591 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B975727BBEA; Wed, 22 Jan 2025 13:58:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CE92927BBE2 for ; Wed, 22 Jan 2025 13:58:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tabF5-00036W-Tp; Wed, 22 Jan 2025 08:58:03 -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 1tabF4-00035v-Pq for guix-patches@gnu.org; Wed, 22 Jan 2025 08:58:03 -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 1tabF4-0004Jf-CM for guix-patches@gnu.org; Wed, 22 Jan 2025 08:58:02 -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:In-Reply-To:References:Subject; bh=dF2mB3F3ozJuq1D30pix+2sjT5wYPj1UhJpK3yzOUi4=; b=CQHfU4UGDCeZ9M4sRiGKkN2t+wd9LXZzwrJCEMZwOEkvWQJXEDGeMfdMkwDvAE0pxkRRkT8bkasDaCEblEdn6vy4HPEPFBCXQ78kphGMd2kmXaIi+rQOqGbbKiVgbS5+mL0vyIEih8u+HasdrW4l2BXNfrEbCAAckO3+QDJfGzhoXpbGU4B5Eft0a2NpeF6ofXPqj/K4cpDI1D81mraJ93FJTRxlYAz0zls5VdFvKYRokWvddYJolH6leRirBpGAnfhjZkTkD1QQD4gw53v2Cq0XrnkHDNJUP2OCGaLdjXXxmGB3hCzpOrApqaNFCZHh4yhQch5kWbMD41O56EHw3w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tabF3-0002to-Sg; Wed, 22 Jan 2025 08:58:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#73228] [PATCH v1] * gnu/packages/fonts.scm (font-gnu-unifont): Update to 16.0.02. References: In-Reply-To: Resent-From: Ashvith Shetty Original-Sender: "Debbugs-submit" Resent-CC: gemmaro.dev@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 13:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73228 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73228@debbugs.gnu.org Cc: gemmaro , efraim@flashner.co.il, Ashvith Shetty , gemmaro X-Debbugs-Original-Xcc: gemmaro Received: via spool by 73228-submit@debbugs.gnu.org id=B73228.173755423111054 (code B ref 73228); Wed, 22 Jan 2025 13:58:01 +0000 Received: (at 73228) by debbugs.gnu.org; 22 Jan 2025 13:57:11 +0000 Received: from localhost ([127.0.0.1]:60952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tabEE-0002sD-4a for submit@debbugs.gnu.org; Wed, 22 Jan 2025 08:57:10 -0500 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]:48160) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tabE8-0002ri-EY for 73228@debbugs.gnu.org; Wed, 22 Jan 2025 08:57:08 -0500 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-216281bc30fso159690075ad.0 for <73228@debbugs.gnu.org>; Wed, 22 Jan 2025 05:57:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737554218; x=1738159018; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=dF2mB3F3ozJuq1D30pix+2sjT5wYPj1UhJpK3yzOUi4=; b=IEx2yliXHcU49ExCNzOI7c3UFHjbyTwPra81nmEpokADn28XTQXqj09/0/qK866gDe mCs48HNofz6Alc4sq5T5ukAPzobl33aChwGlE9MnlIq6cWeHW6SxBscw0gSCiaWdFit9 suXotjB5xYUtBE8HHWI4u2WqE4XQ55a6nbbNpa5pG1jY+HOaBm9O/p3v4ubEIFxbRDYL 1gXJQ0ALp11jW4tqo0qoVPdTk8Ix97d/pAMxG2at0A3bM6Mo7P2xRNWfj0XWCJab91tf J5Vm1EcA2qEiRDivuPxxFN6C47kO/4KLihW3wB1A5anaYZO5HBj+mFdpoBmUY+HA35Yv aarQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737554218; x=1738159018; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dF2mB3F3ozJuq1D30pix+2sjT5wYPj1UhJpK3yzOUi4=; b=V9pIGfH3JC97Dl+oaDoDOu3IXHmv2LhQRREW4DxOGrnbMMu/hjaCD1jNlz07QdHCVE +kl0sORBBn5sN2Kx3IIbwFa+4U9yq4Flww1EYJwEn/w+WxbRkpjQu+56FUrNZ4Ujwkyw V1MXz/X0KYmbt0RXCTQ+ttF9SExJvSVRKWajalGPquDxgHGFfWvzVGBVfAKXjuTs9FUI uT49UilttHEBcc1Eam4PFMj2XoU/ffCx2uFfaqSpqpiWvDWo/8CfE1p9up4usRcJYcxP 6irxxhUAyRp49Je/9FETdnHtExRp1mCY2gp/0hgXzXmNO284sH1HeO/VasbXndMOvbBN untw== X-Gm-Message-State: AOJu0YyERc7tFkSjX6B9SEmXASr0iEreqPhYcNYLNHtCkv/YkPC+8fDm IxZKt7nFEq6E+98oN1l1Vqq9Jsk0WY7IsdpKGHphVMDsfWh4hbo9uBLPOZHz X-Gm-Gg: ASbGnctloMQeif+3FhhnlsmQCAxOCPWnEQDhLyzVKZnfLVoj8dQW16A5F9FWqa16PES ul5jPSpH0NEZmtNWfdy6dVNaAIKllj7Fo/deYdTCby7eRzmdRD9Lfc7A119/UgdndC9ZtzWXxtb M4qoP63M3m5GzmTu/UEa9C14r0ArMV1fJDPR0/+mKa8trMaXUBNoSm3DLd9C5sKqOAf6f00j55l wqFpbCKzU7+3dv8CSn6K5L67r4zmi1j63YT4i4x9qY2J/jA3OV/ewYXdmCsAxP2SGzij5o93WkF 7znNII9RhT0MZP1F50U= X-Google-Smtp-Source: AGHT+IHekNnZ6VZLe4zXXGLfWSH/fLiu20mJqRr1VGobV0so2Y54ZQXKpL5QwbFLMOdCu5srtzjEEg== X-Received: by 2002:a17:902:ea05:b0:216:3d72:1712 with SMTP id d9443c01a7336-21c3579359cmr362209555ad.48.1737554217759; Wed, 22 Jan 2025 05:56:57 -0800 (PST) Received: from localhost.localdomain ([2401:4900:1f24:6c44:1484:a471:ff35:daa3]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-21c2d3ae566sm96094335ad.152.2025.01.22.05.56.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2025 05:56:57 -0800 (PST) From: Ashvith Shetty Date: Wed, 22 Jan 2025 19:26:41 +0530 Message-ID: <20250122135644.2058-1-ashvithshetty10@gmail.com> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: gemmaro [source] : Skip the thumbnails task. [arguments] <#:phases>: Replace "/bin/sh" without the "-s" flag. Co-authored-by: Ashvith Shetty Change-Id: Ied77b86c51702623b7ca1b5850c9117d0e33d2d7 --- gnu/packages/fonts.scm | 16 ++-- ...fonts.scm-font-gnu-unifont-Update-to.patch | 73 +++++++++++++++++++ 2 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 outgoing/v1-0001-gnu-packages-fonts.scm-font-gnu-unifont-Update-to.patch diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 4dbbca69dc..1bc07956c9 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -55,11 +55,12 @@ ;;; Copyright © 2023 Nicolas Graves ;;; Copyright © 2023 Ahmad Draidi ;;; Copyright © 2023 Arnaud Lechevallier -;;; Copyright © 2023 gemmaro +;;; Copyright © 2023, 2024 gemmaro ;;; Copyright © 2023 Denis 'GNUtoo' Carikli ;;; Copyright © 2023 chris ;;; Copyright © 2023, 2024 Luis Felipe López Acevedo ;;; Copyright © 2024 Christina O'Donnell +;;; Copyright © 2025 Ashvith Shetty ;;; ;;; This file is part of GNU Guix. ;;; @@ -1054,7 +1055,7 @@ (define-public font-anonymous-pro-minus (define-public font-gnu-unifont (package (name "font-gnu-unifont") - (version "15.1.05") + (version "16.0.02") (source (origin (method url-fetch) @@ -1064,11 +1065,16 @@ (define-public font-gnu-unifont (string-append "mirror://gnu/unifont/unifont-" version "/unifont-" version ".tar.gz"))) (sha256 - (base32 "1yi33kxlgw7ds99za5bclh537sw8ggl94nrhhq7hwxaq8dgzaxfj")) + (base32 "0bd5mf3j7f0wggh9ss3a6rji62qwcfak37q6zb8lq9pjcf3yqa7i")) (snippet '(begin (use-modules (guix build utils)) - (delete-file-recursively "font/precompiled"))))) + (delete-file-recursively "font/precompiled") + ;; Skip thumbnail generation as it requires ImageMagick and the generated + ;; thumbnails will not be installed. + (substitute* "font/Makefile" + (("^(compiled-files:.+)thumbnails(.+)" _ pre post) + (string-append pre post "\n"))))))) (build-system gnu-build-system) (outputs '("out" ; TrueType/OpenType version "pcf" ; PCF (bitmap) version @@ -1086,7 +1092,7 @@ (define-public font-gnu-unifont (add-after 'unpack 'patch-source (lambda _ (substitute* (find-files "." "Makefile") - (("/bin/sh -s") (string-append (which "sh") " -s"))))) + (("/bin/sh\\b") (which "sh"))))) (replace 'install (lambda* (#:key make-flags outputs #:allow-other-keys) (let* ((ttf (string-append (assoc-ref outputs "out") diff --git a/outgoing/v1-0001-gnu-packages-fonts.scm-font-gnu-unifont-Update-to.patch b/outgoing/v1-0001-gnu-packages-fonts.scm-font-gnu-unifont-Update-to.patch new file mode 100644 index 0000000000..18f773d76b --- /dev/null +++ b/outgoing/v1-0001-gnu-packages-fonts.scm-font-gnu-unifont-Update-to.patch @@ -0,0 +1,73 @@ +From 52e842f50b020fb122f032cdbac78bb285a2f562 Mon Sep 17 00:00:00 2001 +From: gemmaro +Date: Wed, 22 Jan 2025 19:16:35 +0530 +Subject: [PATCH v1] * gnu/packages/fonts.scm (font-gnu-unifont): Update to + 16.0.02. + +[source] : Skip the thumbnails task. +[arguments] <#:phases>: Replace "/bin/sh" without the "-s" flag. + +Co-authored-by: Ashvith Shetty +Change-Id: Ied77b86c51702623b7ca1b5850c9117d0e33d2d7 +--- + gnu/packages/fonts.scm | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm +index 4dbbca69dc..79b93662b1 100644 +--- a/gnu/packages/fonts.scm ++++ b/gnu/packages/fonts.scm +@@ -55,11 +55,12 @@ + ;;; Copyright © 2023 Nicolas Graves + ;;; Copyright © 2023 Ahmad Draidi + ;;; Copyright © 2023 Arnaud Lechevallier +-;;; Copyright © 2023 gemmaro ++;;; Copyright © 2023, 2024 gemmaro + ;;; Copyright © 2023 Denis 'GNUtoo' Carikli + ;;; Copyright © 2023 chris + ;;; Copyright © 2023, 2024 Luis Felipe López Acevedo + ;;; Copyright © 2024 Christina O'Donnell ++;;; Copyright © 2025 Ashvith Shetty + ;;; + ;;; This file is part of GNU Guix. + ;;; +@@ -1054,7 +1055,7 @@ (define-public font-anonymous-pro-minus + (define-public font-gnu-unifont + (package + (name "font-gnu-unifont") +- (version "15.1.05") ++ (version "16.0.02") + (source + (origin + (method url-fetch) +@@ -1064,11 +1065,16 @@ (define-public font-gnu-unifont + (string-append "mirror://gnu/unifont/unifont-" + version "/unifont-" version ".tar.gz"))) + (sha256 +- (base32 "1yi33kxlgw7ds99za5bclh537sw8ggl94nrhhq7hwxaq8dgzaxfj")) ++ (base32 "0bd5mf3j7f0wggh9ss3a6rji62qwcfak37q6zb8lq9pjcf3yqa7i")) + (snippet + '(begin + (use-modules (guix build utils)) +- (delete-file-recursively "font/precompiled"))))) ++ (delete-file-recursively "font/precompiled") ++ ;; Skip thumbnail generation as it requires ImageMagick and the generated ++ ;; thumbnails will not be installed. ++ (substitute* "font/Makefile" ++ (("^(compiled-files:.+)thumbnails(.+)" _ pre post) ++ (string-append pre post "\n"))))))) + (build-system gnu-build-system) + (outputs '("out" ; TrueType/OpenType version + "pcf" ; PCF (bitmap) version +@@ -1086,7 +1092,7 @@ (define-public font-gnu-unifont + (add-after 'unpack 'patch-source + (lambda _ + (substitute* (find-files "." "Makefile") +- (("/bin/sh -s") (string-append (which "sh") " -s"))))) ++ (("/bin/sh\\b") (which "sh"))))) + (replace 'install + (lambda* (#:key make-flags outputs #:allow-other-keys) + (let* ((ttf (string-append (assoc-ref outputs "out") +-- +2.47.1 +