diff options
| author | Maxime Devos <maximedevos@telenet.be> | 2021-07-15 18:56:47 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-07-25 17:52:36 +0200 |
| commit | a682fea916b9f3ff101a76273aa754e11d53244d (patch) | |
| tree | 21643a3ecab782ddaafbe21b65efabcfa6347262 /gnu | |
| parent | 52cc6394033546406b81c146d38104c1d80dc68f (diff) | |
gnu: gs-font: Rename to 'font-ghostscript'.
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>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/fontutils.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/ghostscript.scm | 11 | ||||
| -rw-r--r-- | gnu/packages/gtk.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/imagemagick.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/mp3.scm | 2 |
5 files changed, 18 insertions, 13 deletions
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 6ef09455b57..8e0980dd955 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm | |||
| @@ -341,8 +341,9 @@ Font Format (WOFF).") | |||
| 341 | ("freetype" ,freetype) | 341 | ("freetype" ,freetype) |
| 342 | ("libuuid" ,util-linux "lib"))) | 342 | ("libuuid" ,util-linux "lib"))) |
| 343 | (inputs | 343 | (inputs |
| 344 | ;; We use to use 'gs-fonts' but they are not recognized by newer versions | 344 | ;; We use to use 'font-ghostscript' but they are not recognized by newer |
| 345 | ;; of Pango, causing many applications to fail to find fonts otherwise. | 345 | ;; versions of Pango, causing many applications to fail to find fonts |
| 346 | ;; otherwise. | ||
| 346 | `(("font-dejavu" ,font-dejavu))) | 347 | `(("font-dejavu" ,font-dejavu))) |
| 347 | (native-inputs | 348 | (native-inputs |
| 348 | `(("gperf" ,gperf) | 349 | `(("gperf" ,gperf) |
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 378ff6b37da..35e637648c1 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm | |||
| @@ -204,7 +204,7 @@ printing, and psresize, for adjusting page sizes.") | |||
| 204 | "--enable-dynamic" | 204 | "--enable-dynamic" |
| 205 | "--disable-compile-inits" | 205 | "--disable-compile-inits" |
| 206 | (string-append "--with-fontpath=" | 206 | (string-append "--with-fontpath=" |
| 207 | (assoc-ref %build-inputs "gs-fonts") | 207 | (assoc-ref %build-inputs "font-ghostscript") |
| 208 | "/share/fonts/type1/ghostscript") | 208 | "/share/fonts/type1/ghostscript") |
| 209 | 209 | ||
| 210 | ,@(if (%current-target-system) | 210 | ,@(if (%current-target-system) |
| @@ -278,7 +278,7 @@ printing, and psresize, for adjusting page sizes.") | |||
| 278 | (inputs | 278 | (inputs |
| 279 | `(("fontconfig" ,fontconfig) | 279 | `(("fontconfig" ,fontconfig) |
| 280 | ("freetype" ,freetype) | 280 | ("freetype" ,freetype) |
| 281 | ("gs-fonts" ,gs-fonts) | 281 | ("font-ghostscript" ,font-ghostscript) |
| 282 | ("jbig2dec" ,jbig2dec) | 282 | ("jbig2dec" ,jbig2dec) |
| 283 | ("libjpeg" ,libjpeg-turbo) | 283 | ("libjpeg" ,libjpeg-turbo) |
| 284 | ("libpaper" ,libpaper) | 284 | ("libpaper" ,libpaper) |
| @@ -343,9 +343,9 @@ architecture.") | |||
| 343 | (license license:expat) | 343 | (license license:expat) |
| 344 | (home-page (package-home-page ghostscript)))) | 344 | (home-page (package-home-page ghostscript)))) |
| 345 | 345 | ||
| 346 | (define-public gs-fonts | 346 | (define-public font-ghostscript |
| 347 | (package | 347 | (package |
| 348 | (name "gs-fonts") | 348 | (name "font-ghostscript") |
| 349 | (version "8.11") | 349 | (version "8.11") |
| 350 | (source (origin | 350 | (source (origin |
| 351 | (method url-fetch) | 351 | (method url-fetch) |
| @@ -384,6 +384,9 @@ Ghostscript. It currently includes the 35 standard PostScript fonts.") | |||
| 384 | (license license:gpl2) | 384 | (license license:gpl2) |
| 385 | (home-page "https://sourceforge.net/projects/gs-fonts/"))) | 385 | (home-page "https://sourceforge.net/projects/gs-fonts/"))) |
| 386 | 386 | ||
| 387 | (define-public gs-fonts | ||
| 388 | (deprecated-package "gs-fonts" font-ghostscript)) | ||
| 389 | |||
| 387 | (define-public libspectre | 390 | (define-public libspectre |
| 388 | (package | 391 | (package |
| 389 | (name "libspectre") | 392 | (name "libspectre") |
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 21e27d8597b..bf4ce3b7b6d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm | |||
| @@ -402,10 +402,11 @@ handling for GTK+-2.x.") | |||
| 402 | (add-after 'configure 'disable-layout-test | 402 | (add-after 'configure 'disable-layout-test |
| 403 | (lambda _ | 403 | (lambda _ |
| 404 | ;; This test requires that fontconfig uses bitmap fonts | 404 | ;; This test requires that fontconfig uses bitmap fonts |
| 405 | ;; such as "gs-fonts"; however providing such a package | 405 | ;; such as "font-ghostscript"; however providing such a |
| 406 | ;; alone is not enough, as the requirement comes from | 406 | ;; package alone is not enough, as the requirement comes |
| 407 | ;; deeper in the font stack. Since this version of Pango | 407 | ;; from deeper in the font stack. Since this version of |
| 408 | ;; is only used for librsvg, simply disable the test. | 408 | ;; Pango is only used for librsvg, simply disable the |
| 409 | ;; test. | ||
| 409 | (substitute* "tests/Makefile" | 410 | (substitute* "tests/Makefile" |
| 410 | (("test-layout\\$\\(EXEEXT\\)") "")) | 411 | (("test-layout\\$\\(EXEEXT\\)") "")) |
| 411 | #t))))))) | 412 | #t))))))) |
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 4f0ffcbcc6a..f7cd961c050 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm | |||
| @@ -235,12 +235,12 @@ script.") | |||
| 235 | "--with-quantum-depth=16" ; required by Octave | 235 | "--with-quantum-depth=16" ; required by Octave |
| 236 | "--enable-quantum-library-names" | 236 | "--enable-quantum-library-names" |
| 237 | (string-append "--with-gs-font-dir=" | 237 | (string-append "--with-gs-font-dir=" |
| 238 | (assoc-ref %build-inputs "gs-fonts") | 238 | (assoc-ref %build-inputs "font-ghostscript") |
| 239 | "/share/fonts/type1/ghostscript")))) | 239 | "/share/fonts/type1/ghostscript")))) |
| 240 | (inputs | 240 | (inputs |
| 241 | `(("graphviz" ,graphviz) | 241 | `(("graphviz" ,graphviz) |
| 242 | ("ghostscript" ,ghostscript) | 242 | ("ghostscript" ,ghostscript) |
| 243 | ("gs-fonts" ,gs-fonts) | 243 | ("font-ghostscript" ,font-ghostscript) |
| 244 | ("lcms" ,lcms) | 244 | ("lcms" ,lcms) |
| 245 | ("libx11" ,libx11) | 245 | ("libx11" ,libx11) |
| 246 | ("libxml2" ,libxml2) | 246 | ("libxml2" ,libxml2) |
diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index ff67d9e9e52..d59a1335350 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm | |||
| @@ -480,7 +480,7 @@ use with CD-recording software).") | |||
| 480 | (patches (search-patches "ripperx-missing-file.patch")))) | 480 | (patches (search-patches "ripperx-missing-file.patch")))) |
| 481 | (build-system gnu-build-system) | 481 | (build-system gnu-build-system) |
| 482 | (propagated-inputs | 482 | (propagated-inputs |
| 483 | `(("gs-fonts" ,gs-fonts) | 483 | `(("font-ghostscript" ,font-ghostscript) |
| 484 | ("cdparanoia" ,cdparanoia) | 484 | ("cdparanoia" ,cdparanoia) |
| 485 | ("flac" ,flac) | 485 | ("flac" ,flac) |
| 486 | ("lame" ,lame) | 486 | ("lame" ,lame) |
