From 39af0af75822f082e7a0a9546573e3805507bfb7 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Mon, 28 Sep 2026 18:01:40 +0300
Subject: [PATCH 76/76] Update msys2 environment to 260927 level

- Update to upstream snapshot 20260927
- Drop SDL2_gfx packages
- Drop tolua packages
- Add diffutils packages

See RM #2252

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

diff --git a/doc/README.msys2 b/doc/README.msys2
index e555b0bc61..56f88094dd 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-260728.7z
-[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20260611.exe
+[premade]:  msys2-freeciv-win64-260927.7z
+[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20260927.exe
 
 See chapter "Premade environment" for what these mean. The info is
 located here on top for quick reference for the specific freeciv revision.
@@ -83,13 +83,13 @@ located here on top for quick reference for the specific freeciv revision.
  - mingw-w64-<arch>-pkgconf
  - mingw-w64-<arch>-icu
  - mingw-w64-<arch>-curl
+ - mingw-w64-<arch>-diffutils
  - mingw-w64-<arch>-imagemagick
  - mingw-w64-<arch>-SDL2_mixer
  - mingw-w64-<arch>-sdl3-mixer
 
 2.1.2.1.2) Arch-specific optional packages for building common parts
  - mingw-w64-<arch>-drmingw
- - mingw-w64-<arch>-tolua
 
 2.1.2.2) Arch-specific packages for building gtk3.22-client
  - mingw-w64-<arch>-gtk3
@@ -104,7 +104,6 @@ located here on top for quick reference for the specific freeciv revision.
 2.1.2.5) Arch-specific packages for building sdl2-client
  - mingw-w64-<arch>-SDL2_image
  - mingw-w64-<arch>-SDL2_ttf
- - mingw-w64-<arch>-SDL2_gfx
 
 2.1.2.6) Arch-specific packages for building sdl3-client
  - mingw-w64-<arch>-sdl3-image
@@ -158,12 +157,13 @@ Following packages have been installed:
 - mingw-w64-<arch>-sqlite3
 - mingw-w64-<arch>-gtk3
 - mingw-w64-<arch>-gtk4
+- mingw-w64-ucrt-x86_64-diffutils
+- mingw-w64-clang-x86_64-diffutils
 - mingw-w64-<arch>-nsis
 - mingw-w64-<arch>-7zip
 - mingw-w64-<arch>-SDL2_mixer
 - mingw-w64-<arch>-SDL2_image
 - mingw-w64-<arch>-SDL2_ttf
-- mingw-w64-<arch>-SDL2_gfx
 - mingw-w64-<arch>-sdl3-mixer
 - mingw-w64-<arch>-sdl3-image
 - mingw-w64-<arch>-sdl3-ttf
@@ -171,7 +171,6 @@ Following packages have been installed:
 - mingw-w64-x86_64-qt5-base
 - mingw-w64-<arch>-drmingw
 - mingw-w64-<arch>-meson
-- 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
diff --git a/platforms/windows/installer_msys2/Makefile.meson b/platforms/windows/installer_msys2/Makefile.meson
index fb458894bf..040a75c59f 100644
--- a/platforms/windows/installer_msys2/Makefile.meson
+++ b/platforms/windows/installer_msys2/Makefile.meson
@@ -360,7 +360,6 @@ install-env-gtk4x: install-env-gtk4-fcmp
 
 SDL2_DLLS := \
 	SDL2_ttf.dll \
-	libSDL2_gfx-1-0-0.dll \
 	SDL2_image.dll \
 	libjxl.dll \
 	libbrotlienc.dll \
-- 
2.53.0