diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-07-21 17:08:18 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-07-31 14:41:35 +0200 |
| commit | 7999d317bcc12d9c1ebc63bd519145ee4954e410 (patch) | |
| tree | 19f181fc9110d9612ed2c176fa507a86c5e4f5d8 /gnu/packages | |
| parent | cfad3defb727ff3f0df0382531963911e9d38f1e (diff) | |
| download | patches-7999d317bcc12d9c1ebc63bd519145ee4954e410.tar patches-7999d317bcc12d9c1ebc63bd519145ee4954e410.tar.gz | |
gnu: icu4c: Add upstream patches.
This is necessary to fix a test failure in 'node' when built for i686-linux.
* gnu/packages/icu4c.scm (%icu4c-patches): New variable.
(icu4c)[source](patches, patch-flags): New fields.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/icu4c.scm | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index fc3409ed3f..258721963b 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -31,6 +31,28 @@ #:use-module (guix build-system ant) #:use-module (guix build-system gnu)) +;; These patches are taken from ICUs 'maint-64' branch and will be included in +;; 64.3. The latter patch is needed because many packages use "invalid" +;; locales which misbehave with ICU 64.2. See discussion at +;; <https://lists.gnu.org/archive/html/guix-devel/2019-07/msg00343.html>. +(define %icu4c-patches + (list (origin + (method url-fetch) + (uri (string-append "https://github.com/unicode-org/icu/commit/" + "7788f04eb9be0d7ecade6af46cf7b9825447763d.patch")) + (file-name "icu4c-datetime-regression.patch") + (sha256 + (base32 + "0gs2sbdfpzwwdjqcqr0c16fw3g7wy3gb1gbgvzs9k1ciw0bhpv4w"))) + (origin + (method url-fetch) + (uri (string-append "https://github.com/unicode-org/icu/commit/" + "cfb20862909ff105d4f2c43923c97561bc5a5815.patch")) + (file-name "icu4c-locale-mapping.patch") + (sha256 + (base32 + "0s5psb60aisj6icziblvlp9dqcz56n3887i8ib0yidbjnnrw5b97"))))) + (define-public icu4c (package (name "icu4c") @@ -43,6 +65,8 @@ "/icu4c-" (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) "-src.tgz")) + (patches %icu4c-patches) + (patch-flags '("-p2")) (sha256 (base32 "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2")))) (build-system gnu-build-system) |