From 7784b5d68c18cf47c2589aca6b0f25cf959c842d Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Mon, 12 Feb 2024 23:14:56 +0100
Subject: [PATCH 1/2] Update a couple of port dependencies

---
 ports/py-pip/vcpkg.json          | 7 ++++++-
 ports/py-ply/vcpkg.json          | 7 ++++++-
 ports/py-pyparsing/vcpkg.json    | 4 ++++
 ports/py-pyqt-builder/vcpkg.json | 8 ++++++--
 ports/py-sip/vcpkg.json          | 8 +++++---
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/ports/py-pip/vcpkg.json b/ports/py-pip/vcpkg.json
index 991e34a..59f74d7 100644
--- a/ports/py-pip/vcpkg.json
+++ b/ports/py-pip/vcpkg.json
@@ -1,10 +1,15 @@
 {
   "name": "py-pip",
   "version": "23.3.2",
+  "port-version": 1,
   "description": "Tool for installing and managing Python packages",
   "homepage": "https://pypi.org/project/setuptools",
   "dependencies": [
-    "py-setuptools",
+    "python3",
+    {
+      "name": "py-setuptools",
+      "host": true
+    },
     {
       "name": "vcpkg-python-scripts",
       "host": true
diff --git a/ports/py-ply/vcpkg.json b/ports/py-ply/vcpkg.json
index 2a71271..671ba50 100644
--- a/ports/py-ply/vcpkg.json
+++ b/ports/py-ply/vcpkg.json
@@ -1,10 +1,15 @@
 {
   "name": "py-ply",
   "version": "3.11",
+  "port-version": 1,
   "description": "Python Lex & Yacc",
   "homepage": "https://www.dabeaz.com/ply/",
   "dependencies": [
-    "py-wheel",
+    "python3",
+    {
+      "name": "py-setuptools",
+      "host": true
+    },
     {
       "name": "vcpkg-python-scripts",
       "host": true
diff --git a/ports/py-pyparsing/vcpkg.json b/ports/py-pyparsing/vcpkg.json
index b3af3f2..4e98c44 100644
--- a/ports/py-pyparsing/vcpkg.json
+++ b/ports/py-pyparsing/vcpkg.json
@@ -7,6 +7,10 @@
   "license": "MIT",
   "dependencies": [
     "python3",
+    {
+      "name": "py-setuptools",
+      "host": true
+    },
     {
       "name": "vcpkg-python-scripts",
       "host": true
diff --git a/ports/py-pyqt-builder/vcpkg.json b/ports/py-pyqt-builder/vcpkg.json
index b155532..2aeab58 100644
--- a/ports/py-pyqt-builder/vcpkg.json
+++ b/ports/py-pyqt-builder/vcpkg.json
@@ -1,11 +1,15 @@
 {
   "name": "py-pyqt-builder",
   "version": "1.15.4",
-  "port-version": 1,
+  "port-version": 2,
   "description": "PyQt-builder is the PEP 517 compliant build system for PyQt and projects that extend PyQt. It extends the SIP build system and uses Qt’s qmake to perform the actual compilation and installation of extension modules.",
   "homepage": "https://www.riverbankcomputing.com/software/pyqt-builder",
   "dependencies": [
-    "py-wheel",
+    "python3",
+    {
+      "name": "py-setuptools",
+      "host": true
+    },
     {
       "name": "vcpkg-python-scripts",
       "host": true
diff --git a/ports/py-sip/vcpkg.json b/ports/py-sip/vcpkg.json
index 5a110ff..2f8411a 100644
--- a/ports/py-sip/vcpkg.json
+++ b/ports/py-sip/vcpkg.json
@@ -1,12 +1,14 @@
 {
   "name": "py-sip",
   "version": "6.7.12",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A tool that makes it easy to create Python bindings for C and C++ libraries",
   "homepage": "https://www.riverbankcomputing.com/software/sip",
   "dependencies": [
-    "py-wheel",
-    "py-setuptools",
+    {
+      "name": "py-setuptools",
+      "host": true
+    },
     {
       "name": "vcpkg-python-scripts",
       "host": true

From 46493af71f13a3a4dcfd6d1fee452a1372cf1e91 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Tue, 13 Feb 2024 17:52:20 +0100
Subject: [PATCH 2/2] Disable osx-dynamic test

---
 .github/workflows/macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index cc77aa0..819e030 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         include:
           - os: macos-13
-            triplet: x64-osx-dynamic
+            triplet: x64-osx
           - os: macos-14
             triplet: arm64-osx
     env: