Skip to content

Commit 3d12665

Browse files
committed
Update icu to v75.1
1 parent b53f318 commit 3d12665

6 files changed

+14
-93
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ the requirements.
4848

4949
| Library | Version | Release Date |
5050
|---|:---:|:---:|
51-
| [icu](http://site.icu-project.org) | 74.2 | 2023-12-11 |
51+
| [icu](http://site.icu-project.org) | 75.1 | 2024-04-17 |
5252
| [zlib](https://github.com/zlib-ng/zlib-ng) | 2.1.6 | 2024-01-10 |
5353
| [brotli](https://github.com/google/brotli) | 1.1.0 | 2023-08-31 |
5454
| [libressl](https://www.libressl.org) | 3.9.1 | 2024-03-27 |

ports/icu/patches/0001-Add-CMake-platform.patch

+7-26
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 5ffc30f0afb6718ee347f4aa4ac46097547c041f Mon Sep 17 00:00:00 2001
1+
From 5c04c91d4941c422abeea20863f01146afa2f4e1 Mon Sep 17 00:00:00 2001
22
From: foopoiuyt <github@zombiestormtrooper.com>
33
Date: Tue, 3 Nov 2020 08:58:19 -0800
44
Subject: [PATCH 1/2] Add CMake platform
@@ -15,7 +15,7 @@ Modified version of the LibCMaker ICU files.
1515
source/common_tools_exe_flags.cmake | 86 +
1616
source/common_tools_exe_libs.cmake | 8 +
1717
source/configure_1st.cmake | 137 +
18-
source/configure_2nd.cmake | 1208 +++
18+
source/configure_2nd.cmake | 1189 +++
1919
source/data/CMakeLists.txt | 340 +
2020
.../data/cmake-brkitr-index-txt-content.in | 21 +
2121
.../data/cmake-coll-index-txt-content.in | 168 +
@@ -56,7 +56,7 @@ Modified version of the LibCMaker ICU files.
5656
source/tools/makeconv/CMakeLists.txt | 31 +
5757
source/tools/pkgdata/CMakeLists.txt | 35 +
5858
source/tools/toolutil/CMakeLists.txt | 59 +
59-
51 files changed, 20144 insertions(+)
59+
51 files changed, 20125 insertions(+)
6060
create mode 100644 LICENSE_CMakeLists
6161
create mode 100644 README_CMakeLists.txt
6262
create mode 100644 source/CMakeLists.txt
@@ -1143,10 +1143,10 @@ index 00000000000..dd22f884c3a
11431143
+status_message("release ${VERSION}, library ${LIB_VERSION}, unicode version ${UNICODE_VERSION}")
11441144
diff --git a/source/configure_2nd.cmake b/source/configure_2nd.cmake
11451145
new file mode 100644
1146-
index 00000000000..be373fbc3c3
1146+
index 00000000000..637c17e4bd3
11471147
--- /dev/null
11481148
+++ b/source/configure_2nd.cmake
1149-
@@ -0,0 +1,1208 @@
1149+
@@ -0,0 +1,1189 @@
11501150
+# Copyright (c) 2018, NikitaFeodonit. All rights reserved.
11511151
+#
11521152
+# ICU build file for CMake build tools
@@ -1268,7 +1268,7 @@ index 00000000000..be373fbc3c3
12681268
+
12691269
+set(CMAKE_C_STANDARD 99)
12701270
+set(CMAKE_C_STANDARD_REQUIRED ON)
1271-
+set(CMAKE_CXX_STANDARD 11)
1271+
+set(CMAKE_CXX_STANDARD 17)
12721272
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
12731273
+
12741274
+# Check whether to build debug libraries check_message("whether to build debug libraries"
@@ -1549,25 +1549,6 @@ index 00000000000..be373fbc3c3
15491549
+# Check whether to use the evil rpath or not
15501550
+option(ICU_ENABLE_RPATH "Use rpath when linking" OFF)
15511551
+
1552-
+if(CMAKE_CXX_STANDARD LESS 11)
1553-
+ try_compile_src(
1554-
+ "if_include_string_works"
1555-
+ "cpp"
1556-
+ "#include <string>"
1557-
+ ""
1558-
+ ""
1559-
+ ""
1560-
+ _HEADER_STDSTRING
1561-
+ )
1562-
+ if(_HEADER_STDSTRING)
1563-
+ set(U_HAVE_STD_STRING 1)
1564-
+ else()
1565-
+ set(U_HAVE_STD_STRING 0)
1566-
+ list(APPEND CONFIG_CPPFLAGS U_HAVE_STD_STRING=0)
1567-
+ endif()
1568-
+ check_message("if #include <string> works" ${_HEADER_STDSTRING})
1569-
+endif()
1570-
+
15711552
+# NOTE: this check is removed in ICU 63.1, C++11 has <atomic>.
15721553
+try_compile_src(
15731554
+ "if_include_atomic_works"
@@ -20560,5 +20541,5 @@ index 00000000000..36b15d4783d
2056020541
+ DESTINATION "${includedir}"
2056120542
+)
2056220543
--
20563-
2.43.0.windows.1
20544+
2.44.0.windows.1
2056420545

ports/icu/patches/0002-Remove-install-suffix-on-Windows.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 156c36dae2c60b9022f96ad0fd7eb36e6f9153b7 Mon Sep 17 00:00:00 2001
1+
From a11ab9ddf2fc8d6a64ec03a96f95f85aadf01e8f Mon Sep 17 00:00:00 2001
22
From: foopoiuyt <github@zombiestormtrooper.com>
33
Date: Tue, 3 Nov 2020 09:02:25 -0800
44
Subject: [PATCH 2/2] Remove install suffix on Windows
@@ -27,5 +27,5 @@ index 34688e43176..f1e1ba7b13e 100644
2727
# Package information
2828
set(PACKAGE_ICU_DESCRIPTION "International Components for Unicode")
2929
--
30-
2.43.0.windows.1
30+
2.44.0.windows.1
3131

ports/icu/portfile.cmake

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
set(VERSION_MAJOR 74)
2-
set(VERSION_MINOR 2)
1+
set(VERSION_MAJOR 75)
2+
set(VERSION_MINOR 1)
33
set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}")
44
set(VERSION2 "${VERSION_MAJOR}_${VERSION_MINOR}")
55
set(VERSION3 "${VERSION_MAJOR}-${VERSION_MINOR}")
@@ -8,7 +8,7 @@ set(VERSION3 "${VERSION_MAJOR}-${VERSION_MINOR}")
88
vcpkg_download_distfile(ARCHIVE
99
URLS "https://github.com/unicode-org/icu/releases/download/release-${VERSION3}/icu4c-${VERSION2}-src.tgz"
1010
FILENAME "icu4c-${VERSION2}-src.tgz"
11-
SHA512 e6c7876c0f3d756f3a6969cad9a8909e535eeaac352f3a721338b9cbd56864bf7414469d29ec843462997815d2ca9d0dab06d38c37cdd4d8feb28ad04d8781b0
11+
SHA512 70ea842f0d5f1f6c6b65696ac71d96848c4873f4d794bebc40fd87af2ad4ef064c61a786bf7bc430ce4713ec6deabb8cc1a8cc0212eab148cee2d498a3683e45
1212
)
1313

1414
# Patches

ports/icu/vcpkg.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "icu",
3-
"version": "74.2.0",
3+
"version": "75.1.0",
44
"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.",
55
"homepage": "http://site.icu-project.org",
66
"license": "ICU",

ports/icu/vcpkg_acquire_icu_tools.cmake

-60
This file was deleted.

0 commit comments

Comments
 (0)