mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 15:36:20 -05:00
gnu: icu4c: Incorporate grafted changes.
* gnu/packages/icu4c.scm (icu4c)[replacement]: Remove. [source](patches, patch-flags): New fields. (icu4c/fixed): Remove variable.
This commit is contained in:
parent
f605eef2d4
commit
63bd6643c8
1 changed files with 2 additions and 12 deletions
|
@ -36,7 +36,6 @@ (define-module (gnu packages icu4c)
|
|||
(define-public icu4c
|
||||
(package
|
||||
(name "icu4c")
|
||||
(replacement icu4c/fixed)
|
||||
(version "66.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -46,6 +45,8 @@ (define-public icu4c
|
|||
"/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 @@ (define-public icu4c-build-root
|
|||
#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")
|
||||
|
|
Loading…
Reference in a new issue