From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id II/kLyRp8GBtawAAgWs5BA (envelope-from ) for ; Thu, 15 Jul 2021 18:58:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id eGDBKSRp8GAJdAAAB5/wlQ (envelope-from ) for ; Thu, 15 Jul 2021 16:58:12 +0000 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 528B8113A0 for ; Thu, 15 Jul 2021 18:58:12 +0200 (CEST) Received: from localhost ([::1]:50922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m44gd-00085M-Ao for larch@yhetil.org; Thu, 15 Jul 2021 12:58:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57864) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m44gU-00084x-OL for guix-patches@gnu.org; Thu, 15 Jul 2021 12:58:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38038) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m44gU-000602-HC for guix-patches@gnu.org; Thu, 15 Jul 2021 12:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m44gU-0005JS-Ff for guix-patches@gnu.org; Thu, 15 Jul 2021 12:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49580] [PATCH core-updates] gnu: gs-font: Rename to 'font-ghostscript'. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Jul 2021 16:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49580 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49580@debbugs.gnu.org Cc: Maxime Devos X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162636823420353 (code B ref -1); Thu, 15 Jul 2021 16:58:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Jul 2021 16:57:14 +0000 Received: from localhost ([127.0.0.1]:49584 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m44fh-0005ID-OR for submit@debbugs.gnu.org; Thu, 15 Jul 2021 12:57:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:38024) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m44ff-0005I4-Mg for submit@debbugs.gnu.org; Thu, 15 Jul 2021 12:57:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m44ff-0007ky-5G for guix-patches@gnu.org; Thu, 15 Jul 2021 12:57:11 -0400 Received: from michel.telenet-ops.be ([2a02:1800:110:4::f00:18]:45738) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m44fc-0005GU-EY for guix-patches@gnu.org; Thu, 15 Jul 2021 12:57:10 -0400 Received: from localhost.localdomain ([213.119.236.63]) by michel.telenet-ops.be with bizsmtp id VUx2250091Nl63106Ux2iA; Thu, 15 Jul 2021 18:57:03 +0200 From: Maxime Devos Date: Thu, 15 Jul 2021 18:56:47 +0200 Message-Id: <20210715165647.30567-1-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1626368223; bh=pxZVeLa4Ij9IObMImy1mexkOrcjgJHycHD7gLs/SD0c=; h=From:To:Cc:Subject:Date; b=afuW7QtLbOT/BD509hyC9f9enX5TqrZzeYSkBDCKMLrObKei6Hlz354q/RQk+SZ64 lmLP+Aigt0zpiBfyEagf0kTMwHCjbEaDa57IPva5l+DtCnOu/pjBun3EaRFGrruref kYXJVsm1eYxVFBeXAXrb/Sis8Xq/rH4u1R4r2I5UjvJbu7UT/6bDse/gbj8cZpMOKt 0dwUVuAFizjtSSlFyq+niqu+jOhelOlMIvJh0LJjRbomZwHGU7bD+JttK6kCS+xGu+ 42o7FsmP9mpX1Ln6rakJkjw1v1gRPU2zyswaaqHYS7Vr0pVNdNsLH2D8RDeGQjyMx3 Jtz96s+f2YVoQ== Received-SPF: pass client-ip=2a02:1800:110:4::f00:18; envelope-from=maximedevos@telenet.be; helo=michel.telenet-ops.be X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626368292; h=from:from:sender:sender: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=pxZVeLa4Ij9IObMImy1mexkOrcjgJHycHD7gLs/SD0c=; b=WcmL5pqRTZiIPvhR92yHXIimy/wDrX/lMb5kpqhYesctvXoKgx4qmuQeoEaZw/IqTnotvn np8PYjbjL5i2oulLA94mDS66mivtBj5FYcb/OBYWSP6VuEV5MaO8UlMVJlw+c3Nmf+mvax +P7VqEHR9q2Rrjhm/2FhlxNcU4BgQguq7CkT2vwuckduq3wq97aiq6zwdMJJYRONLUf/cJ iHCuEJ2d+1C7Hu+ZVP4bGWX9iDnkwkZt1i0fUMcn80kyITsYWDrdvpWHNPMxJ3IStegMBw bqUGqEja8xgIOET63q/d/UKBPa8sqevLAtYOvBl1+ynvekA/Ue78fSd9qlAdeg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626368292; a=rsa-sha256; cv=none; b=W9SXipOwCOauk6c2ZLlK8Yd93n7tKqPr4PGGL06YytLz0SBc+yppSdRwv+uz6NhQTG0WEM 1/UHLsgZKW7Jzme8VYPwD+obSqUJJXxx7+thMLdm57GIdXsd65yl5Ow4Z2+X6yZJB7IkKe AIlPzXhl+E07ffChSiG8nZkXdpPCcd+g62t0NVvlVlJYc/CLz9xugyVUuBAEcaLpDm2wKI 68O4ZYCoa1kaDBhliXcn6OYY4gNxMZ5mSJheUzPdT9DBLBw87LvI4LAhgD4mnFdPLqJEda 0SOs4GgQ5s5oIlPT0HO+TwzoOcqT3hXRrY7D8KRDupc+t9p9cEZP2ZT1kgiYhQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=afuW7QtL; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.70 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=afuW7QtL; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 528B8113A0 X-Spam-Score: 3.70 X-Migadu-Scanner: scn0.migadu.com X-TUID: ny9Xh6OQAxnj According to (guix)Fonts, font package names must be prefixed with 'font-'. Adjust 'gs-fonts' to follow this convention. * gnu/packages/fontutils.scm (gs-fonts)[name]: Set to "font-ghostscript". (gs-fonts): Rename variable to 'font-ghostscript'. (gs-fonts): Add deprecated package. * gnu/packages/ghostscript.scm (ghostscript)[arguments]<#:configure-flags>: Replace 'gs-fonts' with 'font-ghostscript'. (ghostscript)[inputs]: Likewise. * gnu/packages/fontutils.scm (fontconfig)[inputs]: Likewise. * gnu/packages/gtk.scm (pango-1.42)[arguments]{disable-layout-test}: Likewise. * gnu/packages/imagemagick.scm (graphicsmagick)[arguments]{configure-flags}: Likewise. (graphicsmagick)[inputs]: Likewise. * gnu/packages/mp3.scm (ripperx)[propagated-inputs]: Likewise. * doc/guix.texi (X11 Fonts): Likewise. --- doc/guix.texi | 12 ++++++------ gnu/packages/fontutils.scm | 5 +++-- gnu/packages/ghostscript.scm | 11 +++++++---- gnu/packages/gtk.scm | 9 +++++---- gnu/packages/imagemagick.scm | 4 ++-- gnu/packages/mp3.scm | 2 +- 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 808b2af664..47b1dbfcbe 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -1889,12 +1889,12 @@ themselves. @subsection X11 Fonts @cindex fonts -The majority of graphical applications use Fontconfig to locate and -load fonts and perform X11-client-side rendering. The @code{fontconfig} -package in Guix looks for fonts in @file{$HOME/.guix-profile} -by default. Thus, to allow graphical applications installed with Guix -to display fonts, you have to install fonts with Guix as well. -Essential font packages include @code{gs-fonts}, @code{font-dejavu}, and +The majority of graphical applications use Fontconfig to locate and load +fonts and perform X11-client-side rendering. The @code{fontconfig} +package in Guix looks for fonts in @file{$HOME/.guix-profile} by +default. Thus, to allow graphical applications installed with Guix to +display fonts, you have to install fonts with Guix as well. Essential +font packages include @code{font-ghostscript}, @code{font-dejavu}, and @code{font-gnu-freefont}. @cindex @code{fc-cache} diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index dbce5beba8..bc049133b5 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -338,8 +338,9 @@ Font Format (WOFF).") ("freetype" ,freetype) ("libuuid" ,util-linux "lib"))) (inputs - ;; We use to use 'gs-fonts' but they are not recognized by newer versions - ;; of Pango, causing many applications to fail to find fonts otherwise. + ;; We use to use 'font-ghostscript' but they are not recognized by newer + ;; versions of Pango, causing many applications to fail to find fonts + ;; otherwise. `(("font-dejavu" ,font-dejavu))) (native-inputs `(("gperf" ,gperf) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 26a964d4d4..0bda0d56b7 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -204,7 +204,7 @@ printing, and psresize, for adjusting page sizes.") "--enable-dynamic" "--disable-compile-inits" (string-append "--with-fontpath=" - (assoc-ref %build-inputs "gs-fonts") + (assoc-ref %build-inputs "font-ghostscript") "/share/fonts/type1/ghostscript") ,@(if (%current-target-system) @@ -278,7 +278,7 @@ printing, and psresize, for adjusting page sizes.") (inputs `(("fontconfig" ,fontconfig) ("freetype" ,freetype) - ("gs-fonts" ,gs-fonts) + ("font-ghostscript" ,font-ghostscript) ("jbig2dec" ,jbig2dec) ("libjpeg" ,libjpeg-turbo) ("libpaper" ,libpaper) @@ -343,9 +343,9 @@ architecture.") (license license:expat) (home-page (package-home-page ghostscript)))) -(define-public gs-fonts +(define-public font-ghostscript (package - (name "gs-fonts") + (name "font-ghostscript") (version "8.11") (source (origin (method url-fetch) @@ -384,6 +384,9 @@ Ghostscript. It currently includes the 35 standard PostScript fonts.") (license license:gpl2) (home-page "https://sourceforge.net/projects/gs-fonts/"))) +(define-public gs-fonts + (deprecated-package "gs-fonts" font-ghostscript)) + (define-public libspectre (package (name "libspectre") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a90db08f6e..5f2d440e38 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -401,10 +401,11 @@ handling for GTK+-2.x.") (add-after 'configure 'disable-layout-test (lambda _ ;; This test requires that fontconfig uses bitmap fonts - ;; such as "gs-fonts"; however providing such a package - ;; alone is not enough, as the requirement comes from - ;; deeper in the font stack. Since this version of Pango - ;; is only used for librsvg, simply disable the test. + ;; such as "font-ghostscript"; however providing such a + ;; package alone is not enough, as the requirement comes + ;; from deeper in the font stack. Since this version of + ;; Pango is only used for librsvg, simply disable the + ;; test. (substitute* "tests/Makefile" (("test-layout\\$\\(EXEEXT\\)") "")) #t))))))) diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 4f0ffcbcc6..f7cd961c05 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -235,12 +235,12 @@ script.") "--with-quantum-depth=16" ; required by Octave "--enable-quantum-library-names" (string-append "--with-gs-font-dir=" - (assoc-ref %build-inputs "gs-fonts") + (assoc-ref %build-inputs "font-ghostscript") "/share/fonts/type1/ghostscript")))) (inputs `(("graphviz" ,graphviz) ("ghostscript" ,ghostscript) - ("gs-fonts" ,gs-fonts) + ("font-ghostscript" ,font-ghostscript) ("lcms" ,lcms) ("libx11" ,libx11) ("libxml2" ,libxml2) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index ff67d9e9e5..d59a133535 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -480,7 +480,7 @@ use with CD-recording software).") (patches (search-patches "ripperx-missing-file.patch")))) (build-system gnu-build-system) (propagated-inputs - `(("gs-fonts" ,gs-fonts) + `(("font-ghostscript" ,font-ghostscript) ("cdparanoia" ,cdparanoia) ("flac" ,flac) ("lame" ,lame) -- 2.32.0