From patchwork Wed Apr 9 05:36:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kurome X-Patchwork-Id: 41480 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 D3B4D27BC4B; Wed, 9 Apr 2025 06:38:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,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 99CD527BC49 for ; Wed, 9 Apr 2025 06:38:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2O8c-0002k4-6d; Wed, 09 Apr 2025 01:38:14 -0400 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 1u2O8V-0002jc-0r for guix-patches@gnu.org; Wed, 09 Apr 2025 01:38:07 -0400 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 1u2O8U-0000dp-N9 for guix-patches@gnu.org; Wed, 09 Apr 2025 01:38:06 -0400 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=oYNiHKA7U1YlzMWSSQoFVmqlfTuRJKf9WSNKSN0aQY8=; b=eU29wnLWueY6rA1P4A+WjCefeXzeAl/xJSt/lhxHXPuTI4qt4vQlLSrBWptg5JZBgeRI9mrCFwsqsE99rA28kwstF5j9E59h7TpdKS6dLp7KlFpS5aulSmFHzwEhDQmHE/84PSihpgehQIz21Wak9xGEkmlZ4P1vFtHUEOaXA6WQglqltRbUEtGc6Jr/As3QJ/crpXY1wiHM8LtGpM0jZApvs5TnI0cL/i9pnXdCk1BvTB+l3NPttndb/3sEaNBW/wKFyfVFkmHOuT3T0R53i6fIZxylcRrpE901jfvN47W2SobbzMRTW5CVIp+EXgvDlN3UscQ6MZC1jOoN8s6jng==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u2O8Q-0003zU-QE; Wed, 09 Apr 2025 01:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77662] [PATCH] gnu: font-adobe-source-han-sans: Update to 2.004. Resent-From: Kurome Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 09 Apr 2025 05:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77662 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77662@debbugs.gnu.org Cc: Kurome , hako@ultrarare.space, iyzsong@envs.net X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: hako@ultrarare.space, iyzsong@envs.net Received: via spool by submit@debbugs.gnu.org id=B.174417705715268 (code B ref -1); Wed, 09 Apr 2025 05:38:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Apr 2025 05:37:37 +0000 Received: from localhost ([127.0.0.1]:36784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2O81-0003y8-1a for submit@debbugs.gnu.org; Wed, 09 Apr 2025 01:37:37 -0400 Received: from lists.gnu.org ([2001:470:142::17]:52696) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u2O7x-0003xq-Tn for submit@debbugs.gnu.org; Wed, 09 Apr 2025 01:37:34 -0400 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 1u2O7s-0002S2-18 for guix-patches@gnu.org; Wed, 09 Apr 2025 01:37:28 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u2O7p-0000Yd-Pp for guix-patches@gnu.org; Wed, 09 Apr 2025 01:37:27 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-22a976f3131so37003005ad.3 for ; Tue, 08 Apr 2025 22:37:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744177044; x=1744781844; darn=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=oYNiHKA7U1YlzMWSSQoFVmqlfTuRJKf9WSNKSN0aQY8=; b=Sp0GRL8ocWHRWMmS1rWoaWvh9TicoWK56SYUQM32E48FB80coLp+mwdB3FsLlnVmQy W8QX6XV7BqC5cvFgg1oHoRlmSRpItQ2hiq49mVPX6EABVwyfLaACmmZIJ+OyVuAYDrtA aG1KKma62102GE/Nb0gr7a9XJx3uLhuWfFcahWoCfOpPsClIpdOZUlAB0scE+DYOQTR8 xtAO6vtNHtoVusIZ1XHKlN31vCVAsuqvtqvVvZ9jimfZeiTgevUXUQspYVSXnlaS7v7t xpdf4Lb47ZcU7VQ873eNH/r6y8FtZdB/NUSTzMrcFofPWYo9cbn7+bAMsElGFr9GAMXH B9rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744177044; x=1744781844; 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=oYNiHKA7U1YlzMWSSQoFVmqlfTuRJKf9WSNKSN0aQY8=; b=s6lzlG9SMv5ewIaJzSskz9qdQjvkNCr1mdaHW/e9hFJKVbhC26rAFgPyA7rtWAGW9i CuDUgjdKKqL20Ck7pbg5DBilF/JxFFozMWEiplAFwC1ApnsbrsHTHqpA9rJkCcyComIo P2QTt3Wdo73h+rooLXp+fthBbZPtqpmW/gcqArqCNp3YvrvpTiTO+65fdeNirfio4LjQ nmxHEi9Qdtk/4Q2MSk1aMKfHj9C8phM89rJVG+9ORNPihvCZwgO3nLKnLgRLJd5S3GWt ByqsZQKvNPT95sIW3am5omCyxlvjaxX3cdDhZ2wDIFic1EI8ksF7TKO1gn+BPltkM5Vu cpHQ== X-Gm-Message-State: AOJu0Yzo0b2yf9cyjhNbNez34vlSKzRgnNz8DVrWGnrLYSOL9EB3ZW4z bs2QswxqAWkZKVoQsQ3ardsEtaJaj2D2NfRmv9F855UNUh9RjvcIm+nkLixmwv4= X-Gm-Gg: ASbGnct2+rIOOc5Gf8HdLfygRFhCPv9viJS7C3uPfxgCmI/lv7zEzolaKdCLZ08C4Vf 5tW/IM7BLoIZDS0k6ylz9MIut5PXjYBFQLkO9mVDTeNFufW2k+5dpo4bmYidDM+GMfF9OkXuxM8 HLDC7lCu9X3+RSmOjqXEpUcN1zjEpDJ2RkUO51zUBLYeEOa2IeoKIt0ZthVyTavkQj6hksWTgNt SqcEleKwKOna+1YdL5HNz4TSI7BniqQy58KO6tum6KUC55vRA6xQULpvjI+t8RTH4lT7YUD8lEp irId5Uw9xNSXM/Z1zMU7+9C4/6NiWNz9ericgcERDzPOQR+LtA0TvYGqvFXx0TCyjk3Fynhy X-Google-Smtp-Source: AGHT+IEfwT74OUP41i1S3mriGIrqlugTrcW2xE+1rTpA4Mma/nN44ZV9qkaIgfQj7HZ2p8Gboz/FdA== X-Received: by 2002:a17:902:c944:b0:224:2207:5130 with SMTP id d9443c01a7336-22ac2c2ddbemr25444455ad.45.1744177043616; Tue, 08 Apr 2025 22:37:23 -0700 (PDT) Received: from kuroputer.flets-east.jp ([240b:10:3481:ee00:8906:977f:5873:985e]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22ac7c9725asm2973985ad.158.2025.04.08.22.37.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Apr 2025 22:37:23 -0700 (PDT) From: Kurome Date: Wed, 9 Apr 2025 14:36:43 +0900 Message-ID: <20250409053710.13704-1-hunt31999@gmail.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=hunt31999@gmail.com; helo=mail-pl1-x62c.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: , 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 Since the OTC directory was deleted from the repo, I moved the source for output "out" from OTC to SuperOTC. SuperOTC is a combination of all the weights of OTC. The contents should not change. * gnu/packages/fonts.scm: Import (guix build-system copy). (font-adobe-source-han-sans): Update to 2.004. [outputs] Add "hk" (Hong Kong). Switch to SuperOTC for "out". [build-system] Switch to copy-build-system for simplicity.. [arguments] Fixes for build system transition. Use G-Expression. [native-inputs]: Add unzip. Change-Id: I3b37b9406c932b3e4f936367670cbd2ca4a0f926 --- gnu/packages/fonts.scm | 60 ++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 9d558eccbc..c3aed12bbd 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -93,6 +93,7 @@ (define-module (gnu packages fonts) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system trivial) + #:use-module (guix build-system copy) #:use-module (gnu packages) #:use-module (gnu packages c) #:use-module (gnu packages base) @@ -795,46 +796,47 @@ (define-public font-terminus (define-public font-adobe-source-han-sans (package (name "font-adobe-source-han-sans") - (version "1.004") + (version "2.004") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/adobe-fonts/source-han-sans") - (commit (string-append version "R")))) + (url "https://github.com/adobe-fonts/source-han-sans") + (commit (string-append version "R")))) (file-name (git-file-name name version)) (sha256 (base32 - "0zm884d8fp5gvirq324050kqv7am9khyqhs9kk4r4rr3jzn61jpk")))) - (outputs '("out" ; OpenType/CFF Collection (OTC), 121 MiB. - "cn" "jp" "kr" "tw")) ; Region-specific Subset OpenType/CFF. - (build-system trivial-build-system) + "0sgfvdigq9vdmf8wizapy8wcyzqrqj8il9sx1xzfm20qy376qvbf")))) + (outputs '("out" ; OpenType/CFF Collection (OTC), 112 MiB. + "cn" "hk" "jp" "kr" "tw")) ; Region-specific Subset OpenType/CFF. + (build-system copy-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((install-opentype-fonts - (lambda (fonts-dir out) - (copy-recursively fonts-dir - (string-append (assoc-ref %outputs out) - "/share/fonts/opentype"))))) - (chdir (assoc-ref %build-inputs "source")) - (install-opentype-fonts "OTC" "out") - (install-opentype-fonts "SubsetOTF/CN" "cn") - (install-opentype-fonts "SubsetOTF/JP" "jp") - (install-opentype-fonts "SubsetOTF/KR" "kr") - (install-opentype-fonts "SubsetOTF/TW" "tw") - (for-each delete-file (find-files %output "\\.zip$")) - #t)))) + (list + #:install-plan + #~'(("SubsetOTF/CN" "share/fonts/opentype" #:output "cn") + ("SubsetOTF/HK" "share/fonts/opentype" #:output "hk") + ("SubsetOTF/JP" "share/fonts/opentype" #:output "jp") + ("SubsetOTF/KR" "share/fonts/opentype" #:output "kr") + ("SubsetOTF/TW" "share/fonts/opentype" #:output "tw")) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-otc + (lambda _ + (let ((destination-directory + (string-append #$output "/share/fonts/opentype"))) + (mkdir-p destination-directory) + (invoke "unzip" "SuperOTC/SourceHanSans.ttc.zip" + "-d" destination-directory))))))) + (native-inputs (list unzip)) (home-page "https://github.com/adobe-fonts/source-han-sans") (synopsis "Pan-CJK fonts") (description "Source Han Sans is a sans serif Pan-CJK font family that is offered in -seven weights: ExtraLight, Light, Normal, Regular, Medium, Bold, and Heavy. -And in several OpenType/CFF-based deployment configurations to accommodate -various system requirements or limitations. As the name suggests, Pan-CJK -fonts are intended to support the characters necessary to render or display -text in Simplified Chinese, Traditional Chinese, Japanese, and Korean.") +seven weights: ExtraLight, Light, Normal, Regular, Medium, Bold, and Heavy. And +in several OpenType/CFF-based deployment configurations to accommodate various +system requirements or limitations. As the name suggests, Pan-CJK fonts are +intended to support the characters necessary to render or display text in +Simplified Chinese, Traditional Chinese (Taiwan, Hong Kong), Japanese, and +Korean.") (license license:silofl1.1))) (define-public font-cns11643