diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-08-25 21:14:27 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-08-25 22:48:40 +0200 |
| commit | 466ff55c72959ba1499ce3ec69f534b3038eb30b (patch) | |
| tree | b6225a95d68ad0a3db400ba6ad5893195d7de97e /gnu | |
| parent | 8c1379ba404b4db2f0afcf431a4ff720b72a7a19 (diff) | |
gnu: ghostscript: Add a new variant that depends on Freetype.
Fixes <https://bugs.gnu.org/34877>.
Reported by Diego Nicola Barbato <dnbarbato@posteo.de>
and sirmacik <sirmacik@wioo.waw.pl>.
* gnu/packages/ghostscript.scm (ghostscript/fixed): New variable.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/ghostscript.scm | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 53a9b60fdb8..bcd853d1e32 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> | 2 | ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> |
| 3 | ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org> | 3 | ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org> |
| 4 | ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> | 4 | ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> |
| 5 | ;;; Copyright © 2013, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> | 5 | ;;; Copyright © 2013, 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org> |
| 6 | ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> | 6 | ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> |
| 7 | ;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> | 7 | ;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> |
| 8 | ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> | 8 | ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> |
| @@ -269,6 +269,26 @@ output file formats and printers.") | |||
| 269 | (home-page "https://www.ghostscript.com/") | 269 | (home-page "https://www.ghostscript.com/") |
| 270 | (license license:agpl3+))) | 270 | (license license:agpl3+))) |
| 271 | 271 | ||
| 272 | (define-public ghostscript/fixed | ||
| 273 | ;; This adds the Freetype dependency (among other things), which fixes the | ||
| 274 | ;; rendering issues described in <https://issues.guix.gnu.org/issue/34877>. | ||
| 275 | (package/inherit | ||
| 276 | ghostscript | ||
| 277 | (version (string-append (package-version ghostscript) "-1")) | ||
| 278 | (arguments | ||
| 279 | (substitute-keyword-arguments (package-arguments ghostscript) | ||
| 280 | ((#:configure-flags flags ''()) | ||
| 281 | `(append (list "--disable-compile-inits" | ||
| 282 | (string-append "--with-fontpath=" | ||
| 283 | (assoc-ref %build-inputs "gs-fonts") | ||
| 284 | "/share/fonts/type1/ghostscript")) | ||
| 285 | ,flags)))) | ||
| 286 | (native-inputs `(("pkg-config" ,pkg-config) ;needed for freetype | ||
| 287 | ,@(package-native-inputs ghostscript))) | ||
| 288 | (inputs `(("gs-fonts" ,gs-fonts) | ||
| 289 | ("fontconfig" ,fontconfig) | ||
| 290 | ,@(package-inputs ghostscript))))) | ||
| 291 | |||
| 272 | (define-public ghostscript/x | 292 | (define-public ghostscript/x |
| 273 | (package/inherit ghostscript | 293 | (package/inherit ghostscript |
| 274 | (name (string-append (package-name ghostscript) "-with-x")) | 294 | (name (string-append (package-name ghostscript) "-with-x")) |
