me/guix
Archived
1
0
Fork 0
Code Activity

gnu: gs-font: Rename to 'font-ghostscript'.

Browse source 
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.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
This commit is contained in:
Maxime Devos 2021-07-15 18:56:47 +02:00 • committed by Mathieu Othacehe
parent 52cc639403
commit a682fea916
No known key found for this signature in database
GPG key ID: 8354763531769CA6
6 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/guix.texi
View file

@ -1893,12 +1893,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}

5
gnu/packages/fontutils.scm
View file

@ -341,8 +341,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)

11
gnu/packages/ghostscript.scm
View file

@ -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")

9
gnu/packages/gtk.scm
View file

@ -402,10 +402,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)))))))

4
gnu/packages/imagemagick.scm
View file

@ -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)

2
gnu/packages/mp3.scm
View file

@ -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)