From b9736787cea2e1e04cffa289b013f9a9d3c8351c Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 25 Jun 2023 02:23:02 +0300 Subject: [PATCH 29/29] Update msys2 environment to 230620 level - Update to upstream snapshot 230526 - Add 7zip packages - Add qt svg packages See osdn #48218 Signed-off-by: Marko Lindqvist --- doc/README.msys2 | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/doc/README.msys2 b/doc/README.msys2 index aa14c67047..38b8ccb5e0 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-230507.7z -[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20230318.exe +[premade]: msys2-freeciv-win64-230620.7z +[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20230526.exe See chapter "Premade environment" for what these mean. The info is located here for quick reference for the specific freeciv revision. @@ -107,9 +107,11 @@ is located here for quick reference for the specific freeciv revision. 2.1.2.4) Arch-specific packages for buildind Qt5-client and/or Qt5 Ruledit - mingw-w64--qt5-base + - mingw-w64--qt5-svg 2.1.2.5) Arch-specific packages for building Qt6-client and/or Qt6 Ruledit - mingw-w64--qt6-base + - mingw-w64--qt6-svg 2.1.2.6) Arch-specific packages for building sdl2-client - mingw-w64--SDL2_image @@ -120,7 +122,11 @@ is located here for quick reference for the specific freeciv revision. These are needed in addition to above ones used in the building step already. -2.2.1) Arch-specific packages needed for building installer +2.2.1) Arch-specific packages needed for building portable + package + - mingw-w64--7zip + +2.2.2) Arch-specific packages needed for building installer package - mingw-w64--nsis @@ -167,16 +173,19 @@ Following packages have been installed: - mingw-w64--gtk3 - mingw-w64--gtk4 - mingw-w64--nsis +- mingw-w64--7zip - mingw-w64--SDL2_mixer - mingw-w64--SDL2_image - mingw-w64--SDL2_ttf - mingw-w64--SDL2_gfx - mingw-w64--imagemagick - mingw-w64-i686-qt5-base, mingw-w64-x86_64-qt5-base +- mingw-w64-i686-qt5-svg, mingw-w64-x86_64-qt5-svg - mingw-w64--drmingw - mingw-w64--meson - mingw-w64--tolua - mingw-w64-ucrt-x86_64-qt6-base +- mingw-w64-ucrt-x86_64-qt6-svg After all the packages were installed 'pacman -Scc' was run to completely empty the package cache for having smaller environment package. -- 2.40.1