From patchwork Wed Nov 22 03:29:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 56717 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 8987A27BBEA; Wed, 22 Nov 2023 03:31:30 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 2CC8C27BBE2 for ; Wed, 22 Nov 2023 03:31:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r5dxC-0000sB-Iu; Tue, 21 Nov 2023 22:31:06 -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 1r5dx7-0000rf-Rf for guix-patches@gnu.org; Tue, 21 Nov 2023 22:31:01 -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 1r5dx5-0000By-Jm for guix-patches@gnu.org; Tue, 21 Nov 2023 22:31:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r5dx8-0000lX-9o for guix-patches@gnu.org; Tue, 21 Nov 2023 22:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67358] [PATCH core-updates] gnu: fontforge: fix build. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Nov 2023 03:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67358 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67358@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17006238562930 (code B ref -1); Wed, 22 Nov 2023 03:31:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Nov 2023 03:30:56 +0000 Received: from localhost ([127.0.0.1]:57810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r5dx1-0000lA-JP for submit@debbugs.gnu.org; Tue, 21 Nov 2023 22:30:55 -0500 Received: from lists.gnu.org ([2001:470:142::17]:33860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r5dwz-0000kw-FK for submit@debbugs.gnu.org; Tue, 21 Nov 2023 22:30:54 -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 1r5dwp-0000pM-Rc for guix-patches@gnu.org; Tue, 21 Nov 2023 22:30:44 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1r5dwn-0000B7-9w for guix-patches@gnu.org; Tue, 21 Nov 2023 22:30:43 -0500 Received: from localhost.localdomain (unknown [183.247.5.179]) by APP-05 (Coremail) with SMTP id zQCowADX3rLTdV1l1gLCAw--.51534S2; Wed, 22 Nov 2023 11:30:28 +0800 (CST) From: Zheng Junjie Date: Wed, 22 Nov 2023 11:29:23 +0800 Message-ID: <5c50257d5e2a87099249c3e52c03a5ec0e91f1a2.1700623763.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-CM-TRANSID: zQCowADX3rLTdV1l1gLCAw--.51534S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYh7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r4j 6ryUM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j6F4UM28EF7xvwVC2z280aVAFwI0_Gr 1j6F4UJwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gr1j6F4UJwAS0I0E0xvYzxvE52x082IY 62kv0487M2AExVAIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMx C20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAF wI0_Jr0_Jr4lx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20x vE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v2 0xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxV WUJVW8JbIYCTnIWIevJa73UjIFyTuYvjxU2_HUDUUUU X-Originating-IP: [183.247.5.179] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.84; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 This follows up on commit 3f2c6cc3933bc01077383e4ff83b6a5d00f83129. gnu/packages/fontutils.scm(fontforge)[arguments]<#:phase>: adjust input names. Change-Id: I64c3992e995294cb04a9f4c79cd841bfc51ba08d --- gnu/packages/fontutils.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) base-commit: 1bca46690c6240310befc6208fb24a044bd4b437 diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 9a0f09b1e1..d933382ede 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2023 gemmaro ;;; Copyright © 2023 John Kehayias ;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1597,9 +1598,9 @@ (define-public fontforge ,(map (lambda (input) (string-append (assoc-ref inputs input) "/lib")) - '("libtiff" "libjpeg" "libpng" "libungif" + '("libtiff" "libjpeg-turbo" "libpng" "libungif" "libxml2" "zlib" "libspiro" "freetype" - "pango" "cairo" "fontconfig"))) + "pango" "cairo" "fontconfig-minimal"))) ;; Checks for potrace program at runtime `("PATH" ":" prefix (,potrace))))))))) (synopsis "Outline font editor")