From 3fb67ee88ef04ae81e804b8372d6c39fa6c41883 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 19 Nov 2024 06:25:00 +0200 Subject: [PATCH 39/39] Revert "Update msys2 environment to 241102 level" This reverts commit 9e02454b6478b4609a68cfc028080d60cc9ad049. We're back to environment 240810. The newer environment had huge reliability issues in uploads from the environment. See RM #1145 Signed-off-by: Marko Lindqvist --- doc/README.msys2 | 5 ++--- windows/installer_msys2/Makefile.autotools | 3 +-- windows/installer_msys2/Makefile.meson | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/doc/README.msys2 b/doc/README.msys2 index 2493a93d47..546a66d472 100644 --- a/doc/README.msys2 +++ b/doc/README.msys2 @@ -10,7 +10,7 @@ using MSYS2 from https://www.msys2.org/ ============== Current official premade MSYS2 environment version info: -[premade]: msys2-freeciv-win64-241102.7z +[premade]: msys2-freeciv-win64-240810.7z [upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20240727.exe See chapter "Premade environment" for what these mean. The info @@ -177,7 +177,6 @@ Following packages have been installed: - mingw-w64--tolua - mingw-w64-ucrt-x86_64-qt6-base - mingw-w64-ucrt-x86_64-qt6-svg -- mingw-w64--wget2 After all the packages were installed 'pacman -Scc' was run to completely empty the package cache for having smaller environment package. @@ -189,7 +188,7 @@ empty the package cache for having smaller environment package. Launch build target specific msys2 shell; ucrt64.exe or mingw64.exe. Get the freeciv sources there somehow. Some options are: -1) Download freeciv tarball within msys2 shell with wget2 +1) Download freeciv tarball within msys2 shell with wget 2) Use git within msys2 shell to get them from version control 3) Copy them from Windows folder where they are to a directory that is within msys2 diff --git a/windows/installer_msys2/Makefile.autotools b/windows/installer_msys2/Makefile.autotools index ed9d80648e..bb9ae9b7df 100644 --- a/windows/installer_msys2/Makefile.autotools +++ b/windows/installer_msys2/Makefile.autotools @@ -400,8 +400,7 @@ GTK4_FCMP_DLLS := \ libwebp-7.dll \ libdeflate.dll \ libjbig-0.dll \ - libsharpyuv-0.dll \ - libharfbuzz-subset-0.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 9306137eb1..789d17b7c9 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -306,8 +306,7 @@ FCMP_GTK4_DLLS := \ libwebp-7.dll \ libdeflate.dll \ libLerc.dll \ - libsharpyuv-0.dll \ - libharfbuzz-subset-0.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.45.2