[qt] Fix missing Cocoa include

[wrobelda]

Applies patch from:
https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/cocoa?id=dece6f5840463ae2ddf927d65eb1b3680e34a547

• What does your PR fix?

  Fixes [qt] fails to build on macOS 12 (Monterrey) #21055 for both Qt5 and Qt6

• Which triplets are supported/not supported? Have you updated the CI baseline?

  No change

• Does your PR follow the maintainer guide?

  Yes

• If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

  Yes

[github-actions]

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 1cea69e191974b8e917360633eaff8f1d87a9a1e -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index fe050f1..44d18c9 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5450,7 +5450,7 @@
     },
     "qt5-base": {
       "baseline": "5.15.2",
-      "port-version": 11
+      "port-version": 12
     },
     "qt5-canvas3d": {
       "baseline": "0",
@@ -5618,7 +5618,7 @@
     },
     "qtbase": {
       "baseline": "6.2.0",
-      "port-version": 2
+      "port-version": 3
     },
     "qtcharts": {
       "baseline": "6.2.0",
diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json
index ad6aee5..f3ca6fd 100644
--- a/versions/q-/qt5-base.json
+++ b/versions/q-/qt5-base.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "051817021dbc9bd8e0acffeb6f1d2b04dc993392",
+      "version-semver": "5.15.2",
+      "port-version": 12
+    },
     {
       "git-tree": "72ca286ac98e08f2fef35f85a6e393795428d033",
       "version-semver": "5.15.2",
diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index c7b1a0f..4f97e75 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b65c3887748f2c108847a34a643c1fdd9f7887e9",
+      "version-semver": "6.2.0",
+      "port-version": 3
+    },
     {
       "git-tree": "e7c78fd7fe6600eb96712f151670efc765bf5c31",
       "version-semver": "6.2.0",

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

• ports/qtbase/portfile.cmake

[Neumann-A]

Is the include fixed in Qt 6.2.1? If yes, i would ask you to remove the changes to qtbase.

[wrobelda]

Is the include fixed in Qt 6.2.1? If yes, i would ask you to remove the changes to qtbase.

AFIK it isn't, was added on 27th, 7 days after 6.2.1 was tagged: https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/cocoa?id=dece6f5840463ae2ddf927d65eb1b3680e34a547

[github-actions]

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

• ports/qtbase/portfile.cmake

[wrobelda]

@JackBoosY why does it take so long to merge this fix? This mitigates a substantial regression which affects a surely significant portion of your user base, and the fix itself comes from the upstream. Does it really need to be pending for almost 2 weeks?

[JackBoosY]

@wrobelda I deeply apologize for this, can you please resolve the file conflicts?
I can make sure it will be merged first after all check pass.

[wrobelda]

@wrobelda I deeply apologize for this, can you please resolve the file conflicts?

Just did.

I can make sure it will be merged first after all check pass.

Thanks, much appreciated!

[github-actions]

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

• ports/qtbase/portfile.cmake

[github-actions]

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

• ports/qtbase/portfile.cmake