From e0e3e4738cca4a4e6a4a1d38aecc1ea0e4dbafce Mon Sep 17 00:00:00 2001
From: Paul Wicking <paul.wicking@qt.io>
Date: Thu, 13 Mar 2025 05:02:46 +0100
Subject: [PATCH] Update Clang libraries for QDoc to 20.1.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update the version variable used to identify the correct package for
  download and cache sites.
* Update SHA1 for provisioning packages on all platforms.

Fixes: QTBUG-134304
Pick-to: 6.8
Change-Id: I2577600296e75080d503dc1a537ddbc00d0f207f
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit 8c9fe2074b6b902433b53e16b11a042d0dbb3810)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 coin/provisioning/common/unix/libclang.sh     | 14 +++++++-------
 coin/provisioning/common/windows/libclang.ps1 | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh
index 1e5ebf4f..b7761b46 100755
--- a/coin/provisioning/common/unix/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
@@ -20,38 +20,38 @@ PROVISIONING_DIR="$(dirname "$0")/../../"
 # shellcheck source=./common.sourced.sh
 source "$PROVISIONING_DIR"/common/unix/common.sourced.sh
 
-libclang_version="19.1.7"
+libclang_version="20.1.0"
 
 if uname -a |grep -q Darwin; then
     version=$libclang_version
     url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-macos-universal.7z"
     url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-macos-universal.7z"
-    sha1="0b30bbe47cefe413a6d2fbc3da6b0b8ac5d84613"
+    sha1="a0061a2b7a7411323ae3d81fdb2071ad522ddd5f"
 elif test -f /etc/redhat-release && grep "Red Hat" /etc/redhat-release | grep "9" ; then
     version=$libclang_version
     url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-linux-Rhel9.4-gcc11.4-x86_64.7z"
     url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-linux-Rhel9.4-gcc11.4-x86_64.7z"
-    sha1="1657d6a9419e9d3ecf4416cd757f488c079ec779"
+    sha1="041036bb2b360c18448c993671507bbb16b9b76d"
 elif test "$PROVISIONING_OS_ID" == "debian" && test "$PROVISIONING_ARCH" == "arm64" ; then
     version=$libclang_version
     url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-linux-Debian11.6-gcc10.0-arm64.7z"
     url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-linux-Debian11.6-gcc10.0-arm64.7z"
-    sha1="2536f55987d6240c40fd1127895b0885d41148ed"
+    sha1="ad3244f76cb5dab8e3d5dfe839e21a9bac3039e9"
 elif test "$PROVISIONING_OS_ID" == "ubuntu" && test "$PROVISIONING_ARCH" == "arm64" ; then
     version=$libclang_version
     url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-linux-Ubuntu24.04-gcc11.2-arm64.7z"
     url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-linux-Ubuntu24.04-gcc11.2-arm64.7z"
-    sha1="0e1c0c492f9fcd669a77fe4480cfa271f408af9e"
+    sha1="bde39a28872cc618983d231ffd1df2c104ff1992"
 elif test "$PROVISIONING_OS_ID" == "ubuntu" && test "$PROVISIONING_ARCH" == "x86_64" ; then
     version=$libclang_version
     url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
     url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
-    sha1="eed115ea52f3b4283d02d96cd8f4fce95c5aaafe"
+    sha1="3f5e5214cf31adfb01be21fcf4f27b9adf8f13b0"
 else
     version=$libclang_version
     url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-linux-Rhel8.10-gcc10.0-x86_64.7z"
     url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-linux-Rhel8.10-gcc10.0-x86_64.7z"
-    sha1="479fa87ad804ec91a462ccb20fc9acad6982bddb"
+    sha1="1fdc23ae0fce48ed82508b1bad0c68d2e5a30c8b"
 fi
 
 zip="/tmp/libclang.7z"
diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1
index 4fb44af6..18f6bdef 100644
--- a/coin/provisioning/common/windows/libclang.ps1
+++ b/coin/provisioning/common/windows/libclang.ps1
@@ -5,7 +5,7 @@ param(
 )
 . "$PSScriptRoot\helpers.ps1"
 
-$libclang_version="19.1.7"
+$libclang_version="20.1.0"
 Write-Output "libClang = $libclang_version" >> ~/versions.txt
 
 # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
@@ -38,10 +38,10 @@ $toolchainSuffix = ""
 
 if ( $toolchain -eq "vs2022" ) {
     if ( $archVer -eq "64" ) {
-        $sha1 = "f56057b8679e21a44b341bb1041cb03fbe6f5c0d"
+        $sha1 = "60c840e627b5bb03663f00db17bf249b37936428"
     }
     elseif ( $archVer -eq "arm64" ) {
-        $sha1 = "89fddd8c4bde3e8b70382e21059743637c27d38d"
+        $sha1 = "68ead0e3135dfccae21b226f187fc305803ede3d"
     }
     else {
         $sha1 = ""
@@ -51,7 +51,7 @@ if ( $toolchain -eq "vs2022" ) {
 
 if ( $toolchain -eq "mingw" ) {
     if ( $archVer -eq "64" ) {
-        $sha1 = "fcc1f06bd395bc133b7828d0be48e8492b9ba807"
+        $sha1 = "2180859572dd6ad2029ecffffcc785cba334e037"
     }
     else {
         $sha1 = ""
@@ -62,7 +62,7 @@ if ( $toolchain -eq "mingw" ) {
 
 if ( $toolchain -eq "llvm-mingw" ) {
     if ( $archVer -eq "64" ) {
-        $sha1 = "ee01352eb68bee252cefb1b8ff4ad086baa8ab5f"
+        $sha1 = "3e917d002f363c225e5ee2b7d8999a3cabd8b467"
     }
     else {
         $sha1 = ""