From e9fcbfe8e1c66f68ec822480f77bd3427b7dde8f Mon Sep 17 00:00:00 2001
From: Frank <65999885+FrankXie05@users.noreply.github.com>
Date: Tue, 12 Apr 2022 00:06:15 +0800
Subject: [PATCH] [icu] update to 70.1 (#23445)

* [icu] update to 70.1

* update version

* reset patch

* overwrite version

* reset version

* overwrite version

* Fix configure

* version

* update version

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
---
 ports/icu/disable-escapestr-tool.patch | 4 ++--
 ports/icu/portfile.cmake               | 6 ++++--
 ports/icu/vcpkg.json                   | 3 +--
 versions/baseline.json                 | 4 ++--
 versions/i-/icu.json                   | 5 +++++
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ports/icu/disable-escapestr-tool.patch b/ports/icu/disable-escapestr-tool.patch
index 620fcde2a8..5c42e56e7d 100644
--- a/ports/icu/disable-escapestr-tool.patch
+++ b/ports/icu/disable-escapestr-tool.patch
@@ -1,10 +1,10 @@
 diff --git a/source/tools/Makefile.in b/source/tools/Makefile.in
-index c3f81d6..dc41af3 100644
+index e0896f1..5ead980 100644
 --- a/source/tools/Makefile.in
 +++ b/source/tools/Makefile.in
 @@ -19,9 +19,9 @@ SUBDIRS = toolutil ctestfw makeconv genrb genbrk \
  gencnval gensprep icuinfo genccode gencmn icupkg pkgdata \
- gentest gennorm2 gencfu gendict
+ gentest gennorm2 gencfu gendict icuexportdata
  
 -ifneq (@platform_make_fragment_name@,mh-cygwin-msvc)
 -SUBDIRS += escapesrc
diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake
index 1724086d44..1383c2bba5 100644
--- a/ports/icu/portfile.cmake
+++ b/ports/icu/portfile.cmake
@@ -1,4 +1,4 @@
-set(ICU_VERSION_MAJOR 69)
+set(ICU_VERSION_MAJOR 70)
 set(ICU_VERSION_MINOR 1)
 set(VERSION "${ICU_VERSION_MAJOR}.${ICU_VERSION_MINOR}")
 set(VERSION2 "${ICU_VERSION_MAJOR}_${ICU_VERSION_MINOR}")
@@ -8,8 +8,9 @@ vcpkg_download_distfile(
     ARCHIVE
     URLS "https://github.com/unicode-org/icu/releases/download/release-${VERSION3}/icu4c-${VERSION2}-src.tgz"
     FILENAME "icu4c-${VERSION2}-src.tgz"
-    SHA512 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7
+    SHA512 0b26ae7207155cb65a8fdb25f7b2fa4431e74b12bccbed0884a17feaae3c96833d12451064dd152197fd6ea5fd3adfd95594284a463e66c82e0d860f645880c9
 )
+
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
@@ -52,6 +53,7 @@ vcpkg_configure_make(
     SOURCE_PATH "${SOURCE_PATH}"
     AUTOCONFIG
     PROJECT_SUBPATH source
+    ADDITIONAL_MSYS_PACKAGES autoconf-archive
     OPTIONS ${CONFIGURE_OPTIONS}
     OPTIONS_RELEASE ${CONFIGURE_OPTIONS_RELEASE}
     OPTIONS_DEBUG ${CONFIGURE_OPTIONS_DEBUG}
diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json
index d1e99c9c38..e3fec7996d 100644
--- a/ports/icu/vcpkg.json
+++ b/ports/icu/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "icu",
-  "version": "69.1",
-  "port-version": 19,
+  "version": "70.1",
   "description": "Mature and widely used Unicode and localization library.",
   "homepage": "https://icu.unicode.org/home",
   "supports": "!uwp",
diff --git a/versions/baseline.json b/versions/baseline.json
index b6cccc1772..bfb3a8d68e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2801,8 +2801,8 @@
       "port-version": 0
     },
     "icu": {
-      "baseline": "69.1",
-      "port-version": 19
+      "baseline": "70.1",
+      "port-version": 0
     },
     "ideviceinstaller": {
       "baseline": "1.1.2.23",
diff --git a/versions/i-/icu.json b/versions/i-/icu.json
index eaebc031ef..fe4be9d2f9 100644
--- a/versions/i-/icu.json
+++ b/versions/i-/icu.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2d082108b0899697c9b6253c260188728374e56b",
+      "version": "70.1",
+      "port-version": 0
+    },
     {
       "git-tree": "5d1bac4d5b2a05af577b0aa5bb8f600e5cf15427",
       "version": "69.1",