From 536c2a95967e7eb125bd721651f536e0a30559f0 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 12 May 2023 23:15:05 +0300 Subject: [PATCH 26/26] Update msys2 environment to 230507 level - Update to upstream snapshot 230318 See osdn #47993 Signed-off-by: Marko Lindqvist --- doc/README.msys2 | 4 ++-- windows/installer_msys2/Makefile.autotools | 5 +---- windows/installer_msys2/Makefile.meson | 10 ++++------ 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/doc/README.msys2 b/doc/README.msys2 index 4a922dbf1b..39424ffd58 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-230220.7z -[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20230127.exe +[premade]: msys2-freeciv-win64-230507.7z +[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20230318.exe See chapter "Premade environment" for what these mean. The info is located here for quick reference for the specific freeciv revision. diff --git a/windows/installer_msys2/Makefile.autotools b/windows/installer_msys2/Makefile.autotools index 709d138eda..59a7822fe4 100644 --- a/windows/installer_msys2/Makefile.autotools +++ b/windows/installer_msys2/Makefile.autotools @@ -332,7 +332,6 @@ COMMON_DLLS := \ libbrotlicommon.dll \ libreadline8.dll \ libtermcap-0.dll \ - libssp-0.dll \ libzstd.dll \ libMagickWand-${MAGICKVER}.dll \ libMagickCore-${MAGICKVER}.dll \ @@ -399,9 +398,7 @@ GTK4_FCMP_DLLS := \ libwebp-7.dll \ libdeflate.dll \ libjbig-0.dll \ - libsharpyuv-0.dll \ - libEGL.dll \ - libGLESv2.dll + libsharpyuv-0.dll install-env-gtk4-fcmp: install-env-common cp -R $(addprefix $(DLLPATH_PREFIX), $(GTK4_FCMP_DLLS)) $(INST_DIR)/$(WINARCH)-$(GUI)/ diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index cab83fbc1b..b64a796b4a 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -181,8 +181,7 @@ SOUND_DLLS := \ libmpg123-0.dll \ libvorbisfile-3.dll \ libvorbis-0.dll \ - libogg-0.dll \ - libssp-0.dll + libogg-0.dll COMMON_DLLS := \ libcairo-2.dll \ @@ -255,7 +254,8 @@ FCMP_GTK3_DLLS := \ libepoxy-0.dll \ libpangoft2-1.0-0.dll \ libthai-0.dll \ - libdatrie-1.dll + libdatrie-1.dll \ + librsvg-2-2.dll install-env-gtk3-fcmp: install-env-common cp -R $(addprefix $(DLLPATH_PREFIX), $(FCMP_GTK3_DLLS)) $(INST_DIR)/$(WINARCH)-client-$(GUI)/ @@ -288,9 +288,7 @@ FCMP_GTK4_DLLS := \ libwebp-7.dll \ libdeflate.dll \ libLerc.dll \ - libsharpyuv-0.dll \ - libEGL.dll \ - libGLESv2.dll + libsharpyuv-0.dll install-env-gtk4-fcmp: install-env-common cp -R $(addprefix $(DLLPATH_PREFIX), $(FCMP_GTK4_DLLS)) $(INST_DIR)/$(WINARCH)-client-$(GUI)/ -- 2.39.2