From 67623fc53d20f06ccd0d95a75bd0c118c36170c3 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sat, 18 Feb 2023 21:22:58 +0200
Subject: [PATCH 35/35] CI: Update setup-msys2 to version 2.16.0

See osdn #47383

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .github/workflows/ci.yml                   |  4 ++--
 windows/installer_msys2/Makefile.autotools | 18 +++++++++++-------
 windows/installer_msys2/Makefile.meson     | 14 ++++++++------
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1a453744b2..a6cc35686c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,8 +15,8 @@ jobs:
         # A mapping from msys2/setup-msys2 version to msys2 version can be
         # found at
         # https://github.com/msys2/setup-msys2/blob/master/CHANGELOG.md
-        # 2.15.1 provides msys2 snapshot 20221216
-        uses: msys2/setup-msys2@v2.15.1
+        # 2.16.0 provides msys2 snapshot 20230127
+        uses: msys2/setup-msys2@v2.16.0
         with:
           install: >
             make
diff --git a/windows/installer_msys2/Makefile.autotools b/windows/installer_msys2/Makefile.autotools
index 24e5ba7426..77664d4fa2 100644
--- a/windows/installer_msys2/Makefile.autotools
+++ b/windows/installer_msys2/Makefile.autotools
@@ -69,7 +69,11 @@ INSTSUB=${ARCHDIR}
 DLLPATH_PREFIX=/$(ARCHDIR)/bin/
 
 ifeq ($(CI),yes)
+CRYPTOVERSUF=3${CRYPTOLIB_SUFFIX}
+CERTPATH=/etc
 else
+CRYPTOVERSUF=1_1${CRYPTOLIB_SUFFIX}
+CERTPATH=
 endif
 
 #
@@ -270,9 +274,9 @@ SOUND_DLLS := \
 
 COMMON_DLLS := \
 	libstdc++-6.dll \
-	libcrypto-1_1${CRYPTOLIB_SUFFIX}.dll \
+	libcrypto-${CRYPTOVERSUF}.dll \
 	libpsl-5.dll \
-	libssl-1_1${CRYPTOLIB_SUFFIX}.dll \
+	libssl-${CRYPTOVERSUF}.dll \
 	libidn2-0.dll \
 	libnghttp2-14.dll \
 	libssh2-1.dll \
@@ -333,7 +337,7 @@ install-env-common:
 	# Add DLLs
 	cp -R $(addprefix $(DLLPATH_PREFIX), $(COMMON_DLLS)) $(INST_DIR)/$(WINARCH)-$(GUI)/
 	mkdir -p $(INST_DIR)/$(WINARCH)-$(GUI)/ssl/certs
-	cp -R /$(ARCHDIR)/ssl/certs/ca-bundle.crt $(INST_DIR)/$(WINARCH)-$(GUI)/ssl/certs/
+	cp -R /$(ARCHDIR)$(CERTPATH)/ssl/certs/ca-bundle.crt $(INST_DIR)/$(WINARCH)-$(GUI)/ssl/certs/
 
 DEFAULT_FCMP_DLLS := \
 	libgdk-3-0.dll \
@@ -460,9 +464,9 @@ install-env-qt6: install-env-common
 
 RULEDIT_QT5_DLLS := \
         libstdc++-6.dll \
-	libcrypto-1_1${CRYPTOLIB_SUFFIX}.dll \
+	libcrypto-${CRYPTOVERSUF}.dll \
 	libpsl-5.dll \
-	libssl-1_1${CRYPTOLIB_SUFFIX}.dll \
+	libssl-${CRYPTOVERSUF}.dll \
 	libidn2-0.dll \
 	libnghttp2-14.dll \
 	libssh2-1.dll \
@@ -518,9 +522,9 @@ install-env-ruledit-qt5:
 
 RULEDIT_QT6_DLLS := \
         libstdc++-6.dll \
-	libcrypto-1_1${CRYPTOLIB_SUFFIX}.dll \
+	libcrypto-${CRYPTOVERSUF}.dll \
 	libpsl-5.dll \
-	libssl-1_1${CRYPTOLIB_SUFFIX}.dll \
+	libssl-${CRYPTOVERSUF}.dll \
 	libidn2-0.dll \
 	libnghttp2-14.dll \
 	libssh2-1.dll \
diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson
index d4312a15b5..3f24497660 100644
--- a/windows/installer_msys2/Makefile.meson
+++ b/windows/installer_msys2/Makefile.meson
@@ -65,9 +65,11 @@ ICUVER=72
 DLLPATH_PREFIX=/$(ARCHDIR)/bin/
 
 ifeq ($(CI),yes)
-TIFF=libtiff-5.dll
+CRYPTOVERSUF=3${CRYPTOLIB_SUFFIX}
+CERTPATH=/etc
 else
-TIFF=libtiff-6.dll
+CRYPTOVERSUF=1_1${CRYPTOLIB_SUFFIX}
+CERTPATH=
 endif
 
 #
@@ -217,8 +219,8 @@ COMMON_DLLS := \
 	libzstd.dll \
 	libexpat-1.dll \
 	libstdc++-6.dll \
-	libcrypto-1_1${CRYPTOLIB_SUFFIX}.dll \
-	libssl-1_1${CRYPTOLIB_SUFFIX}.dll \
+	libcrypto-${CRYPTOVERSUF}.dll \
+	libssl-${CRYPTOVERSUF}.dll \
 	libidn2-0.dll \
 	libnghttp2-14.dll \
 	libpsl-5.dll \
@@ -245,7 +247,7 @@ install-env-common:
 	# Add DLLs
 	cp -R $(addprefix $(DLLPATH_PREFIX), $(COMMON_DLLS)) $(INST_DIR)/$(WINARCH)-$(GUI)/
 	mkdir -p $(INST_DIR)/$(WINARCH)-$(GUI)/ssl/certs
-	cp -R /$(ARCHDIR)/ssl/certs/ca-bundle.crt $(INST_DIR)/$(WINARCH)-$(GUI)/ssl/certs/
+	cp -R /$(ARCHDIR)$(CERTPATH)/ssl/certs/ca-bundle.crt $(INST_DIR)/$(WINARCH)-$(GUI)/ssl/certs/
 
 FCMP_GTK3_DLLS := \
 	libgdk-3-0.dll \
@@ -280,7 +282,7 @@ FCMP_GTK4_DLLS := \
 	liblzo2-2.dll \
 	libthai-0.dll \
 	libdatrie-1.dll \
-	$(TIFF) \
+	libtiff-6.dll \
 	libjpeg-8.dll \
 	libjbig-0.dll \
 	libwebp-7.dll \
-- 
2.39.1