From 07914f268a8866bfd36952379870e445d7555448 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Tue, 8 Jul 2025 03:51:19 +0300
Subject: [PATCH 70/80] Update msys2 environment to 250707 level

- Update to upstream snapshot 250622
- Add sdl3-image and sdl3-ttf packages

See RM #1392

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

diff --git a/doc/README.msys2 b/doc/README.msys2
index 0587a365aa..5f46582446 100644
--- a/doc/README.msys2
+++ b/doc/README.msys2
@@ -10,11 +10,11 @@ using MSYS2 from https://www.msys2.org/
 ==============
 
 Current official premade MSYS2 environment version info:
-[premade]:  msys2-freeciv-win64-250216.7z
-[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20241208.exe
+[premade]:  msys2-freeciv-win64-250707.7z
+[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20250622.exe
 
-See chapter "Premade environment" for what these mean. The info
-is located here for quick reference for the specific freeciv revision.
+See chapter "Premade environment" for what these mean. The info is
+located here on top for quick reference for the specific freeciv revision.
 
 
  Status
@@ -163,6 +163,8 @@ Following packages have been installed:
 - mingw-w64-<arch>-SDL2_image
 - mingw-w64-<arch>-SDL2_ttf
 - mingw-w64-<arch>-SDL2_gfx
+- mingw-w64-<arch>-sdl3-image
+- mingw-w64-<arch>-sdl3-ttf
 - mingw-w64-<arch>-imagemagick
 - mingw-w64-x86_64-qt5-base
 - mingw-w64-x86_64-qt5-svg
diff --git a/platforms/windows/installer_msys2/Makefile.meson b/platforms/windows/installer_msys2/Makefile.meson
index 7203708e8a..b5d36b1d72 100644
--- a/platforms/windows/installer_msys2/Makefile.meson
+++ b/platforms/windows/installer_msys2/Makefile.meson
@@ -54,12 +54,10 @@ DLLPATH_PREFIX=/$(ARCHDIR)/bin/
 
 ifeq ($(CI),yes)
 ICUVER=77
-SVTAV1ENV=libSvtAv1Enc-3.dll
-SNDFILES=libwavpack-1.dll libxmp.dll
+ACCESSKIT=
 else
-ICUVER=76
-SVTAV1ENV=libSvtAv1Enc-2.dll
-SNDFILES=libmodplug-1.dll
+ICUVER=77
+ACCESSKIT=libaccesskit-c-0.15.dll
 endif
 
 #
@@ -185,7 +183,8 @@ SOUND_DLLS := \
 	libvorbisfile-3.dll \
 	libvorbis-0.dll \
 	libogg-0.dll \
-	${SNDFILES}
+	libwavpack-1.dll \
+	libxmp.dll
 
 COMMON_DLLS := \
 	libcairo-2.dll \
@@ -243,7 +242,9 @@ COMMON_DLLS := \
 	libraqm-0.dll \
 	libunistring-5.dll \
 	exchndl.dll \
-	mgwhelp.dll
+	mgwhelp.dll \
+	libngtcp2-16.dll \
+	libngtcp2_crypto_ossl.dll
 
 CLIENT_COMMON_DLLS := \
 	$(SOUND_DLLS)
@@ -303,7 +304,8 @@ FCMP_GTK4_DLLS := \
 	libdeflate.dll \
 	libLerc.dll \
 	libsharpyuv-0.dll \
-	libharfbuzz-subset-0.dll
+	libharfbuzz-subset-0.dll \
+	${ACCESSKIT}
 
 install-env-gtk4-fcmp: install-env-common
 	cp -R $(addprefix $(DLLPATH_PREFIX), $(FCMP_GTK4_DLLS)) $(INST_DIR)/$(WINARCH)-client-$(GUI)/
@@ -345,7 +347,7 @@ SDL2_DLLS := \
 	libaom.dll \
 	libdav1d-7.dll \
 	librav1e.dll \
-	${SVTAV1ENV} \
+	libSvtAv1Enc-3.dll \
 	libyuv.dll
 
 install-env-sdl2: install-env-gtk4-fcmp
-- 
2.47.2