nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: ghostscript: Eliminate graft. 

* gnu/packages/ghostscript.scm (ghostscript)[replacement]: Remove field.
[source]: Add new patches from 'ghostscript/fixed'.
(ghostscript/fixed): Remove variable.
(ghostscript/x): Inherit from 'ghostscript'.
This commit is contained in:
Mark H Weaver 2016-10-13 05:54:22 -04:00
parent 061d7f3bd2
commit 34708a221a
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnu/packages/ghostscript.scm
View File

@ -127,7 +127,6 @@ printing, and psresize, for adjusting page sizes.")
(package (package
(name "ghostscript") (name "ghostscript")
(version "9.14.0") (version "9.14.0")
(replacement ghostscript/fixed)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/ghostscript/gnu-ghostscript-" (uri (string-append "mirror://gnu/ghostscript/gnu-ghostscript-"
@ -135,7 +134,12 @@ printing, and psresize, for adjusting page sizes.")
(sha256 (sha256
(base32 (base32
"0q4jj41p0qbr4mgcc9q78f5zs8cm1g57wgryhsm2yq4lfslm3ib1")) "0q4jj41p0qbr4mgcc9q78f5zs8cm1g57wgryhsm2yq4lfslm3ib1"))
(patches (search-patches "ghostscript-CVE-2015-3228.patch" (patches (search-patches "ghostscript-CVE-2013-5653.patch"
"ghostscript-CVE-2015-3228.patch"
"ghostscript-CVE-2016-7976.patch"
"ghostscript-CVE-2016-7978.patch"
"ghostscript-CVE-2016-7979.patch"
"ghostscript-CVE-2016-8602.patch"
"ghostscript-runpath.patch")) "ghostscript-runpath.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
@ -198,22 +202,8 @@ output file formats and printers.")
(license license:agpl3+) (license license:agpl3+)
(home-page "http://www.gnu.org/software/ghostscript/"))) (home-page "http://www.gnu.org/software/ghostscript/")))
(define ghostscript/fixed
(package
(inherit ghostscript)
(replacement #f) ; Prevent ghostscript/x from inheriting the replacement
(source (origin
(inherit (package-source ghostscript))
(patches (search-patches "ghostscript-CVE-2013-5653.patch"
"ghostscript-CVE-2015-3228.patch"
"ghostscript-CVE-2016-7976.patch"
"ghostscript-CVE-2016-7978.patch"
"ghostscript-CVE-2016-7979.patch"
"ghostscript-CVE-2016-8602.patch"
"ghostscript-runpath.patch"))))))
(define-public ghostscript/x (define-public ghostscript/x
(package (inherit ghostscript/fixed) (package (inherit ghostscript)
(name (string-append (package-name ghostscript) "-with-x")) (name (string-append (package-name ghostscript) "-with-x"))
(inputs `(("libxext" ,libxext) (inputs `(("libxext" ,libxext)
("libxt" ,libxt) ("libxt" ,libxt)