From 58360e406addbadc69b6c0f1c8468dab3849322f Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Sat, 23 Nov 2024 10:17:40 +0100
Subject: [PATCH 1/2] [vcpkg] Bump baseline

Pull in some updates (among these: Qt 6.8)
---
 vcpkg/vcpkg.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vcpkg/vcpkg.json b/vcpkg/vcpkg.json
index 0aaff0024023..c652f75faa90 100644
--- a/vcpkg/vcpkg.json
+++ b/vcpkg/vcpkg.json
@@ -2,13 +2,13 @@
   "vcpkg-configuration": {
     "default-registry": {
       "kind": "git",
-      "baseline": "41626fd77bf42f29e8f7e43dc1f2f05780588cde",
+      "baseline": "80d54ff62d528339c626a6fbc3489a7f25956ade",
       "repository": "https://github.com/microsoft/vcpkg"
     },
     "registries": [
       {
         "kind": "git",
-        "baseline": "d842b9ba9f5a032fbfb459f68bc6c4a3510e1032",
+        "baseline": "a4bdac4fe806307844ddc5c663620ea919ffdf4c",
         "repository": "https://github.com/open-vcpkg/python-registry",
         "packages": [
           "python3",

From 1ab506089bfaee9567ce8f6ef7b595c6abb4355a Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Tue, 24 Dec 2024 10:54:24 +0100
Subject: [PATCH 2/2] [setup-vcpkg] Remove legacy patch and fix path

---
 .github/actions/setup-vcpkg/action.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/actions/setup-vcpkg/action.yml b/.github/actions/setup-vcpkg/action.yml
index bc1559c35d8f..524174dd4abe 100644
--- a/.github/actions/setup-vcpkg/action.yml
+++ b/.github/actions/setup-vcpkg/action.yml
@@ -19,9 +19,7 @@ runs:
         wget https://aka.ms/vcpkg-init.sh -O /tmp/vcpkg-init.sh
         . /tmp/vcpkg-init.sh
         echo "VCPKG_ROOT=$VCPKG_ROOT" >> $GITHUB_ENV
-        echo "PATH=$VCPKG_ROOT;$PATH" >> $GITHUB_ENV
-        # Integrate patch from https://github.com/microsoft/vcpkg/pull/41146
-        wget https://raw.githubusercontent.com/microsoft/vcpkg/6271c9bfab7ff6dbf3444c3600a28e7c6b0ea462/scripts/cmake/z_vcpkg_fixup_rpath_macho.cmake -O /Users/runner/.vcpkg/scripts/cmake/z_vcpkg_fixup_rpath_macho.cmake
+        echo "$VCPKG_ROOT" >> $GITHUB_PATH
 
     - name: Setup vcpkg
       if: runner.os == 'Windows'
@@ -30,4 +28,4 @@ runs:
         $env:VCPKG_ROOT = "C:/.vcpkg"
         iex (iwr -useb https://aka.ms/vcpkg-init.ps1)
         echo "VCPKG_ROOT=$env:VCPKG_ROOT" >> $env:GITHUB_ENV
-        echo "PATH=$env:VCPKG_ROOT;$env:PATH" >> $env:GITHUB_ENV
+        echo "$env:VCPKG_ROOT" >> $env:GITHUB_PATH