From 9689f0fe114c6b43653819dbce7ee3c57838223d Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Tue, 21 Apr 2026 03:53:48 +0300
Subject: [PATCH 30/30] Update msys2 environment to 260416 level

- Update to upstream snapshot 20260322
- Remove mingw-w64-x86_64-qt5-svg

See RM #1983

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 doc/README.msys2                                 | 5 ++---
 platforms/windows/installer_msys2/Makefile.meson | 7 ++-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/doc/README.msys2 b/doc/README.msys2
index def5949b45..0bd4a7c82b 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-260111.7z
-[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20251213.exe
+[premade]:  msys2-freeciv-win64-260416.7z
+[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20260322.exe
 
 See chapter "Premade environment" for what these mean. The info is
 located here on top for quick reference for the specific freeciv revision.
@@ -167,7 +167,6 @@ Following packages have been installed:
 - mingw-w64-<arch>-sdl3-ttf
 - mingw-w64-<arch>-imagemagick
 - mingw-w64-x86_64-qt5-base
-- mingw-w64-x86_64-qt5-svg
 - mingw-w64-<arch>-drmingw
 - mingw-w64-<arch>-meson
 - mingw-w64-<arch>-tolua
diff --git a/platforms/windows/installer_msys2/Makefile.meson b/platforms/windows/installer_msys2/Makefile.meson
index fbebff899f..329abad941 100644
--- a/platforms/windows/installer_msys2/Makefile.meson
+++ b/platforms/windows/installer_msys2/Makefile.meson
@@ -48,17 +48,15 @@ endif
 MAGICKVER=7.Q16HDRI-10
 FFIVER=8
 CRYPTOVERSUF=3${CRYPTOLIB_SUFFIX}
+SVTAV1ENCVER=4
 
 # msys2 has dlls in...
 DLLPATH_PREFIX=/$(ARCHDIR)/bin/
 
 ifeq ($(CI),yes)
 ICUVER=78
-SVTAV1ENC=libSvtAv1Enc-4.dll
 else
 ICUVER=78
-CRYPTO_OSSL=libngtcp2_crypto_ossl.dll
-SVTAV1ENC=libSvtAv1Enc-3.dll
 endif
 
 #
@@ -254,7 +252,6 @@ COMMON_DLLS := \
 	exchndl.dll \
 	mgwhelp.dll \
 	libngtcp2-16.dll \
-	$(CRYPTO_OSSL) \
 	libngtcp2_crypto_ossl-0.dll
 
 install-env-common:
@@ -373,7 +370,7 @@ SDL2_DLLS := \
 	libaom.dll \
 	libdav1d-7.dll \
 	librav1e.dll \
-	$(SVTAV1ENC) \
+	libSvtAv1Enc-${SVTAV1ENCVER}.dll \
 	libyuv.dll
 
 SDL3_DLLS := \
-- 
2.53.0