From 9704ec1b0aab796dd2e084e91d06c39491d44a51 Mon Sep 17 00:00:00 2001
From: Oscar Serrano <info@anscarius.com>
Date: Thu, 2 Jun 2022 14:46:45 -0500
Subject: [PATCH] icu: update to 71.1

---
 common/shlibs                                 | 12 +++---
 .../patches/icu-70.1-fix-ucptrietest.patch    | 38 -------------------
 srcpkgs/icu/template                          |  4 +-
 3 files changed, 8 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/icu/patches/icu-70.1-fix-ucptrietest.patch

diff --git a/common/shlibs b/common/shlibs
index e6a54662fc62..b92912e9afde 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -522,12 +522,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.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
+libicuio.so.71 icu-libs-71.1_1
+libicui18n.so.71 icu-libs-71.1_1
+libicudata.so.71 icu-libs-71.1_1
+libicutu.so.71 icu-libs-71.1_1
+libicuuc.so.71 icu-libs-71.1_1
+libicutest.so.71 icu-libs-71.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
deleted file mode 100644
index 5b281ea4603a..000000000000
--- a/srcpkgs/icu/patches/icu-70.1-fix-ucptrietest.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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 3ff17a4dea5d..06d3eb15f19d 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=70.1
+version=71.1
 revision=1
 wrksrc=icu
 build_wrksrc=source
@@ -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=8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5
+checksum=67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf
 
 CFLAGS=-fPIC
 CXXFLAGS=-fPIC