From f79bb3f01832d5d3b370ab7871b28efa12065fc3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 21:59:55 +0100
Subject: [PATCH] icu: update to 70.1.

---
 common/shlibs                                 | 12 +++---
 .../patches/icu-70.1-fix-ucptrietest.patch    | 38 +++++++++++++++++++
 srcpkgs/icu/template                          |  6 +--
 3 files changed, 47 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/icu/patches/icu-70.1-fix-ucptrietest.patch

diff --git a/common/shlibs b/common/shlibs
index d3594422828..b07e14379e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -521,12 +521,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.69 icu-libs-69.1_1
-libicui18n.so.69 icu-libs-69.1_1
-libicudata.so.69 icu-libs-69.1_1
-libicutu.so.69 icu-libs-69.1_1
-libicuuc.so.69 icu-libs-69.1_1
-libicutest.so.69 icu-libs-69.1_1
+libicuio.so.70 icu-libs-70.1_1
+libicui18n.so.70 icu-libs-70.1_1
+libicudata.so.70 icu-libs-70.1_1
+libicutu.so.70 icu-libs-70.1_1
+libicuuc.so.70 icu-libs-70.1_1
+libicutest.so.70 icu-libs-70.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant-2.so.2 enchant2-2.2.3_1
diff --git a/srcpkgs/icu/patches/icu-70.1-fix-ucptrietest.patch b/srcpkgs/icu/patches/icu-70.1-fix-ucptrietest.patch
new file mode 100644
index 00000000000..5b281ea4603
--- /dev/null
+++ b/srcpkgs/icu/patches/icu-70.1-fix-ucptrietest.patch
@@ -0,0 +1,38 @@
+Fixes test failure on arm.
+
+https://github.com/unicode-org/icu/pull/1925
+https://unicode-org.atlassian.net/browse/ICU-21793
+
+From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
+Date: Wed, 3 Nov 2021 02:31:18 +0100
+Subject: [PATCH] ICU-21793 Fix ucptrietest golden diff
+
+--- a/source/tools/toolutil/toolutil.cpp
++++ b/source/tools/toolutil/toolutil.cpp
+@@ -228,18 +228,19 @@ uprv_compareGoldenFiles(
+     std::ifstream ifs(goldenFilePath, std::ifstream::in);
+     int32_t pos = 0;
+     char c;
+-    while ((c = ifs.get()) != std::char_traits<char>::eof() && pos < bufferLen) {
++    while (ifs.get(c) && pos < bufferLen) {
+         if (c != buffer[pos]) {
+             // Files differ at this position
+-            return pos;
++            break;
+         }
+         pos++;
+     }
+-    if (pos < bufferLen || c != std::char_traits<char>::eof()) {
+-        // Files are different lengths
+-        return pos;
++    if (pos == bufferLen && ifs.eof()) {
++        // Files are same lengths
++        pos = -1;
+     }
+-    return -1;
++    ifs.close();
++    return pos;
+ }
+
+ /*U_CAPI UDate U_EXPORT2
+
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 2d5dea2ab02..3ff17a4dea5 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,8 +2,8 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=69.1
-revision=2
+version=70.1
+revision=1
 wrksrc=icu
 build_wrksrc=source
 build_style=gnu-configure
@@ -16,7 +16,7 @@ maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
+checksum=8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5
 
 CFLAGS=-fPIC
 CXXFLAGS=-fPIC