From b13150ab81eb55b3b61243c6f41dccd5ae065015 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sun, 20 Nov 2022 07:37:06 +0200
Subject: [PATCH 11/11] Update msys2 environment to 221105 level

See osdn #45966

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

diff --git a/doc/README.msys2 b/doc/README.msys2
index 364883deac..f43f728c56 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-220903.7z
-[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20220603.exe
+[premade]:  msys2-freeciv-win64-221029.7z
+[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20221028.exe
 
 See chapter "Premade environment" for what these mean. The info
 is located here for quick reference for the specific freeciv revision.
@@ -98,7 +98,7 @@ is located here for quick reference for the specific freeciv revision.
  - mingw-w64-i686-gtk4 / mingw-w64-x86_64-gtk4
 
 2.1.2.4) Arch-specific packages for buildind Qt5-client and/or Qt5 Ruledit
- - mingw-w64-i686-qt5 / mingw-w64-x86_64-qt5
+ - mingw-w64-i686-qt5-base / mingw-w64-x86_64-qt5-base
 
 2.1.2.5) Arch-specific packages for building Qt6-client and/or Qt6 Ruledit
  - mingw-w64-x86_64-qt6-base
@@ -164,7 +164,7 @@ Following packages have been installed:
 - mingw-w64-<arch>-SDL2_ttf
 - mingw-w64-<arch>-SDL2_gfx
 - mingw-w64-<arch>-imagemagick
-- mingw-w64-i686-qt5, mingw-w64-x86_64-qt5
+- mingw-w64-i686-qt5-base, mingw-w64-x86_64-qt5-base
 - mingw-w64-<arch>-drmingw
 - mingw-w64-<arch>-meson
 - mingw-w64-<arch>-tolua
diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile
index 9b28c6c3a4..4e0ca5186f 100644
--- a/windows/installer_msys2/Makefile
+++ b/windows/installer_msys2/Makefile
@@ -46,7 +46,6 @@ else
 QT6_MOCCMD="$(MOCCMD)"
 endif
 
-ICUVER=71
 MAGICKVER=7.Q16HDRI-10
 FFIVER=8
 
@@ -56,7 +55,9 @@ INSTSUB=${ARCHDIR}
 DLLPATH_PREFIX=/$(ARCHDIR)/bin/
 
 ifeq ($(CI),yes)
+ICUVER=71
 else
+ICUVER=72
 endif
 
 #
@@ -278,6 +279,7 @@ COMMON_DLLS := \
 	libgdk_pixbuf-2.0-0.dll \
 	libgio-2.0-0.dll \
 	libglib-2.0-0.dll \
+	libpcre2-8-0.dll \
 	libgmodule-2.0-0.dll \
 	libgobject-2.0-0.dll \
 	libgthread-2.0-0.dll \
@@ -330,7 +332,6 @@ DEFAULT_FCMP_DLLS := \
 	libpangoft2-1.0-0.dll \
 	libthai-0.dll \
 	libdatrie-1.dll \
-	libpcre-1.dll \
 	libunistring-2.dll \
 	librsvg-2-2.dll
 
@@ -354,7 +355,6 @@ install-env-gtk3.22: install-env-default-fcmp
 
 GTK4_FCMP_DLLS := \
 	libgtk-4-1.dll \
-	libpcre-1.dll \
 	libcairo-script-interpreter-2.dll \
 	libepoxy-0.dll \
 	libgraphene-1.0-0.dll \
@@ -389,7 +389,8 @@ SDL2_DLLS := \
 	SDL2_ttf.dll \
 	libzstd.dll \
 	libjxl.dll \
-	libbrotlienc.dll
+	libbrotlienc.dll \
+	libhwy.dll
 
 install-env-sdl2: install-env-gtk4-fcmp
 	# add DLLs
@@ -399,14 +400,13 @@ QT5_DLLS := \
 	libicuin${ICUVER}.dll \
 	libicuuc${ICUVER}.dll \
 	libicudt${ICUVER}.dll \
-	libpcre16-0.dll \
 	libharfbuzz-0.dll \
 	libsqlite3-0.dll \
 	Qt5Core.dll \
 	Qt5Gui.dll \
 	Qt5Widgets.dll \
 	libgraphite2.dll \
-	libpcre-1.dll \
+	libpcre2-8-0.dll \
 	libpcre2-16-0.dll \
 	libunistring-2.dll \
 	libbrotlidec.dll \
@@ -432,7 +432,6 @@ QT6_DLLS := \
 	Qt6Widgets.dll \
 	libunistring-2.dll \
 	libpcre2-16-0.dll \
-	libpcre-1.dll \
 	libharfbuzz-0.dll \
 	libgraphite2.dll \
 	libdouble-conversion.dll \
@@ -482,7 +481,6 @@ RULEDIT_QT5_DLLS := \
 	zlib1.dll \
 	libwinpthread-1.dll \
 	libgraphite2.dll \
-	libpcre-1.dll \
 	libdouble-conversion.dll \
 	libzstd.dll \
 	libMagickWand-${MAGICKVER}.dll \
@@ -541,7 +539,7 @@ RULEDIT_QT6_DLLS := \
 	zlib1.dll \
 	libwinpthread-1.dll \
 	libgraphite2.dll \
-	libpcre-1.dll \
+	libpcre2-8-0.dll \
 	libdouble-conversion.dll \
 	libzstd.dll \
 	libMagickWand-${MAGICKVER}.dll \
-- 
2.35.1