From 843347022011af87b337d6a2d52b2bc18009ce4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8ger=20Hanseg=C3=A5rd?= <joger.hansegard@qt.io>
Date: Tue, 20 Feb 2024 13:51:07 +0100
Subject: [PATCH] Upgrade to msys2 20240113 in Windows provisioning

This upgrade is needed because msys2 20220319 fails to install
diffutils. Its url is broken. Diffutils was first added on 6.5

Fixes: QTBUG-122465
Pick-to: 6.5
Change-Id: If94cafed68f3400557e01365e743155e9b732dac
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 04910ff9466cc87457fd04d68c101f0a38d304f5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit cabe404c4afe3ada34ead301d804f5bc26a4416f)
---
 coin/provisioning/common/windows/install-msys2.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1
index 6a555274..46336255 100644
--- a/coin/provisioning/common/windows/install-msys2.ps1
+++ b/coin/provisioning/common/windows/install-msys2.ps1
@@ -5,10 +5,10 @@
 
 # This script will installs msys2
 
-$version = "20220319"
+$version = "20240113"
 $prog = "msys2"
 $arch = "x86_64"
-$sha1 = "d3d05090c09c08a47efbffe469142b45231cbc89"
+$sha1 = "b46c08fd901da0fdba1dc30422a322766d7d03c6"
 $sha1_prebuilt = "d86d45d72228f53f7ae060771bc95b6f54c703c8"
 $folder = "msys64"