[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/05: gnu: pixman: Eliminate graft.
From: |
Marius Bakke |
Subject: |
02/05: gnu: pixman: Eliminate graft. |
Date: |
Wed, 30 Nov 2016 17:45:55 +0000 (UTC) |
mbakke pushed a commit to branch staging
in repository guix.
commit 35bbe88b3c12402bd0648f1ce15a2977742f70a2
Author: Marius Bakke <address@hidden>
Date: Wed Nov 30 17:58:22 2016 +0100
gnu: pixman: Eliminate graft.
* gnu/packages/xdisorg.scm (pixman)[replacement]: Remove field.
[source]: Add patch from 'pixman/fixed'.
(pixman/fixed): Remove variable.
---
gnu/packages/xdisorg.scm | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 3d1108d..4633b51 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -241,7 +241,6 @@ following the mouse.")
(package
(name "pixman")
(version "0.34.0")
- (replacement pixman/fixed)
(source (origin
(method url-fetch)
(uri (string-append
@@ -249,7 +248,8 @@ following the mouse.")
version ".tar.gz"))
(sha256
(base32
- "13m842m9ffac3m9r0b4lvwjhwzg3w4353djkjpf00s0wnm4v5di1"))))
+ "13m842m9ffac3m9r0b4lvwjhwzg3w4353djkjpf00s0wnm4v5di1"))
+ (patches (search-patches "pixman-CVE-2016-5296.patch"))))
(build-system gnu-build-system)
(inputs
`(("libpng" ,libpng)
@@ -263,14 +263,6 @@ manipulation, providing features such as image compositing
and trapezoid
rasterisation.")
(license license:x11)))
-(define pixman/fixed
- (package
- (inherit pixman)
- (source (origin
- (inherit (package-source pixman))
- (patches (search-patches "pixman-CVE-2016-5296.patch"))))))
-
-
(define-public libdrm
(package
(name "libdrm")