aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-04-08 01:14:20 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-05-02 00:38:52 +0200
commit50943b4878623f17c688766b8ff72d9f3ce7ffb0 (patch)
tree55ea63608186da4f10cd231cf02b983b52933687 /gnu
parentc078f1b08b844c7126db2a4a0f83db2217e3bb0f (diff)
downloadguix-50943b4878623f17c688766b8ff72d9f3ce7ffb0.tar
guix-50943b4878623f17c688766b8ff72d9f3ce7ffb0.tar.gz
gnu: lcms: Incorporate grafted changes.
* gnu/packages/ghostscript.scm (lcms)[replacement]: Remove. [source](patches): New field. (lcms/fixed): Remove variable.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/ghostscript.scm11
1 files changed, 2 insertions, 9 deletions
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index 53a9b60fdb..f724fe3ff1 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -47,12 +47,13 @@
(define-public lcms
(package
(name "lcms")
- (replacement lcms/fixed)
(version "2.9")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/lcms/lcms/" version
"/lcms2-" version ".tar.gz"))
+
+ (patches (search-patches "lcms-CVE-2018-16435.patch"))
(sha256 (base32
"083xisy6z01zhm7p7rgk4bx9d6zlr8l20qkfv1g29ylnhgwzvij8"))))
(build-system gnu-build-system)
@@ -68,14 +69,6 @@ Consortium standard (ICC), approved as ISO 15076-1.")
(home-page "http://www.littlecms.com/")
(properties '((cpe-name . "little_cms_color_engine")))))
-(define lcms/fixed
- (package
- (inherit lcms)
- (source
- (origin
- (inherit (package-source lcms))
- (patches (search-patches "lcms-CVE-2018-16435.patch"))))))
-
(define-public libpaper
(package
(name "libpaper")