From d11e55e2d20e590897d1e86661c2a2d0ed783ec3 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Wed, 1 Jun 2022 07:30:01 +0300
Subject: [PATCH 50/50] Update msys2 environment to 220529 level

- Install 'autoconf2.71' + 'autoconf-wrapper' instead of all
  of 'autoconf' meta package

See osdn #43947

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 doc/README.msys2                 | 14 ++++++++------
 windows/installer_msys2/Makefile |  3 +--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/doc/README.msys2 b/doc/README.msys2
index a8a49cec8d..db2fb9ceff 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-20220118.exe
+ https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20220503.exe
  for win64 host
 
 1.2) Run it to install MSYS2 on build system
@@ -62,7 +62,8 @@ using MSYS2 from https://www.msys2.org/
  - git
  - automake1.16
  - libtool
- - autoconf
+ - autoconf2.71
+ - autoconf-wrapper
 
 2.1.2) Arch-specific packages needed for building freeciv
 
@@ -113,9 +114,9 @@ Current version is
 
 win64 host:
 -----------
-msys2-freeciv-win64-220309.7z, based on
-https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20220118.exe
-with packages updated to 09-Mar-2022 level.
+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.
 
 Most packages are included for both win32 and win64 targets. For each package
 listed below with <arch> in the name, actually two packages are installed;
@@ -130,7 +131,8 @@ Following packages have been installed:
 - patch
 - automake1.16
 - libtool
-- autoconf
+- autoconf2.71
+- autoconf-wrapper
 - gdb
 - mingw-w64-<arch>-gcc
 - mingw-w64-<arch>-pkgconf
diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile
index ee9337720b..07b9b8eebf 100644
--- a/windows/installer_msys2/Makefile
+++ b/windows/installer_msys2/Makefile
@@ -37,6 +37,7 @@ QT6_MOCCMD="$(MOCCMD)"
 endif
 
 ICUVER=69
+MAGICKVER=7.Q16HDRI-10
 
 INSTSUB=${ARCHDIR}
 
@@ -44,9 +45,7 @@ INSTSUB=${ARCHDIR}
 DLLPATH_PREFIX=/$(ARCHDIR)/bin/
 
 ifeq ($(CI),yes)
-MAGICKVER=7.Q16HDRI-10
 else
-MAGICKVER=7.Q16HDRI-7
 endif
 
 #
-- 
2.35.1