From 5aa9de79f35089462e9d49f9f10dcea666b5f8be Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 13 Jan 2026 03:18:44 +0200 Subject: [PATCH 61/61] Update msys2 environment to 260111 level - Update to upstream snapshot 20251213 - Remove packets for autotools based build See RM #1819 Signed-off-by: Marko Lindqvist --- doc/README.msys2 | 8 ++------ .../windows/installer_msys2/Makefile.meson | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/doc/README.msys2 b/doc/README.msys2 index c9b2ef34b2..def5949b45 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-251025.7z -[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20250830.exe +[premade]: msys2-freeciv-win64-260111.7z +[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20251213.exe See chapter "Premade environment" for what these mean. The info is located here on top for quick reference for the specific freeciv revision. @@ -149,10 +149,6 @@ Following packages have been installed: - tar - git - patch -- automake1.17 -- libtool -- autoconf2.72 -- autoconf-wrapper - gdb - mingw-w64--gcc - mingw-w64--pkgconf diff --git a/platforms/windows/installer_msys2/Makefile.meson b/platforms/windows/installer_msys2/Makefile.meson index 116e669d29..a444cb7e11 100644 --- a/platforms/windows/installer_msys2/Makefile.meson +++ b/platforms/windows/installer_msys2/Makefile.meson @@ -55,7 +55,7 @@ DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) ICUVER=78 else -ICUVER=77 +ICUVER=78 endif # @@ -308,7 +308,20 @@ FCMP_GTK4_DLLS := \ libdeflate.dll \ libLerc.dll \ libsharpyuv-0.dll \ - libharfbuzz-subset-0.dll + libharfbuzz-subset-0.dll \ + libgstbase-1.0-0.dll \ + libgstgl-1.0-0.dll \ + libgstallocators-1.0-0.dll \ + libgstd3d12-1.0-0.dll \ + libgstplay-1.0-0.dll \ + libgstreamer-1.0-0.dll \ + libgstvideo-1.0-0.dll \ + libgstaudio-1.0-0.dll \ + libgstd3dshader-1.0-0.dll \ + libgstpbutils-1.0-0.dll \ + libgsttag-1.0-0.dll \ + librsvg-2-2.dll \ + liborc-0.4-0.dll install-env-gtk4-fcmp: install-env-common cp -R $(addprefix $(DLLPATH_PREFIX), $(FCMP_GTK4_DLLS)) $(INST_DIR)/$(WINARCH)-client-$(GUI)/ -- 2.51.0