From b49a3cdeadbe55a6e80b8154432fbe6a6e14f950 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Tue, 20 Sep 2022 21:36:49 +0300
Subject: [PATCH 35/35] CI: Update setup-msys2 to version 2.13.0
See osdn #45608
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
.github/workflows/ci.yml | 4 ++--
windows/installer_msys2/Makefile | 10 +++-------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 33012efac9..2d31405182 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.12.0 provides msys2 snapshot 20220603
- uses: msys2/setup-msys2@v2.12.0
+ # 2.13.0 provides msys2 snapshot 20220904
+ uses: msys2/setup-msys2@v2.13.0
with:
install: >
make
diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile
index e5c1f7a0a1..a3b233f902 100644
--- a/windows/installer_msys2/Makefile
+++ b/windows/installer_msys2/Makefile
@@ -41,7 +41,9 @@ else
QT6_MOCCMD="$(MOCCMD)"
endif
+ICUVER=71
MAGICKVER=7.Q16HDRI-10
+FFIVER=8
INSTSUB=${ARCHDIR}
@@ -49,13 +51,7 @@ INSTSUB=${ARCHDIR}
DLLPATH_PREFIX=/$(ARCHDIR)/bin/
ifeq ($(CI),yes)
-ICUVER=69
-FFIVER=7
-LIBJXL=
else
-ICUVER=71
-FFIVER=8
-LIBJXL=libjxl.dll
endif
#
@@ -380,7 +376,7 @@ SDL2_DLLS := \
SDL2_image.dll \
SDL2_ttf.dll \
libzstd.dll \
- ${LIBJXL} \
+ libjxl.dll \
libbrotlienc.dll
install-env-sdl2: install-env-gtk4-fcmp
--
2.35.1