[bug#49580] [PATCH core-updates] gnu: gs-font: Rename to 'font-ghostscript'.

[bug#49580] [PATCH core-updates] gnu: gs-font: Rename to 'font-ghostscript'.

[Maxime Devos]

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

bug#49580: [PATCH core-updates] gnu: gs-font: Rename to 'font-ghostscript'.

[Mathieu Othacehe]

Hello Maxime,

> * gnu/packages/fontutils.scm
>   (gs-fonts)[name]: Set to "font-ghostscript".
>   (gs-fonts): Rename variable to 'font-ghostscript'.
>   (gs-fonts): Add deprecated package.

Nice, pushed as a682fea916b9f3ff101a76273aa754e11d53244d.

Thanks,

Mathieu