ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ghostscript: Ungraft.

Browse source 
* gnu/packages/ghostscript.scm (ghostscript)[source]: Fold extra
patches.
[replacement]: Remove.
(ghostscript/fixed): Remove.

Change-Id: I116d49c308223207382337395a1c6cba83508a0e
This commit is contained in:
Ludovic Courtès 2023-12-20 16:56:53 +01:00
parent 9ebaf6518a
commit 45d66ce8e9
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/ghostscript.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2013, 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015-2017, 2019, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017, 2018, 2019, 2021, 2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018, 2019, 2021, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
@ -161,7 +161,6 @@ (define-public ghostscript
(package (package
(name "ghostscript") (name "ghostscript")
(version "9.56.1") (version "9.56.1")
(replacement ghostscript/fixed)
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -174,7 +173,9 @@ (define-public ghostscript
"1r5qash65m6ignki6z72q4rlai9ka99xrxnmqd19n02has00cd6l")) "1r5qash65m6ignki6z72q4rlai9ka99xrxnmqd19n02has00cd6l"))
(patches (search-patches "ghostscript-no-header-creationdate.patch" (patches (search-patches "ghostscript-no-header-creationdate.patch"
"ghostscript-no-header-id.patch" "ghostscript-no-header-id.patch"
"ghostscript-no-header-uuid.patch")) "ghostscript-no-header-uuid.patch"
"ghostscript-CVE-2023-36664.patch"
"ghostscript-CVE-2023-36664-fixup.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove bundled libraries. The bundled OpenJPEG is a patched fork so ;; Remove bundled libraries. The bundled OpenJPEG is a patched fork so
@ -293,12 +294,6 @@ (define-public ghostscript
(home-page "https://www.ghostscript.com/") (home-page "https://www.ghostscript.com/")
(license license:agpl3+))) (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 (define-public ghostscript/x
(package/inherit ghostscript (package/inherit ghostscript
(name (string-append (package-name ghostscript) "-with-x")) (name (string-append (package-name ghostscript) "-with-x"))