From f3e209dba79087e8e6e66aa87e954e53e565be16 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Mon, 8 Jul 2024 16:15:55 +0200
Subject: [PATCH] [icu] Fix mingw (#39742)

---
 ports/icu/mingw-strict-ansi.diff | 12 ++++++++++++
 ports/icu/portfile.cmake         |  1 +
 ports/icu/vcpkg.json             |  2 +-
 versions/baseline.json           |  2 +-
 versions/i-/icu.json             |  5 +++++
 5 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 ports/icu/mingw-strict-ansi.diff

diff --git a/ports/icu/mingw-strict-ansi.diff b/ports/icu/mingw-strict-ansi.diff
new file mode 100644
index 0000000000..ea6de18bdd
--- /dev/null
+++ b/ports/icu/mingw-strict-ansi.diff
@@ -0,0 +1,12 @@
+diff --git a/source/common/putil.cpp b/source/common/putil.cpp
+index ab25f3b..94782f8 100644
+--- a/source/common/putil.cpp
++++ b/source/common/putil.cpp
+@@ -48,7 +48,6 @@
+ 
+ #if U_PLATFORM == U_PF_MINGW && defined __STRICT_ANSI__
+ /* tzset isn't defined in strict ANSI on MinGW. */
+-#undef __STRICT_ANSI__
+ #endif
+ 
+ /*
diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake
index 10d50ae9fc..26015d2658 100644
--- a/ports/icu/portfile.cmake
+++ b/ports/icu/portfile.cmake
@@ -36,6 +36,7 @@ vcpkg_extract_source_archive(SOURCE_PATH
         fix-win-build.patch
         vcpkg-cross-data.patch
         darwin-rpath.patch
+        mingw-strict-ansi.diff # backport of https://github.com/unicode-org/icu/pull/3003
 )
 
 vcpkg_find_acquire_program(PYTHON3)
diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json
index 5184dabf9d..23c96f05e1 100644
--- a/ports/icu/vcpkg.json
+++ b/ports/icu/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "icu",
   "version": "74.2",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Mature and widely used Unicode and localization library.",
   "homepage": "https://icu.unicode.org/home",
   "license": "ICU",
diff --git a/versions/baseline.json b/versions/baseline.json
index 119e80a272..c255b266a7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3502,7 +3502,7 @@
     },
     "icu": {
       "baseline": "74.2",
-      "port-version": 3
+      "port-version": 4
     },
     "ideviceinstaller": {
       "baseline": "2023-07-21",
diff --git a/versions/i-/icu.json b/versions/i-/icu.json
index 9df34f69ef..89761f81c1 100644
--- a/versions/i-/icu.json
+++ b/versions/i-/icu.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "291bbc492b8f73dea0dbd12051e9b12b21aef900",
+      "version": "74.2",
+      "port-version": 4
+    },
     {
       "git-tree": "fd268f9bb3ccbccf9bcd7eac2c2ff407625477dd",
       "version": "74.2",