From 0403626792652a58a9b790ca3cabc601c2d158a8 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Thu, 4 Jan 2024 09:26:47 +0700
Subject: [PATCH] [qt*] ios fixes (#36003)

---
 ports/qtbase/vcpkg.json        | 12 +++++++++---
 ports/qtpositioning/vcpkg.json |  4 +++-
 ports/qtserialport/vcpkg.json  |  2 ++
 versions/baseline.json         |  6 +++---
 versions/q-/qtbase.json        |  5 +++++
 versions/q-/qtpositioning.json |  5 +++++
 versions/q-/qtserialport.json  |  5 +++++
 7 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
index fb4ea151fb92d4..2c48a2e2731e31 100644
--- a/ports/qtbase/vcpkg.json
+++ b/ports/qtbase/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qtbase",
   "version": "6.6.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -62,7 +62,10 @@
     "icu",
     "jpeg",
     "network",
-    "opengl",
+    {
+      "name": "opengl",
+      "platform": "!ios"
+    },
     "openssl",
     "pcre2",
     "png",
@@ -224,7 +227,10 @@
     "gui": {
       "description": "Qt Gui",
       "dependencies": [
-        "opengl",
+        {
+          "name": "opengl",
+          "platform": "!ios"
+        },
         {
           "name": "qtbase",
           "default-features": false,
diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json
index 46628170226685..dd7d61b290dbce 100644
--- a/ports/qtpositioning/vcpkg.json
+++ b/ports/qtpositioning/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qtpositioning",
   "version": "6.6.1",
+  "port-version": 1,
   "description": "Qt Positioning",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -12,7 +13,8 @@
     },
     {
       "name": "qtserialport",
-      "default-features": false
+      "default-features": false,
+      "platform": "!ios"
     }
   ],
   "features": {
diff --git a/ports/qtserialport/vcpkg.json b/ports/qtserialport/vcpkg.json
index 6ec17e3228f193..248f08783ed1b4 100644
--- a/ports/qtserialport/vcpkg.json
+++ b/ports/qtserialport/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "qtserialport",
   "version": "6.6.1",
+  "port-version": 1,
   "description": "Qt Serial Port support",
   "homepage": "https://www.qt.io/",
   "license": null,
+  "supports": "!ios",
   "dependencies": [
     {
       "name": "qtbase",
diff --git a/versions/baseline.json b/versions/baseline.json
index 6f5c280b9a7ab2..35d3ab30072685 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7118,7 +7118,7 @@
     },
     "qtbase": {
       "baseline": "6.6.1",
-      "port-version": 3
+      "port-version": 4
     },
     "qtcharts": {
       "baseline": "6.6.1",
@@ -7206,7 +7206,7 @@
     },
     "qtpositioning": {
       "baseline": "6.6.1",
-      "port-version": 0
+      "port-version": 1
     },
     "qtquick3d": {
       "baseline": "6.6.1",
@@ -7246,7 +7246,7 @@
     },
     "qtserialport": {
       "baseline": "6.6.1",
-      "port-version": 0
+      "port-version": 1
     },
     "qtshadertools": {
       "baseline": "6.6.1",
diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index 2e26c906730eb2..e0d7e91254f8fb 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7e1dba7994d7d228fee34f8f5b646e7d9aff62ac",
+      "version": "6.6.1",
+      "port-version": 4
+    },
     {
       "git-tree": "b85d2c16c027edb173f51037d9c5a3e05746efa0",
       "version": "6.6.1",
diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json
index 9ae78c59572ffb..52f87ac20b93c0 100644
--- a/versions/q-/qtpositioning.json
+++ b/versions/q-/qtpositioning.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "61988bd841be21af4ae3bf2748ac8f6ec071e56c",
+      "version": "6.6.1",
+      "port-version": 1
+    },
     {
       "git-tree": "8c0c21c983c3f010540a7b11c3896af2388a0531",
       "version": "6.6.1",
diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json
index a7717a452a9fff..4c3e9664aae8db 100644
--- a/versions/q-/qtserialport.json
+++ b/versions/q-/qtserialport.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5bfa96397e62f539b329016ceeb31a4c7fa1b9ed",
+      "version": "6.6.1",
+      "port-version": 1
+    },
     {
       "git-tree": "b0fe6127a189519fdb6c51b00d1fd14759459f96",
       "version": "6.6.1",