From 7e0cede334c3ea6e37c3c244d38e0468d7910e84 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sun, 5 Sep 2021 07:33:57 +0300
Subject: [PATCH 10/18] Update msys2 environment to 210831 level

- Based on upstream snapshot 20210604

See osdn #42343

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

diff --git a/doc/README.msys2 b/doc/README.msys2
index 68b4ba890c..270db89a57 100644
--- a/doc/README.msys2
+++ b/doc/README.msys2
@@ -24,7 +24,7 @@ using MSYS2 from https://www.msys2.org/
 1) Install MSYS2 following the documentation on their homepage
 
 1.1) Download
- https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-x86_64-20210228.exe
+ https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-x86_64-20210604.exe
  for win64 host
 
 1.2) Run it to install MSYS2 on build system
@@ -108,9 +108,9 @@ Current version is
 
 win64 host:
 -----------
-msys2-freeciv-win64-210515.7z, based on
-https://sourceforge.net/projects/msys2/files/Base/x86-64/msys2-x86_64-20210228.exe
-with packages updated to 15-May-2021 level.
+msys2-freeciv-win64-210831.7z, based on
+https://sourceforge.net/projects/msys2/files/Base/x86-64/msys2-x86_64-20210604.exe
+with packages updated to 31-Aug-2021 level.
 
 Both win32 and win64 targets are included. For each package listed below with <arch>
 in the name, actually two packages is installed; one with a name where <arch> is
diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile
index b4f06b9cdc..56240a4fea 100644
--- a/windows/installer_msys2/Makefile
+++ b/windows/installer_msys2/Makefile
@@ -207,7 +207,7 @@ SOUND_DLLS := \
 	libvorbisenc-2.dll \
 	libvorbisfile-3.dll \
 	libogg-0.dll \
-	libportaudio-2.dll \
+	libportaudio.dll \
 	libsndfile-1.dll \
 	libmpg123-0.dll \
 	libopusfile-0.dll \
@@ -251,8 +251,8 @@ COMMON_DLLS := \
 	libxml2-2.dll \
 	zlib1.dll \
 	libwinpthread-1.dll \
-	libicuuc68.dll \
-	libicudt68.dll \
+	libicuuc69.dll \
+	libicudt69.dll \
 	libsqlite3-0.dll \
 	exchndl.dll \
 	mgwhelp.dll \
@@ -318,16 +318,18 @@ SDL2_DLLS := \
 	libtiff-5.dll \
 	libwebp-7.dll \
 	libzstd.dll \
-	libdeflate.dll
+	libdeflate.dll \
+	libjbig-0.dll \
+	libLerc.dll
 
 install-env-sdl2: install-env-default-fcmp
 	# add DLLs
 	cp -R $(addprefix $(DLLPATH_PREFIX), $(SDL2_DLLS)) install-$(WINARCH)-$(GUI)/
 
 QT5_DLLS := \
-	libicuin68.dll \
-	libicuuc68.dll \
-	libicudt68.dll \
+	libicuin69.dll \
+	libicuuc69.dll \
+	libicudt69.dll \
 	libpcre16-0.dll \
 	libharfbuzz-0.dll \
 	libsqlite3-0.dll \
@@ -341,7 +343,8 @@ QT5_DLLS := \
 	libbrotlidec.dll \
 	libbrotlicommon.dll \
 	libdouble-conversion.dll \
-	libzstd.dll
+	libzstd.dll \
+	libmd4c.dll
 
 install-env-qt5: install-env-common
 	# add DLLs
@@ -352,9 +355,9 @@ install-env-qt5: install-env-common
 	find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name "freeciv*.mo" -delete
 
 QT6_DLLS := \
-	libicuin68.dll \
-	libicuuc68.dll \
-	libicudt68.dll \
+	libicuin69.dll \
+	libicuuc69.dll \
+	libicudt69.dll \
 	Qt6Core.dll \
 	Qt6Gui.dll \
 	Qt6Widgets.dll \
@@ -419,7 +422,8 @@ RULEDIT_QT5_DLLS := \
 	libltdl-7.dll \
 	libraqm-0.dll \
 	libexpat-1.dll \
-	libfribidi-0.dll
+	libfribidi-0.dll \
+	libmd4c.dll
 
 install-env-ruledit-qt5:
 	# add DLLs
-- 
2.33.0