[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: icu4c: Incorporate grafted changes.
From: |
Efraim Flashner |
Subject: |
02/02: gnu: icu4c: Incorporate grafted changes. |
Date: |
Wed, 1 Nov 2017 04:32:48 -0400 (EDT) |
efraim pushed a commit to branch core-updates
in repository guix.
commit e2ffdd83b977314eb77cc0691f7296e720be9003
Author: Efraim Flashner <address@hidden>
Date: Wed Nov 1 10:31:49 2017 +0200
gnu: icu4c: Incorporate grafted changes.
* gnu/packages/icu4c.scm (icu4c)[source]: Add patch.
[replacement]: Remove field.
(icu4c/fixed): Remove variable.
---
gnu/packages/icu4c.scm | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 55bc9f2..ac185e2 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -32,7 +32,6 @@
(define-public icu4c
(package
(name "icu4c")
- (replacement icu4c-fixed)
(version "58.2")
(source (origin
(method url-fetch)
@@ -44,6 +43,7 @@
"-src.tgz"))
(patches
(search-patches "icu4c-CVE-2017-7867-CVE-2017-7868.patch"
+ "icu4c-CVE-2017-14952.patch"
"icu4c-reset-keyword-list-iterator.patch"))
(sha256
(base32 "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib"))))
@@ -71,15 +71,6 @@ C/C++ part.")
(license x11)
(home-page "http://site.icu-project.org/")))
-(define icu4c-fixed
- (package
- (inherit icu4c)
- (source (origin
- (inherit (package-source icu4c))
- (patches (append
- (origin-patches (package-source icu4c))
- (search-patches "icu4c-CVE-2017-14952.patch")))))))
-
(define-public java-icu4j
(package
(name "java-icu4j")