[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch core-updates updated: gnu: icu4c: Incorporate grafted changes.
From: |
guix-commits |
Subject: |
branch core-updates updated: gnu: icu4c: Incorporate grafted changes. |
Date: |
Thu, 26 Mar 2020 20:47:36 -0400 |
This is an automated email from the git hooks/post-receive script.
mbakke pushed a commit to branch core-updates
in repository guix.
The following commit(s) were added to refs/heads/core-updates by this push:
new 63bd664 gnu: icu4c: Incorporate grafted changes.
63bd664 is described below
commit 63bd6643c80f3af8180392eb1bf531bedb8e2201
Author: Marius Bakke <address@hidden>
AuthorDate: Fri Mar 27 00:46:38 2020 +0100
gnu: icu4c: Incorporate grafted changes.
* gnu/packages/icu4c.scm (icu4c)[replacement]: Remove.
[source](patches, patch-flags): New fields.
(icu4c/fixed): Remove variable.
---
gnu/packages/icu4c.scm | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 88f97ef..046e35e 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -36,7 +36,6 @@
(define-public icu4c
(package
(name "icu4c")
- (replacement icu4c/fixed)
(version "66.1")
(source (origin
(method url-fetch)
@@ -46,6 +45,8 @@
"/icu4c-"
(string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
"-src.tgz"))
+ (patch-flags '("-p2"))
+ (patches (search-patches "icu4c-CVE-2020-10531.patch"))
(sha256
(base32 "0bharwzc9nzkbrcf405z2nb3h7q0711z450arz0mjmdrk8hg58sj"))))
(build-system gnu-build-system)
@@ -113,17 +114,6 @@ C/C++ part.")
#t)))))))
(native-inputs '())))
-(define icu4c/fixed
- (package
- (inherit icu4c)
- (source (origin
- (inherit (package-source icu4c))
- (patch-flags '("-p2"))
- (patches (append
- (origin-patches (package-source icu4c))
- (search-patches
- "icu4c-CVE-2020-10531.patch")))))))
-
(define-public java-icu4j
(package
(name "java-icu4j")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch core-updates updated: gnu: icu4c: Incorporate grafted changes.,
guix-commits <=