ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 14:16:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: icu4c: Incorporate grafted changes.

Browse source 
* gnu/packages/icu4c.scm (icu4c)[replacement]: Remove.
[source](patches, patch-flags): New fields.
(icu4c/fixed): Remove variable.
This commit is contained in:
Marius Bakke 2020-03-27 00:46:38 +01:00
parent f605eef2d4
commit 63bd6643c8
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/icu4c.scm
View file

@ -36,7 +36,6 @@ (define-module (gnu packages icu4c)
(define-public icu4c (define-public icu4c
(package (package
(name "icu4c") (name "icu4c")
(replacement icu4c/fixed)
(version "66.1") (version "66.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -46,6 +45,8 @@ (define-public icu4c
"/icu4c-" "/icu4c-"
(string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
"-src.tgz")) "-src.tgz"))
(patch-flags '("-p2"))
(patches (search-patches "icu4c-CVE-2020-10531.patch"))
(sha256 (sha256
(base32 "0bharwzc9nzkbrcf405z2nb3h7q0711z450arz0mjmdrk8hg58sj")))) (base32 "0bharwzc9nzkbrcf405z2nb3h7q0711z450arz0mjmdrk8hg58sj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -113,17 +114,6 @@ (define-public icu4c-build-root
#t))))))) #t)))))))
(native-inputs '()))) (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 (define-public java-icu4j
(package (package
(name "java-icu4j") (name "java-icu4j")