From 05a682b0bf74e09d7c9a898615024a95fb4b1d46 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 27 Dec 2022 03:53:54 +0200 Subject: [PATCH 41/41] Update msys2 environment to 221223 level - Update to upstream snapshot 221216 - Drop Qt6 from x86_64 (it's in preferred ucrt64) See osdn #46338 Signed-off-by: Marko Lindqvist --- doc/README.msys2 | 6 +++--- windows/installer_msys2/Makefile.autotools | 2 +- windows/installer_msys2/Makefile.meson | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/README.msys2 b/doc/README.msys2 index 694c46a8ae..124b558ab1 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-221105.7z -[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20221028.exe +[premade]: msys2-freeciv-win64-221223.7z +[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20221216.exe See chapter "Premade environment" for what these mean. The info is located here for quick reference for the specific freeciv revision. @@ -176,7 +176,7 @@ Following packages have been installed: - mingw-w64--drmingw - mingw-w64--meson - mingw-w64--tolua -- mingw-w64-x86_64-qt6-base, mingw-w64-ucrt-x86_64-qt6-base +- mingw-w64-ucrt-x86_64-qt6-base After all the packages were installed 'pacman -Scc' was run to completely empty the package cache for having smaller environment package. diff --git a/windows/installer_msys2/Makefile.autotools b/windows/installer_msys2/Makefile.autotools index 4f5aa1894a..b1478565cf 100644 --- a/windows/installer_msys2/Makefile.autotools +++ b/windows/installer_msys2/Makefile.autotools @@ -374,7 +374,7 @@ GTK4_FCMP_DLLS := \ liblzo2-2.dll \ libgraphite2.dll \ libdatrie-1.dll \ - libtiff-5.dll \ + libtiff-6.dll \ libjpeg-8.dll \ libLerc.dll \ libwebp-7.dll \ diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index c513c57746..80066664bf 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -43,7 +43,9 @@ ICUVER=72 DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) +TIFF=libtiff-5.dll else +TIFF=libtiff-6.dll endif # @@ -240,7 +242,7 @@ FCMP_GTK4_DLLS := \ liblzo2-2.dll \ libthai-0.dll \ libdatrie-1.dll \ - libtiff-5.dll \ + $(TIFF) \ libjpeg-8.dll \ libjbig-0.dll \ libwebp-7.dll \ -- 2.35.1