From 4882268a207ebe97495e780992c11aaa0b789f9d Mon Sep 17 00:00:00 2001 From: Jacob Boerema Date: Sat, 16 Dec 2023 11:01:56 -0500 Subject: [PATCH] test-msys2-meson: fix pipeline failure on GTK3 On GTK3 the msys2-mingw64-meson job is failing due to error: mingw-w64-x86_64-pkg-config and mingw-w64-x86_64-pkgconf are in conflict. Remove mingw-w64-x86_64-pkgconf? [Y/n] To fix this we change required package pkg-config to pkgconf, which is what the GTK4 branch also uses. --- .gitlab-ci/test-msys2-meson.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci/test-msys2-meson.sh b/.gitlab-ci/test-msys2-meson.sh index 88421933b8..84e3ff7ce2 100644 --- a/.gitlab-ci/test-msys2-meson.sh +++ b/.gitlab-ci/test-msys2-meson.sh @@ -15,7 +15,7 @@ pacman --noconfirm -Suy pacman --noconfirm -S --needed \ mingw-w64-$MSYS2_ARCH-toolchain \ mingw-w64-$MSYS2_ARCH-ccache \ - mingw-w64-$MSYS2_ARCH-pkg-config \ + mingw-w64-$MSYS2_ARCH-pkgconf \ mingw-w64-$MSYS2_ARCH-gobject-introspection \ mingw-w64-$MSYS2_ARCH-adwaita-icon-theme \ mingw-w64-$MSYS2_ARCH-atk \