From 3b92441bc16f335b0a8fb2b3f6c660ec7e16df4f Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Tue, 24 Jul 2018 15:43:35 +0200
Subject: gnu: icu4c: Update to 62.1.

* gnu/packages/icu4c.scm (icu4c): Update to 62.1.
---
 gnu/packages/icu4c.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/icu4c.scm')

diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index c4d3703794..61333a3e75 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -32,7 +32,7 @@ (define-module (gnu packages icu4c)
 (define-public icu4c
   (package
    (name "icu4c")
-   (version "61.1")
+   (version "62.1")
    (source (origin
             (method url-fetch)
             (uri (string-append
@@ -42,7 +42,7 @@ (define-public icu4c
                   (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
                   "-src.tgz"))
             (sha256
-             (base32 "1vxgkx0cyvdy00a9yd5khkx14r5kcndkax2wa99klm52x2dgh1yh"))))
+             (base32 "18ssgnwzzpm1g1fvbm9h1fvryiwxvvn5wc3fdakdsl33cs6qdn9x"))))
    (build-system gnu-build-system)
    (inputs
     `(("perl" ,perl)))
-- 
cgit v1.2.3


From fbd2b8da5d7e6edb16ba7128324f6bc48ac68569 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 25 Jul 2018 04:36:02 +0200
Subject: gnu: icu4c: Don't keep a reference to coreutils.

* gnu/packages/icu4c.scm (icu4c)[arguments]: Add phase 'avoid-coreutils-reference'.
---
 gnu/packages/icu4c.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/icu4c.scm')

diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 61333a3e75..cbba9aa42a 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -58,7 +58,15 @@ (define-public icu4c
       #:phases
       (modify-phases %standard-phases
         (add-after 'unpack 'chdir-to-source
-          (lambda _ (chdir "source") #t)))))
+          (lambda _ (chdir "source") #t))
+        (add-after 'install 'avoid-coreutils-reference
+          ;; Don't keep a reference to the build tools.
+          (lambda* (#:key outputs #:allow-other-keys)
+            (let ((out (assoc-ref outputs "out")))
+              (substitute* (find-files (string-append out "/lib/icu")
+                                       "\\.inc$")
+                (("INSTALL_CMD=.*/bin/install") "INSTALL_CMD=install"))
+              #t))))))
    (synopsis "International Components for Unicode")
    (description
     "ICU is a set of C/C++ and Java libraries providing Unicode and
-- 
cgit v1.2.3


From e65b2181e8b436278e3dd0b405602a400fbd0a75 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Fri, 5 Oct 2018 19:05:39 +0200
Subject: gnu: icu4c: Skip tests on i686.

* gnu/packages/icu4c.scm (icu4c)[arguments]: On i686-linux, set #:tests? #f.
---
 gnu/packages/icu4c.scm | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'gnu/packages/icu4c.scm')

diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index cbba9aa42a..2d28107e81 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -55,6 +55,12 @@ (define-public icu4c
                     (string-prefix? "mips" s)))
               '("--with-data-packaging=archive")
               '()))
+        ,@(if (string-prefix? "i686" (or (%current-target-system)
+                                         (%current-system)))
+              ;; FIXME: Some tests are failing on i686:
+              ;; <https://unicode-org.atlassian.net/browse/ICU-20080>.
+              '(#:tests? #f)
+              '())
       #:phases
       (modify-phases %standard-phases
         (add-after 'unpack 'chdir-to-source
-- 
cgit v1.2.3