From 490e692c23c30f14fa4d4ad4a581671ed73e9a1e Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 25 Mar 2023 10:23:11 +0200 Subject: [PATCH 27/27] CI: Update setup-msys2 to version 2.17.0 See osdn #47643 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 4 ++-- windows/installer_msys2/Makefile | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d131dbd2ca..4e2da63203 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.16.0 provides msys2 snapshot 20230127 - uses: msys2/setup-msys2@v2.16.0 + # 2.17.0 provides msys2 snapshot 20230318 + uses: msys2/setup-msys2@v2.17.0 with: msystem: UCRT64 install: > diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index 23c6412ebf..859d43ad50 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -72,9 +72,7 @@ INSTSUB=${ARCHDIR} DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) -UNISTRING=libunistring-2.dll else -UNISTRING=libunistring-5.dll endif # @@ -356,7 +354,7 @@ DEFAULT_FCMP_DLLS := \ libpangoft2-1.0-0.dll \ libthai-0.dll \ libdatrie-1.dll \ - $(UNISTRING) \ + libunistring-5.dll \ librsvg-2-2.dll install-env-default-fcmp: install-env-common @@ -384,7 +382,7 @@ GTK4_FCMP_DLLS := \ libgraphene-1.0-0.dll \ libharfbuzz-0.dll \ libpangoft2-1.0-0.dll \ - $(UNISTRING) \ + libunistring-5.dll \ libthai-0.dll \ liblzo2-2.dll \ libgraphite2.dll \ @@ -435,7 +433,7 @@ QT5_DLLS := \ libgraphite2.dll \ libpcre2-8-0.dll \ libpcre2-16-0.dll \ - $(UNISTRING) \ + libunistring-5.dll \ libbrotlidec.dll \ libbrotlicommon.dll \ libdouble-conversion.dll \ @@ -457,7 +455,7 @@ QT6_DLLS := \ Qt6Core.dll \ Qt6Gui.dll \ Qt6Widgets.dll \ - $(UNISTRING) \ + libunistring-5.dll \ libpcre2-16-0.dll \ libharfbuzz-0.dll \ libgraphite2.dll \ -- 2.39.2