From 55b07f3696a8b85d6c7710ca986f33ced70f2614 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Wed, 19 Feb 2025 04:06:02 +0200
Subject: [PATCH 40/40] Update msys2 environment to 250216 level

- Added clang-x86_64 toolchain

See RM #1131

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 doc/README.msys2                              | 16 ++++++----
 .../windows/installer_msys2/Makefile.meson    | 30 ++++++++++++-------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/doc/README.msys2 b/doc/README.msys2
index d378aab24a..a790695b4f 100644
--- a/doc/README.msys2
+++ b/doc/README.msys2
@@ -10,8 +10,8 @@ using MSYS2 from https://www.msys2.org/
 ==============
 
 Current official premade MSYS2 environment version info:
-[premade]:  msys2-freeciv-win64-241102.7z
-[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20240727.exe
+[premade]:  msys2-freeciv-win64-250216.7z
+[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20241208.exe
 
 See chapter "Premade environment" for what these mean. The info
 is located here for quick reference for the specific freeciv revision.
@@ -34,7 +34,8 @@ is located here for quick reference for the specific freeciv revision.
  with listing of versions current at the time of this freeciv version.
 
  "<arch>" in the package names depends on the build target:
- - win64-10 -> "ucrt-x86_64"
+ - win64-10  -> "ucrt-x86_64"
+ - win64-10+ -> "clang-x86_64"
 
 1) Install MSYS2 following the documentation on their homepage
 
@@ -133,9 +134,10 @@ by the date (YYMMDD) in the freeciv msys2 environment
 .7z package name.
 
 For each package listed below with <arch> in the name, actually
-two packages are installed;
-one where <arch> is replaced by 'x86_64', and
-one where <arch> is replaced by 'ucrt-x86_64'
+three packages are installed;
+one where <arch> is replaced by 'x86_64',
+one where <arch> is replaced by 'ucrt-x86_64', and
+one where <arch> is replaced bu 'clang-x86_64'
 
 
 Following packages have been installed:
@@ -169,6 +171,8 @@ Following packages have been installed:
 - mingw-w64-<arch>-tolua
 - mingw-w64-ucrt-x86_64-qt6-base
 - mingw-w64-ucrt-x86_64-qt6-svg
+- mingw-w64-clang-x86_64-qt6-base
+- mingw-w64-clang-x86_64-qt6-svg
 - mingw-w64-<arch>-wget2
 
 After all the packages were installed 'pacman -Scc' was run to completely
diff --git a/platforms/windows/installer_msys2/Makefile.meson b/platforms/windows/installer_msys2/Makefile.meson
index edc14f91bb..f7405cfc44 100644
--- a/platforms/windows/installer_msys2/Makefile.meson
+++ b/platforms/windows/installer_msys2/Makefile.meson
@@ -54,7 +54,7 @@ DLLPATH_PREFIX=/$(ARCHDIR)/bin/
 ifeq ($(CI),yes)
 ICUVER=75
 else
-ICUVER=75
+ICUVER=76
 endif
 
 #
@@ -178,7 +178,8 @@ SOUND_DLLS := \
 	libmpg123-0.dll \
 	libvorbisfile-3.dll \
 	libvorbis-0.dll \
-	libogg-0.dll
+	libogg-0.dll \
+	libmodplug-1.dll
 
 COMMON_DLLS := \
 	libcairo-2.dll \
@@ -255,7 +256,14 @@ FCMP_GTK3_DLLS := \
 	libpangoft2-1.0-0.dll \
 	libthai-0.dll \
 	libdatrie-1.dll \
-	librsvg-2-2.dll
+	librsvg-2-2.dll \
+	libtiff-6.dll \
+	libjpeg-8.dll \
+	libjbig-0.dll \
+	libwebp-7.dll \
+	libdeflate.dll \
+	libLerc.dll \
+	libsharpyuv-0.dll
 
 install-env-gtk3-fcmp: install-env-common
 	cp -R $(addprefix $(DLLPATH_PREFIX), $(FCMP_GTK3_DLLS)) $(INST_DIR)/$(WINARCH)-client-$(GUI)/
@@ -325,14 +333,14 @@ SDL2_DLLS := \
 	libjxl.dll \
 	libbrotlienc.dll \
 	libhwy.dll \
-        libavif-16.dll \
-        libwebpdemux-2.dll \
-        libjxl_cms.dll \
-        libaom.dll \
-        libdav1d-7.dll \
-        rav1e.dll \
-        libSvtAv1Enc-2.dll \
-        libyuv.dll
+	libavif-16.dll \
+	libwebpdemux-2.dll \
+	libjxl_cms.dll \
+	libaom.dll \
+	libdav1d-7.dll \
+	librav1e.dll \
+	libSvtAv1Enc-2.dll \
+	libyuv.dll
 
 install-env-sdl2: install-env-gtk4-fcmp
 	# Add DLLs
-- 
2.47.2