diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-23 10:11:29 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-23 10:11:29 +0200 |
| commit | 4c204d01d57ac7da11a5772d5d4e3254d1c2408f (patch) | |
| tree | c7e5cb013abc742734acd9613674df4ebddfdeef /gnu/packages/ghostscript.scm | |
| parent | 82bdb77082fa4e100761f70086b745dfb280c3ac (diff) | |
| parent | 445a0359083388b5ee686e6e855f94a3aac5f79c (diff) | |
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/packages/ghostscript.scm')
| -rw-r--r-- | gnu/packages/ghostscript.scm | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 1813cc367e..502b41bb99 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020, 2022 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -89,9 +89,12 @@ Consortium standard (ICC), approved as ISO 15076-1.") (native-inputs (list help2man)) (arguments - '(#:configure-flags '("--disable-static" - ;; Tests require a relocatable build. - "--enable-relocatable"))) + (list #:configure-flags ''("--disable-static" + ;; Tests require a relocatable build. + "--enable-relocatable") + ;; --enable-relocate is broken on the Hurd + #:tests? (not (or (target-hurd?) + (%current-target-system))))) (outputs '("out" "debug")) (home-page "https://github.com/rrthomas/libpaper") (synopsis "Library for handling paper sizes") @@ -145,6 +148,7 @@ printing, and psresize, for adjusting page sizes.") (package (name "ghostscript") (version "9.56.1") + (replacement ghostscript/fixed) (source (origin (method url-fetch) @@ -198,6 +202,16 @@ printing, and psresize, for adjusting page sizes.") '())) #:phases #~(modify-phases %standard-phases + #$@(if (target-hurd?) + #~((add-after 'unpack 'patch-leptonica + (lambda _ + (let ((patch-file + #$(local-file + (search-patch + "ghostscript-leptonica-hurd.patch")))) + (with-directory-excursion "leptonica" + (invoke "patch" "--force" "-p1" "-i" patch-file)))))) + #~()) (add-before 'configure 'create-output-directory (lambda _ ;; The configure script refuses to function if the directory @@ -266,6 +280,12 @@ output file formats and printers.") (home-page "https://www.ghostscript.com/") (license license:agpl3+))) +(define ghostscript/fixed + (package-with-patches + ghostscript + (search-patches "ghostscript-CVE-2023-36664.patch" + "ghostscript-CVE-2023-36664-fixup.patch"))) + (define-public ghostscript/x (package/inherit ghostscript (name (string-append (package-name ghostscript) "-with-x")) |