From 7bfd22157ab84a6d1fa7c2d805effa48941beed3 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Thu, 7 May 2026 09:05:23 +0200
Subject: [PATCH] coin: vcpkg build changes for HarmonyOS

Done-with: Joerg Bornemann <joerg.bornemann@qt.io>
Change-Id: I48c0fa7ef9c774588791008d06ca8734dabde7da
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 .../provisioning/common/shared/vcpkg_tool_release_tag.txt | 8 ++++----
 coin/provisioning/common/shared/vcpkg_version.txt         | 2 +-
 coin/provisioning/common/unix/install-vcpkg.sh            | 4 ++--
 coin/provisioning/common/windows/install-vcpkg.ps1        | 7 +------
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/coin/provisioning/common/shared/vcpkg_tool_release_tag.txt b/coin/provisioning/common/shared/vcpkg_tool_release_tag.txt
index c4f0c8f6..2b3cd543 100644
--- a/coin/provisioning/common/shared/vcpkg_tool_release_tag.txt
+++ b/coin/provisioning/common/shared/vcpkg_tool_release_tag.txt
@@ -1,4 +1,4 @@
-vcpkg_tool_release_tag=2025-09-03
-windows_x64_checksum=4523B5B2CE77BD0F6DCA55140D831EA6EB03046D5F4496C85DF94AC1A7EFAB01
-windows_arm64_checksum=1E8653243C0E7D73FF1F0F3F25A55C8154888F331510F9545AD200EDD3CCB962
-unix_checksum=f0c4b30afc2f7baa9cc4372ac325042418251343e0192dbfac94c4f602e9d3ed
+vcpkg_tool_release_tag=ohos-20260505-4dc8719
+windows_x64_checksum=5e140ed8bd2bf945d2dcd6bc953735f29f3736e08e49f899e054f776c7211cc8
+windows_arm64_checksum=c793f59290213f1b4797f08208a76f7af12068e439faf82fe7a8522ba7fb7ad5
+unix_checksum=96a94016cfff8a46bb7abc98917df0b39477ec2da8468daf790699b1ad66a026
diff --git a/coin/provisioning/common/shared/vcpkg_version.txt b/coin/provisioning/common/shared/vcpkg_version.txt
index 07a759e7..09bc83eb 100644
--- a/coin/provisioning/common/shared/vcpkg_version.txt
+++ b/coin/provisioning/common/shared/vcpkg_version.txt
@@ -1 +1 @@
-vcpkg_version=2025.09.17-qt01
+vcpkg_version=2026.05.05-ohos
diff --git a/coin/provisioning/common/unix/install-vcpkg.sh b/coin/provisioning/common/unix/install-vcpkg.sh
index 3f4d84f7..23955170 100755
--- a/coin/provisioning/common/unix/install-vcpkg.sh
+++ b/coin/provisioning/common/unix/install-vcpkg.sh
@@ -4,7 +4,7 @@
 
 # This script will
 #   1) Clone the vcpkg repo   - https://github.com/microsoft/vcpkg/tags
-#   2) Install the vcpkg-tool - https://github.com/microsoft/vcpkg-tool/tags
+#   2) Install the vcpkg-tool - https://github.com/jobor/vcpkg-tool/tags
 
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
@@ -58,7 +58,7 @@ fi
 
 nonDottedReleaseTag=${vcpkgToolReleaseTag//-/}
 
-vcpkgToolOfficialUrl="https://github.com/microsoft/vcpkg-tool/archive/refs/tags/$vcpkgToolReleaseTag.tar.gz"
+vcpkgToolOfficialUrl="https://github.com/jobor/vcpkg-tool/archive/refs/tags/$vcpkgToolReleaseTag.tar.gz"
 vcpkgToolCacheUrl="http://ci-files01-hki.ci.qt.io/input/vcpkg/vcpkg-tool-$nonDottedReleaseTag.tar.gz"
 vcpkgToolSourceFolder="$HOME/vcpkg-tool-$vcpkgToolReleaseTag"
 vcpkgToolBuildFolder="$HOME/vcpkg-tool-$vcpkgToolReleaseTag/build"
diff --git a/coin/provisioning/common/windows/install-vcpkg.ps1 b/coin/provisioning/common/windows/install-vcpkg.ps1
index ce774d35..a318f917 100644
--- a/coin/provisioning/common/windows/install-vcpkg.ps1
+++ b/coin/provisioning/common/windows/install-vcpkg.ps1
@@ -50,12 +50,7 @@ if(!$vcpkgExechecksum) {
     exit 1
 }
 
-$suffix = "-$arch"
-if($arch -eq "x64") {
-    $suffix = ""
-}
-
-$vcpkgExeOfficialUrl = "https://github.com/microsoft/vcpkg-tool/releases/download/$vcpkgExeReleaseTag/vcpkg$suffix.exe"
+$vcpkgExeOfficialUrl = "https://github.com/jobor/vcpkg-tool/releases/download/$vcpkgExeReleaseTag/vcpkg-windows-$arch.exe"
 $vcpkgExeCacheUrl = "\\ci-files01-hki.ci.qt.io\provisioning\vcpkg\vcpkg-$nonDottedReleaseTag-windows-$arch.exe"
 $vcpkgExe = "C:\Windows\Temp\vcpkg.exe"