From 7fb97764bc81edaba8cf23bbca6b01b86d942fdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Wegner?= <pawel.wegner95@gmail.com>
Date: Fri, 8 Dec 2023 10:25:03 +0100
Subject: [PATCH] [scripts] Download arm64 python when host is arm64 on
 windows. (#34354)

---
 ports/gobject-introspection/vcpkg.json        |  4 ++--
 .../vcpkg_find_acquire_program(PYTHON3).cmake | 20 ++++++++++++++-----
 versions/baseline.json                        |  2 +-
 versions/g-/gobject-introspection.json        |  5 +++++
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/ports/gobject-introspection/vcpkg.json b/ports/gobject-introspection/vcpkg.json
index 25dc66d235..b6f1a0a437 100644
--- a/ports/gobject-introspection/vcpkg.json
+++ b/ports/gobject-introspection/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "gobject-introspection",
   "version": "1.72.0",
-  "port-version": 5,
+  "port-version": 6,
   "description": "A middleware layer between C libraries (using GObject) and language bindings.",
   "homepage": "https://gi.readthedocs.io/en/latest/",
   "license": null,
-  "supports": "!static & (native | (windows & x86))",
+  "supports": "!static & native",
   "dependencies": [
     {
       "name": "cairo",
diff --git a/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake b/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake
index 64142892f3..8a7c9f9d67 100644
--- a/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake
@@ -1,16 +1,26 @@
 if(CMAKE_HOST_WIN32)
     set(program_name python)
     set(program_version 3.11.5)
-    if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-        set(tool_subdirectory "python-${program_version}-x86")
-        set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-win32.zip")
-        set(download_filename "python-${program_version}-embed-win32.zip")
-        set(download_sha512 d5412c5bc2a0664f86e504a536c201789c8fd8b97c641bbb7b254c87c2f13504d25fa9d0b74e27a1c54c2d9fb592f9546d8c1e82c506dc9c76a21774c4c3ea75)
+    if(DEFINED ENV{PROCESSOR_ARCHITEW6432})
+        set(build_arch $ENV{PROCESSOR_ARCHITEW6432})
     else()
+        set(build_arch $ENV{PROCESSOR_ARCHITECTURE})
+    endif()
+    if(build_arch MATCHES "^(ARM|arm)64$")
+        set(tool_subdirectory "python-${program_version}-arm64")
+        set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-arm64.zip")
+        set(download_filename "python-${program_version}-embed-arm64.zip")
+        set(download_sha512 23d67fa89176fb47f564df9713039e86d1957831866c20d474be03fe6616bd15292e9912e44d3c1830747c24eb2131aeda53f19b3d4e7d1c8bd2bbb461e56f6c)
+    elseif(build_arch MATCHES "(amd|AMD)64")
         set(tool_subdirectory "python-${program_version}-x64")
         set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-amd64.zip")
         set(download_filename "python-${program_version}-embed-amd64.zip")
         set(download_sha512 29a526da7624423b09ea1c8f94d83e5ad2d7ba7553c5651d8fcbe1b2483c62f27f9db105d1fdcfca3357b44d456fe1141274725bc97ad5166edfec14f251eb36)
+    else()
+        set(tool_subdirectory "python-${program_version}-x86")
+        set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-win32.zip")
+        set(download_filename "python-${program_version}-embed-win32.zip")
+        set(download_sha512 d5412c5bc2a0664f86e504a536c201789c8fd8b97c641bbb7b254c87c2f13504d25fa9d0b74e27a1c54c2d9fb592f9546d8c1e82c506dc9c76a21774c4c3ea75)
     endif()
 
     set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}")
diff --git a/versions/baseline.json b/versions/baseline.json
index fbcab2e309..450ae64f6e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3054,7 +3054,7 @@
     },
     "gobject-introspection": {
       "baseline": "1.72.0",
-      "port-version": 5
+      "port-version": 6
     },
     "google-cloud-cpp": {
       "baseline": "2.19.0",
diff --git a/versions/g-/gobject-introspection.json b/versions/g-/gobject-introspection.json
index 4081d456a3..5c5ac27213 100644
--- a/versions/g-/gobject-introspection.json
+++ b/versions/g-/gobject-introspection.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "aa7163808411a8ff5641022957909a6d681cea69",
+      "version": "1.72.0",
+      "port-version": 6
+    },
     {
       "git-tree": "a697a0e2fa6d441dc5008a6d128a9a8f3e2440ab",
       "version": "1.72.0",