From 04a05296e9f0df13b57b313768d03b37e9b67bec Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 6 Sep 2022 05:07:06 +0300 Subject: [PATCH 58/58] Update msys2 environment to 220903 level - Include ucrt64 environment See osdn #44789 Signed-off-by: Marko Lindqvist --- doc/README.msys2 | 23 +++++++++++++---------- windows/installer_msys2/Makefile | 17 +++++++++++------ windows/installer_msys2/Makefile.meson | 15 ++++++++++++--- 3 files changed, 36 insertions(+), 19 deletions(-) diff --git a/doc/README.msys2 b/doc/README.msys2 index f37bb4acea..f9ba86620a 100644 --- a/doc/README.msys2 +++ b/doc/README.msys2 @@ -26,7 +26,7 @@ using MSYS2 from https://www.msys2.org/ 1) Install MSYS2 following the documentation on their homepage 1.1) Download - https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20220503.exe + https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20220603.exe for win64 host 1.2) Run it to install MSYS2 on build system @@ -117,14 +117,17 @@ Current version is win64 host: ----------- -msys2-freeciv-win64-220529.7z, based on -https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20220503.exe -with packages updated to 29-May-2022 level. +msys2-freeciv-win64-220903.7z, based on +https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20220603.exe +with packages updated to 03-Sep-2022 level. -Most packages are included for both win32 and win64 targets. For each package -listed below with in the name, actually two packages are installed; -one with a name where is replaced by 'i686' and -one where is replaced by 'x86_64' +Most packages are included for all of win32, win64 and +ucrt64 (win64, with minimum requirement of Windows 10) targets. +For each package listed below with in the name, actually +three packages are installed; +one with a name where is replaced by 'i686', +one where is replaced by 'x86_64', and +one where is replaced by 'ucrt-x86_64' Following packages have been installed: @@ -150,11 +153,11 @@ Following packages have been installed: - mingw-w64--SDL2_ttf - mingw-w64--SDL2_gfx - mingw-w64--imagemagick -- mingw-w64--qt5 +- mingw-w64-i686-qt5, mingw-w64-x86_64-qt5 - mingw-w64--drmingw - mingw-w64--meson - mingw-w64--tolua -- mingw-w64-x86_64-qt6-base +- mingw-w64-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 b/windows/installer_msys2/Makefile index 681acae93b..0167e0b3f7 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -41,7 +41,6 @@ else QT6_MOCCMD="$(MOCCMD)" endif -ICUVER=69 MAGICKVER=7.Q16HDRI-10 INSTSUB=${ARCHDIR} @@ -50,7 +49,11 @@ INSTSUB=${ARCHDIR} DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) +ICUVER=69 +FFIVER=7 else +ICUVER=71 +FFIVER=8 endif # @@ -64,7 +67,7 @@ all-win64: gtk3.22-installer sdl2-installer ruledit-installer qt5-installer qt6- all-win32: gtk3.22-installer sdl2-installer ruledit-installer-qt5 qt5-installer gtk4-installer -all-win64-10: gtk3.22-installer sdl2-installer ruledit-installer qt5-installer qt6-installer gtk4-installer +all-win64-10: gtk3.22-installer sdl2-installer ruledit-installer qt6-installer gtk4-installer gtk3.22-installer: make GUI=gtk3.22 CLIENT=gtk3.22 FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit $(EXTRA_CONFIG)" wrap-gtk3.22 @@ -258,7 +261,7 @@ COMMON_DLLS := \ libbz2-1.dll \ libcairo-2.dll \ libcairo-gobject-2.dll \ - libffi-7.dll \ + libffi-${FFIVER}.dll \ libfontconfig-1.dll \ libfreetype-6.dll \ $(LIBGCCDLL) \ @@ -374,7 +377,9 @@ SDL2_DLLS := \ libSDL2_gfx-1-0-0.dll \ SDL2_image.dll \ SDL2_ttf.dll \ - libzstd.dll + libzstd.dll \ + libjxl.dll \ + libbrotlienc.dll install-env-sdl2: install-env-gtk4-fcmp # add DLLs @@ -448,7 +453,7 @@ RULEDIT_QT5_DLLS := \ libbz2-1.dll \ libcairo-2.dll \ libcairo-gobject-2.dll \ - libffi-7.dll \ + libffi-${FFIVER}.dll \ libfontconfig-1.dll \ libfreetype-6.dll \ $(LIBGCCDLL) \ @@ -507,7 +512,7 @@ RULEDIT_QT6_DLLS := \ libbz2-1.dll \ libcairo-2.dll \ libcairo-gobject-2.dll \ - libffi-7.dll \ + libffi-${FFIVER}.dll \ libfontconfig-1.dll \ libfreetype-6.dll \ $(LIBGCCDLL) \ diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index a4f027f60b..97502bdc39 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -28,12 +28,19 @@ else error "Unsupported MSYSTEM environment" endif -ICUVER=69 MAGICKVER=7.Q16HDRI-10 # msys2 has dlls in... DLLPATH_PREFIX=/$(ARCHDIR)/bin/ +ifeq ($(CI),yes) +ICUVER=69 +FFIVER=7 +else +ICUVER=71 +FFIVER=8 +endif + # # Make rules # @@ -112,7 +119,7 @@ COMMON_DLLS := \ libcairo-gobject-2.dll \ libfribidi-0.dll \ libpangowin32-1.0-0.dll \ - libffi-7.dll \ + libffi-${FFIVER}.dll \ libbz2-1.dll \ libbrotlidec.dll \ libbrotlicommon.dll \ @@ -217,7 +224,9 @@ install-env-gtk4: install-env-gtk4-fcmp SDL2_DLLS := \ SDL2_ttf.dll \ libSDL2_gfx-1-0-0.dll \ - SDL2_image.dll + SDL2_image.dll \ + libjxl.dll \ + libbrotlienc.dll install-env-sdl2: install-env-gtk4-fcmp # add DLLs -- 2.35.1