qt: patch version 5 on macOS 12 SDK (#28865)
Note that the SDK is not the same as the system version: using apple-clang@13 is a better match than `os=monterey` since this actually fails on bigsur as well, as long as xcode 13 is being used.
This commit is contained in:
parent
4c396d2cee
commit
c16ce9408e
@ -147,6 +147,11 @@ class Qt(Package):
|
||||
sha256='84b099109d08adf177adf9d3542b6215ec3e42138041d523860dbfdcb59fdaae',
|
||||
working_dir='qtwebsockets',
|
||||
when='@5.14: %gcc@11:')
|
||||
# https://github.com/microsoft/vcpkg/issues/21055
|
||||
patch('qt5-macos12.patch',
|
||||
working_dir='qtbase',
|
||||
when='@5.14: %apple-clang@13:')
|
||||
|
||||
conflicts('%gcc@10:', when='@5.9:5.12.6 +opengl')
|
||||
conflicts('%gcc@11:', when='@5.8')
|
||||
|
||||
|
12
var/spack/repos/builtin/packages/qt/qt5-macos12.patch
Normal file
12
var/spack/repos/builtin/packages/qt/qt5-macos12.patch
Normal file
@ -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 <CoreGraphics/CGColorSpace.h>
|
||||
#include <qpa/qplatformgraphicsbuffer.h>
|
||||
#include <private/qcore_mac_p.h>
|
||||
|
Loading…
Reference in New Issue
Block a user