From da013c8eeac89cdfc96ea411af7133f43fcec493 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 25 Mar 2023 08:17:12 +0200 Subject: [PATCH 38/38] 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.autotools | 10 ++++------ windows/installer_msys2/Makefile.meson | 4 +--- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b55eb5af88..abc1dcdbf8 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.autotools b/windows/installer_msys2/Makefile.autotools index 1db05eaa50..8657f0233e 100644 --- a/windows/installer_msys2/Makefile.autotools +++ b/windows/installer_msys2/Makefile.autotools @@ -77,9 +77,7 @@ INSTSUB=${ARCHDIR} DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) -UNISTRING=libunistring-2.dll else -UNISTRING=libunistring-5.dll endif # @@ -361,7 +359,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 @@ -389,7 +387,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 \ @@ -440,7 +438,7 @@ QT5_DLLS := \ libgraphite2.dll \ libpcre2-8-0.dll \ libpcre2-16-0.dll \ - $(UNISTRING) \ + libunistring-5.dll \ libbrotlidec.dll \ libbrotlicommon.dll \ libdouble-conversion.dll \ @@ -462,7 +460,7 @@ QT6_DLLS := \ Qt6Core.dll \ Qt6Gui.dll \ Qt6Widgets.dll \ - $(UNISTRING) \ + libunistring-5.dll \ libpcre2-16-0.dll \ libharfbuzz-0.dll \ libgraphite2.dll \ diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index c59f0916a0..ae291e84c8 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -66,9 +66,7 @@ CRYPTOVERSUF=3${CRYPTOLIB_SUFFIX} DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) -UNISTRING=libunistring-2.dll else -UNISTRING=libunistring-5.dll endif # @@ -237,7 +235,7 @@ COMMON_DLLS := \ libltdl-7.dll \ libxml2-2.dll \ libraqm-0.dll \ - $(UNISTRING) \ + libunistring-5.dll \ exchndl.dll \ mgwhelp.dll \ $(SOUND_DLLS) -- 2.39.2