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: libpng: Incorporate grafted patch.

Browse source 
* gnu/packages/image.scm (libpng)[replacement]: Remove field.
[source]: Add patch 'libpng-CVE-2016-10087.patch'.
(libpng-1.2)[replacement]: Remove field.
(libpng/fixed): Remove variable.
This commit is contained in:
Leo Famulari 2017-01-25 12:51:50 -05:00
parent 678dd8a5ed
commit 9b1bb70904
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/image.scm
View file

@ -65,7 +65,6 @@ (define-module (gnu packages image)
(define-public libpng
(package
(name "libpng")
(replacement libpng/fixed)
(version "1.6.25")
(source (origin
(method url-fetch)
@ -76,6 +75,7 @@ (define-public libpng
(string-append
"ftp://ftp.simplesystems.org/pub/libpng/png/src"
"/libpng15/libpng-" version ".tar.xz")))
(patches (search-patches "libpng-CVE-2016-10087.patch"))
(sha256
(base32 "04c8inn745hw25wz2dc5vll5n5d2gsndj01i4srwzgz8861qvzh9"))))
(build-system gnu-build-system)
@ -90,18 +90,9 @@ (define-public libpng
(license license:zlib)
(home-page "http://www.libpng.org/pub/png/libpng.html")))
(define libpng/fixed
(package
(inherit libpng)
(source
(origin
(inherit (package-source libpng))
(patches (search-patches "libpng-CVE-2016-10087.patch"))))))
(define-public libpng-1.2
(package
(inherit libpng)
(replacement #f)
(version "1.2.57")
(source
(origin