diff --git a/ports/qt5-base/patches/cocoa.patch b/ports/qt5-base/patches/cocoa.patch new file mode 100644 index 0000000000..242c38c861 --- /dev/null +++ b/ports/qt5-base/patches/cocoa.patch @@ -0,0 +1,12 @@ +diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h +index e070ba97..07c75b04 100644 +--- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h ++++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h +@@ -40,6 +40,7 @@ + #ifndef QIOSURFACEGRAPHICSBUFFER_H + #define QIOSURFACEGRAPHICSBUFFER_H + ++#include + #include + #include + diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 455f1ed7ea..4b11ecc75c 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -81,6 +81,7 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH patches/zstdd.patch #Fix detection of zstd in debug builds patches/mysql_plugin_include.patch #Fix include path of mysql plugin patches/mysql-configure.patch #Fix mysql project + patches/cocoa.patch #Fix missing include on macOS Monterrey, https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/cocoa?id=dece6f5840463ae2ddf927d65eb1b3680e34a547 #patches/static_opengl.patch #Use this patch if you really want to statically link angle on windows (e.g. using -opengl es2 and -static). #Be carefull since it requires definining _GDI32_ for all dependent projects due to redefinition errors in the #the windows supplied gl.h header and the angle gl.h otherwise. diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 4879f807d6..8c166a84fb 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", "version-semver": "5.15.2", - "port-version": 13, + "port-version": 14, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtbase/cocoa.patch b/ports/qtbase/cocoa.patch new file mode 100644 index 0000000000..7242ff9ee3 --- /dev/null +++ b/ports/qtbase/cocoa.patch @@ -0,0 +1,15 @@ +diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h +index 5d4b6d6a71..cc7193d8b7 100644 +--- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h ++++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h +@@ -43,6 +43,7 @@ + #include + #include + ++#include + #include + + QT_BEGIN_NAMESPACE +-- +cgit v1.2.1 + diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 60a2472544..12233c0e5e 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -17,6 +17,7 @@ set(${PORT}_PATCHES fix_cmake_build.patch harfbuzz.patch fix_egl.patch + cocoa.patch ) if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 262eb9b46e..a89e7b5bad 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtbase", "version-semver": "6.2.1", + "port-version": 1, "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index e4ed8e1515..1ff8371dac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5470,7 +5470,7 @@ }, "qt5-base": { "baseline": "5.15.2", - "port-version": 13 + "port-version": 14 }, "qt5-canvas3d": { "baseline": "0", @@ -5638,7 +5638,7 @@ }, "qtbase": { "baseline": "6.2.1", - "port-version": 0 + "port-version": 1 }, "qtcharts": { "baseline": "6.2.1", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index e747601e08..88c2f42f1b 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e5756de068474651dc8ee50fb14be3d4c236b05", + "version-semver": "5.15.2", + "port-version": 14 + }, { "git-tree": "d0254baec079c6226b73cc7580e7724cad98648c", "version-semver": "5.15.2", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index db37fe275f..bdef4075f1 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "700e8c2e47b2d044d1623ea5062e15ac6cc9a970", + "version-semver": "6.2.1", + "port-version": 1 + }, { "git-tree": "85405a7d213571f8da152112d436292099c5a4ab", "version-semver": "6.2.1",