From 710d8b948ba3d2ed95f4a57c580d4e0d6d181d05 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Thu, 28 Mar 2024 21:06:34 +0100
Subject: [PATCH 1/3] build: Remove stray file

How did that one get here?
---
 .gitlab-ci/.fedora.Dockerfile.swp | Bin 12288 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .gitlab-ci/.fedora.Dockerfile.swp

diff --git a/.gitlab-ci/.fedora.Dockerfile.swp b/.gitlab-ci/.fedora.Dockerfile.swp
deleted file mode 100644
index 8dfbbcce6000e95b0c8793d90f7f7ea88737c82c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2ONbmr7{@CyM587?_87!AiHVxjPIlK<lpw*~ta&c(W@8W`R(DtT)J}I-(^Wk?
zlNc2OUc4wd83ZAqpy(y&NfRU>q8AkepWsRGaqw{vBq;uSwria3iAk=JYWUGzUw!pe
z)xW-~o@LwJdT`f1XWQsjg6l>?etpg7e~&zO)%f?zNbE&S@uaA^=oN5ZX6&Lay~?M{
zfQ>nsXC7CLP`5gb(NO4!xzrPlr9h*T(rfW75D~w0OzUA4unJtR0;|cy_*ieNuU~hY
zGjj9%<u<f_RspMkRlq7>6|f3e1*`&A0jt3OKmnaDBhO$S%geds<$YQ0UKZ`mDqt0`
z3RnfK0#*U5fK|XMU=^?mSOu&CR)H%}0p=5Ob_F4Cti<5)|9|uM|8F<oTLAD4I0sIH
zli*p9fCFF}JP0;|HQ@XjLVf~Yf{(zP-~>1hT3`lj2X}&7!A;=L)r5QpJ_8?ucfcv|
z0(c6fzymwL7H|t#34XYqkoUpM;5bl#gBdUh?gi_>3h>KygnSFmfw#a(@I27qN$@DR
z4>({I`2AY=gO9;!@Dex<B5(-o1`}W{SPuSJMaYlf3-AGW8=L|sz!4CEdGHXp3ygsC
z*Pspf9Gn5Kf)_y-#NctT6WjsTf>q$Js|ooTd<xEjGvF1l2kZuSgAwpG*77Ux33v~@
z3ySr99oWk%U=^?mTzLvi?LX-3-LZe#d3bdGz)pHUA&<?>?wQ;*>ol4&=8atOjLgqX
z%{sj&GCRM&_r!ePp}Di+k(s#zhl~2dyCxkv?JPDqj~p5+r{RjE;WE`+YFTttao%ur
zuy~B@n4PXTY`+H=>2;_$Iuj1%&L-7Z@7&(&q*2~B_3T@>nDS9&p8B50HaQKhy@twt
z$umXPJ5vdBBkmLiCy-e=>|%-vZ>)_Q9X|;iFXAk5SQHTlS4U<c?Tn34IJJ33548i=
zd7@XfC^DW#dF=AcSen9XnrE)GOlTxrRk4@?>qac`X_`qbJsBzL^ENarLzlIKwss!1
zSW<CQOewEyl5xMuG|keOdNK(_SlZLBZpvhWE-legcw^JuREC)dx;5Xl8^%1*X5hv>
z?fPy$WE5$=HS=056iIyqG0R%MTuf^23nE!y<27R_-39LHn$?$Hu0>QEf^iZlFP4Oc
zN@twK{Z&cJ3ghR&M`@;okuEJPgHop~31!8S6oaI0E+W4S6X#m@yNJ1xW?pz^#j;QD
zotmq}FcnkNdx!0QCMZCPnb{#kM@2>gln!a7D-8=<#uFcDIXL>B8M!rN?X+A^#xb(8
z?k*CZv6v0phb)2U@M^9W-T7!7Ry8clUY;pAG>rc=%Q%%v=%F~dtFR-NQWs&h2!i^!
z6puubck1R$wL_CyXqhHq-6NKHGNkH4%0sI2%&jH?A_M`JX<(zm#8cVn){R~yb02%V
zEwDO6dNHksRAB>i^klo7?gH|PhUlfzfj}lmX$}jaB(}WIP2%7Xk`ZLbEup%}V_pX9
zZ;UaDa|=6EQJmCOxi9GB(;(xQ^b4gln`0o#pju(Z(q>y6G2<zUJgEg<+WAx@I+H5J
zAs}iA8zy<$U)3;Dk=e(EP9AM?R%mYe=-DcRfMvXT02B?!D+=Q~Y7>BCpLhBtzeQ8g
zar0oD#?sHDzUtvXO{F`}qu%DtCYomk8)U*2el?qTC&dvy*qTQ{@5Cz(6g*eza2mQ&
zwlI}$#3{~-vJW5oWAK<nX0)_SY4H&_tyV0sc21Fa3X@4B4dlOvesR<nFFq5rDEf@U
zue5l1T21U;*7=no;-hzLxgu8;g@_q5ZF_c>u&8^ae~9*+jf2O$rpa56iA>V+l~9e}
zs~HrGwOLbK&=<<8RE$%mTa_3?Wq*+g&8pj{_yJV>IG|kz+eYKp0R~ET&d%&}mOiw9
IU}78j2d%wA!vFvP


From a34c018592f009f4584f8a8979dacf0780b0a9b5 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Thu, 28 Mar 2024 21:07:18 +0100
Subject: [PATCH 2/3] build: Use "meson setup" instead of just "meson"

Gets rid of a warning.
---
 .gitlab-ci/test-msys2.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh
index 00f2c877f2..597a2342a4 100644
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -44,7 +44,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 \

From 6aa37a116dcf8166acb3d33f7092f88463f8a1f5 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Thu, 28 Mar 2024 21:08:31 +0100
Subject: [PATCH 3/3] build: Install vulkan-headers on msys CI

Apparently those are 2 packages.

Fixes #6580
---
 .gitlab-ci/test-msys2.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh
index 597a2342a4..d7ba93faaa 100644
--- a/.gitlab-ci/test-msys2.sh
+++ b/.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)"