Update icu to v75.1

WebKitForWindows · Apr 17, 2024 · 3d12665 · 3d12665
1 parent b53f318
commit 3d12665
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 93 deletions.
diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ the requirements.
 
 | Library | Version | Release Date |
 |---|:---:|:---:|
-| [icu](http://site.icu-project.org) | 74.2 | 2023-12-11 |
+| [icu](http://site.icu-project.org) | 75.1 | 2024-04-17 |
 | [zlib](https://github.com/zlib-ng/zlib-ng) | 2.1.6 | 2024-01-10 |
 | [brotli](https://github.com/google/brotli) | 1.1.0 | 2023-08-31 |
 | [libressl](https://www.libressl.org) | 3.9.1 | 2024-03-27 |

diff --git a/ports/icu/patches/0001-Add-CMake-platform.patch b/ports/icu/patches/0001-Add-CMake-platform.patch
@@ -1,4 +1,4 @@
-From 5ffc30f0afb6718ee347f4aa4ac46097547c041f Mon Sep 17 00:00:00 2001
+From 5c04c91d4941c422abeea20863f01146afa2f4e1 Mon Sep 17 00:00:00 2001
 From: foopoiuyt <github@zombiestormtrooper.com>
 Date: Tue, 3 Nov 2020 08:58:19 -0800
 Subject: [PATCH 1/2] Add CMake platform
@@ -15,7 +15,7 @@ Modified version of the LibCMaker ICU files.
  source/common_tools_exe_flags.cmake     |   86 +
  source/common_tools_exe_libs.cmake      |    8 +
  source/configure_1st.cmake              |  137 +
- source/configure_2nd.cmake              | 1208 +++
+ source/configure_2nd.cmake              | 1189 +++
  source/data/CMakeLists.txt              |  340 +
  .../data/cmake-brkitr-index-txt-content.in    |   21 +
  .../data/cmake-coll-index-txt-content.in      |  168 +
@@ -56,7 +56,7 @@ Modified version of the LibCMaker ICU files.
  source/tools/makeconv/CMakeLists.txt    |   31 +
  source/tools/pkgdata/CMakeLists.txt     |   35 +
  source/tools/toolutil/CMakeLists.txt    |   59 +
- 51 files changed, 20144 insertions(+)
+ 51 files changed, 20125 insertions(+)
  create mode 100644 LICENSE_CMakeLists
  create mode 100644 README_CMakeLists.txt
  create mode 100644 source/CMakeLists.txt
@@ -1143,10 +1143,10 @@ index 00000000000..dd22f884c3a
 +status_message("release ${VERSION}, library ${LIB_VERSION}, unicode version ${UNICODE_VERSION}")
 diff --git a/source/configure_2nd.cmake b/source/configure_2nd.cmake
 new file mode 100644
-index 00000000000..be373fbc3c3
+index 00000000000..637c17e4bd3
 --- /dev/null
 +++ b/source/configure_2nd.cmake
-@@ -0,0 +1,1208 @@
+@@ -0,0 +1,1189 @@
 +# Copyright (c) 2018, NikitaFeodonit. All rights reserved.
 +#
 +# ICU build file for CMake build tools
@@ -1268,7 +1268,7 @@ index 00000000000..be373fbc3c3
 +
 +set(CMAKE_C_STANDARD 99)
 +set(CMAKE_C_STANDARD_REQUIRED ON)
-+set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 17)
 +set(CMAKE_CXX_STANDARD_REQUIRED ON)
 +
 +# Check whether to build debug libraries check_message("whether to build debug libraries"
@@ -1549,25 +1549,6 @@ index 00000000000..be373fbc3c3
 +# Check whether to use the evil rpath or not
 +option(ICU_ENABLE_RPATH "Use rpath when linking" OFF)
 +
-+if(CMAKE_CXX_STANDARD LESS 11)
-+    try_compile_src(
-+        "if_include_string_works"
-+        "cpp"
-+        "#include <string>"
-+        ""
-+        ""
-+        ""
-+        _HEADER_STDSTRING
-+    )
-+    if(_HEADER_STDSTRING)
-+        set(U_HAVE_STD_STRING 1)
-+    else()
-+        set(U_HAVE_STD_STRING 0)
-+        list(APPEND CONFIG_CPPFLAGS U_HAVE_STD_STRING=0)
-+    endif()
-+    check_message("if #include <string> works" ${_HEADER_STDSTRING})
-+endif()
-+
 +# NOTE: this check is removed in ICU 63.1, C++11 has <atomic>.
 +try_compile_src(
 +    "if_include_atomic_works"
@@ -20560,5 +20541,5 @@ index 00000000000..36b15d4783d
 +    DESTINATION "${includedir}"
 +)
 -- 
-2.43.0.windows.1
+2.44.0.windows.1
 
diff --git a/ports/icu/patches/0002-Remove-install-suffix-on-Windows.patch b/ports/icu/patches/0002-Remove-install-suffix-on-Windows.patch
@@ -1,4 +1,4 @@
-From 156c36dae2c60b9022f96ad0fd7eb36e6f9153b7 Mon Sep 17 00:00:00 2001
+From a11ab9ddf2fc8d6a64ec03a96f95f85aadf01e8f Mon Sep 17 00:00:00 2001
 From: foopoiuyt <github@zombiestormtrooper.com>
 Date: Tue, 3 Nov 2020 09:02:25 -0800
 Subject: [PATCH 2/2] Remove install suffix on Windows
@@ -27,5 +27,5 @@ index 34688e43176..f1e1ba7b13e 100644
  # Package information
  set(PACKAGE_ICU_DESCRIPTION "International Components for Unicode")
 -- 
-2.43.0.windows.1
+2.44.0.windows.1
 
diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake
@@ -1,5 +1,5 @@
-set(VERSION_MAJOR 74)
-set(VERSION_MINOR 2)
+set(VERSION_MAJOR 75)
+set(VERSION_MINOR 1)
 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}")
 set(VERSION2 "${VERSION_MAJOR}_${VERSION_MINOR}")
 set(VERSION3 "${VERSION_MAJOR}-${VERSION_MINOR}")
@@ -8,7 +8,7 @@ set(VERSION3 "${VERSION_MAJOR}-${VERSION_MINOR}")
 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 e6c7876c0f3d756f3a6969cad9a8909e535eeaac352f3a721338b9cbd56864bf7414469d29ec843462997815d2ca9d0dab06d38c37cdd4d8feb28ad04d8781b0
+    SHA512 70ea842f0d5f1f6c6b65696ac71d96848c4873f4d794bebc40fd87af2ad4ef064c61a786bf7bc430ce4713ec6deabb8cc1a8cc0212eab148cee2d498a3683e45
 )
 
 # Patches

diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "icu",
-  "version": "74.2.0",
+  "version": "75.1.0",
   "description": "ICU is a mature, widely used set of C/C++ and Java libraries providing Unicode and Globalization support for software applications. ICU is widely portable and gives applications the same results on all platforms and between C/C++ and Java software.",
   "homepage": "http://site.icu-project.org",
   "license": "ICU",

diff --git a/ports/icu/vcpkg_acquire_icu_tools.cmake b/ports/icu/vcpkg_acquire_icu_tools.cmake