mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[qt5-base] fix xcode 15 build (#34285)
This commit is contained in:
parent
4d99918750
commit
909ad55566
43
ports/qt5-base/patches/patch-qtbase-memory_resource.diff
Normal file
43
ports/qt5-base/patches/patch-qtbase-memory_resource.diff
Normal file
@ -0,0 +1,43 @@
|
||||
--- a/src/corelib/global/qcompilerdetection.h
|
||||
+++ b/src/corelib/global/qcompilerdetection.h
|
||||
@@ -1050,16 +1050,22 @@
|
||||
# endif // !_HAS_CONSTEXPR
|
||||
# endif // !__GLIBCXX__ && !_LIBCPP_VERSION
|
||||
# endif // Q_OS_QNX
|
||||
-# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \
|
||||
- && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
|
||||
+# if defined(Q_CC_CLANG) && defined(Q_OS_DARWIN)
|
||||
+# if defined(__GNUC_LIBSTD__) && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
|
||||
// Apple has not updated libstdc++ since 2007, which means it does not have
|
||||
// <initializer_list> or std::move. Let's disable these features
|
||||
-# undef Q_COMPILER_INITIALIZER_LISTS
|
||||
-# undef Q_COMPILER_RVALUE_REFS
|
||||
-# undef Q_COMPILER_REF_QUALIFIERS
|
||||
+# undef Q_COMPILER_INITIALIZER_LISTS
|
||||
+# undef Q_COMPILER_RVALUE_REFS
|
||||
+# undef Q_COMPILER_REF_QUALIFIERS
|
||||
// Also disable <atomic>, since it's clearly not there
|
||||
-# undef Q_COMPILER_ATOMICS
|
||||
-# endif
|
||||
+# undef Q_COMPILER_ATOMICS
|
||||
+# endif
|
||||
+# if defined(__cpp_lib_memory_resource) \
|
||||
+ && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 140000) \
|
||||
+ || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 170000))
|
||||
+# undef __cpp_lib_memory_resource // Only supported on macOS 14 and iOS 17
|
||||
+# endif
|
||||
+# endif // defined(Q_CC_CLANG) && defined(Q_OS_DARWIN)
|
||||
# if defined(Q_CC_CLANG) && defined(Q_CC_INTEL) && Q_CC_INTEL >= 1500
|
||||
// ICC 15.x and 16.0 have their own implementation of std::atomic, which is activated when in Clang mode
|
||||
// (probably because libc++'s <atomic> on OS X failed to compile), but they're missing some
|
||||
--- a/src/corelib/tools/qduplicatetracker_p.h
|
||||
+++ b/src/corelib/tools/qduplicatetracker_p.h
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
#include <qglobal.h>
|
||||
|
||||
-#if QT_HAS_INCLUDE(<memory_resource>) && __cplusplus > 201402L
|
||||
+#ifdef __cpp_lib_memory_resource
|
||||
# include <unordered_set>
|
||||
# include <memory_resource>
|
||||
#else
|
@ -67,6 +67,7 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH
|
||||
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/xcode-15.patch #From https://codereview.qt-project.org/c/qt/qtbase/+/503172
|
||||
patches/patch-qtbase-memory_resource.diff # From https://bugreports.qt.io/browse/QTBUG-114316
|
||||
#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.
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "qt5-base",
|
||||
"version": "5.15.11",
|
||||
"port-version": 1,
|
||||
"description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
|
||||
"homepage": "https://www.qt.io/",
|
||||
"license": null,
|
||||
|
@ -6762,7 +6762,7 @@
|
||||
},
|
||||
"qt5-base": {
|
||||
"baseline": "5.15.11",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"qt5-canvas3d": {
|
||||
"baseline": "0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "c09b409166a1cb3e4881ee5b0081069227a7ae45",
|
||||
"version": "5.15.11",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "d26db1adfbe17c91d6c2858d38290ce2277cd8a3",
|
||||
"version": "5.15.11",
|
||||
|
Loading…
x
Reference in New Issue
Block a user