Merge branch 'wip/otte/msys-build' into 'main'

Fix msys CI build

Closes #6580

See merge request GNOME/gtk!7082

.gitlab-ci/test-msys2.sh

@@ -34,7 +34,8 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-shared-mime-info \
     mingw-w64-$MSYS2_ARCH-python-gobject \
     mingw-w64-$MSYS2_ARCH-shaderc \
-    mingw-w64-$MSYS2_ARCH-vulkan
+    mingw-w64-$MSYS2_ARCH-vulkan \
+    mingw-w64-$MSYS2_ARCH-vulkan-headers
 
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
@@ -44,7 +45,7 @@ export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
 ccache --zero-stats
 ccache --show-stats
 export CCACHE_DISABLE=true
-meson \
+meson setup \
     -Dx11-backend=false \
     -Dwayland-backend=false \
     -Dwin32-backend=true \