From 584d8afc52d92e628e686f0e88bbec2a26d84160 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Fri, 17 Jan 2025 15:03:45 +0100
Subject: [PATCH] libICU: update from v71.1 to v74.2 (#6396)

- libicu 74 is the latest version that builds for DSM 6
- remove make variable in DEPENDS for #6255
---
 cross/libicu/Makefile  | 10 ++++++----
 cross/libicu/PLIST     | 16 ++++++++--------
 cross/libicu/digests   |  6 +++---
 native/libicu/Makefile |  2 +-
 native/libicu/digests  |  6 +++---
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/cross/libicu/Makefile b/cross/libicu/Makefile
index c7c1f11a2ea..9933cc483f5 100644
--- a/cross/libicu/Makefile
+++ b/cross/libicu/Makefile
@@ -1,11 +1,15 @@
 PKG_NAME = libicu
-PKG_VERS = 71.1
+PKG_VERS = 74.2
 PKG_EXT = tgz
 PKG_DIST_NAME = icu4c-$(subst .,_,$(PKG_VERS))-src.$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/unicode-org/icu/releases/download/release-$(subst .,-,$(PKG_VERS))
 PKG_DIR = icu/source
 
-BUILD_DEPENDS = native/$(PKG_NAME)
+# Remarks:
+# libicu 74 is the latest version that builds for DSM 6
+# libicu >= 75 requires compiler with c++17
+
+BUILD_DEPENDS = native/libicu
 
 HOMEPAGE = http://site.icu-project.org/home
 COMMENT  = International Components for Unicode.
@@ -63,8 +67,6 @@ CONFIGURE_ARGS += --disable-tools
 CONFIGURE_ARGS += --disable-tests
 
 ADDITIONAL_CFLAGS = -O3
-ADDITIONAL_CPPFLAGS = -D_GLIBCXX_USE_C99_MATH -D_GLIBCXX_HAVE_OBSOLETE_ISNAN -D_GLIBCXX_HAVE_OBSOLETE_ISINF
-ADDITIONAL_CXXFLAGS = $(ADDITIONAL_CPPFLAGS)
 
 include ../../mk/spksrc.cross-cc.mk
 
diff --git a/cross/libicu/PLIST b/cross/libicu/PLIST
index 302a0f2c5b0..5ea70056c65 100644
--- a/cross/libicu/PLIST
+++ b/cross/libicu/PLIST
@@ -1,12 +1,12 @@
 lnk:lib/libicudata.so
-lnk:lib/libicudata.so.71
-lib:lib/libicudata.so.71.1
+lnk:lib/libicudata.so.74
+lib:lib/libicudata.so.74.2
 lnk:lib/libicui18n.so
-lnk:lib/libicui18n.so.71
-lib:lib/libicui18n.so.71.1
+lnk:lib/libicui18n.so.74
+lib:lib/libicui18n.so.74.2
 lnk:lib/libicuio.so
-lnk:lib/libicuio.so.71
-lib:lib/libicuio.so.71.1
+lnk:lib/libicuio.so.74
+lib:lib/libicuio.so.74.2
 lnk:lib/libicuuc.so
-lnk:lib/libicuuc.so.71
-lib:lib/libicuuc.so.71.1
+lnk:lib/libicuuc.so.74
+lib:lib/libicuuc.so.74.2
diff --git a/cross/libicu/digests b/cross/libicu/digests
index 048c341681c..0d8af3873f6 100644
--- a/cross/libicu/digests
+++ b/cross/libicu/digests
@@ -1,3 +1,3 @@
-icu4c-71_1-src.tgz SHA1 406b0c8635288b772913b6ff646451e69748878a
-icu4c-71_1-src.tgz SHA256 67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf
-icu4c-71_1-src.tgz MD5 e06ffc96f59762bd3c929b217445aaec
+icu4c-74_2-src.tgz SHA1 43a8d688a3a6bc8f0f8c5e699d0ef7a905d24314
+icu4c-74_2-src.tgz SHA256 68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c
+icu4c-74_2-src.tgz MD5 94c0b370f43123ea92b146ebea9c709d
diff --git a/native/libicu/Makefile b/native/libicu/Makefile
index ed6d66cdaf0..0acb723430e 100644
--- a/native/libicu/Makefile
+++ b/native/libicu/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = libicu
-PKG_VERS = 71.1
+PKG_VERS = 74.2
 PKG_EXT = tgz
 PKG_DIST_NAME = icu4c-$(subst .,_,$(PKG_VERS))-src.$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/unicode-org/icu/releases/download/release-$(subst .,-,$(PKG_VERS))
diff --git a/native/libicu/digests b/native/libicu/digests
index 048c341681c..0d8af3873f6 100644
--- a/native/libicu/digests
+++ b/native/libicu/digests
@@ -1,3 +1,3 @@
-icu4c-71_1-src.tgz SHA1 406b0c8635288b772913b6ff646451e69748878a
-icu4c-71_1-src.tgz SHA256 67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf
-icu4c-71_1-src.tgz MD5 e06ffc96f59762bd3c929b217445aaec
+icu4c-74_2-src.tgz SHA1 43a8d688a3a6bc8f0f8c5e699d0ef7a905d24314
+icu4c-74_2-src.tgz SHA256 68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c
+icu4c-74_2-src.tgz MD5 94c0b370f43123ea92b146ebea9c709d