From 97f7b8c57154a0f569afc3fb00a2ed7a6b09f5cb Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 11 Oct 2023 01:36:39 +0300 Subject: [PATCH 46/46] Update msys2 environment to 231008 level - Update to upstream snapshot 230718 See osdn #48826 Signed-off-by: Marko Lindqvist --- doc/README.msys2 | 4 ++-- platforms/windows/installer_msys2/Makefile.autotools | 3 ++- platforms/windows/installer_msys2/Makefile.meson | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/README.msys2 b/doc/README.msys2 index 38b8ccb5e0..ceef9e7671 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-230620.7z -[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20230526.exe +[premade]: msys2-freeciv-win64-231008.7z +[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20230718.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/platforms/windows/installer_msys2/Makefile.autotools b/platforms/windows/installer_msys2/Makefile.autotools index 0e74a7d1dd..8744c2ec0c 100644 --- a/platforms/windows/installer_msys2/Makefile.autotools +++ b/platforms/windows/installer_msys2/Makefile.autotools @@ -70,7 +70,6 @@ endif MAGICKVER=7.Q16HDRI-10 FFIVER=8 -ICUVER=72 CRYPTOVERSUF=3${CRYPTOLIB_SUFFIX} INSTSUB=${ARCHDIR} @@ -79,7 +78,9 @@ INSTSUB=${ARCHDIR} DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) +ICUVER=72 else +ICUVER=73 endif # diff --git a/platforms/windows/installer_msys2/Makefile.meson b/platforms/windows/installer_msys2/Makefile.meson index 01c49865bc..71933b3c2c 100644 --- a/platforms/windows/installer_msys2/Makefile.meson +++ b/platforms/windows/installer_msys2/Makefile.meson @@ -65,14 +65,15 @@ endif MAGICKVER=7.Q16HDRI-10 FFIVER=8 -ICUVER=72 CRYPTOVERSUF=3${CRYPTOLIB_SUFFIX} # msys2 has dlls in... DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) +ICUVER=72 else +ICUVER=73 endif # -- 2.42.0