diff options
| author | Seth R. Johnson <johnsonsr@ornl.gov> | 2022-02-11 03:31:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-11 09:31:37 +0100 |
| commit | c16ce9408e02d09baecf7d991e8e272c777c24f4 (patch) | |
| tree | e6e0f0e0f6a7fa8470e97ecc3e0f752bf9b9da76 | |
| parent | 4c396d2cee31edb1a2a3620a42ba2e9f5e9090bc (diff) | |
| download | spack-c16ce9408e02d09baecf7d991e8e272c777c24f4.tar.gz spack-c16ce9408e02d09baecf7d991e8e272c777c24f4.tar.bz2 spack-c16ce9408e02d09baecf7d991e8e272c777c24f4.tar.xz spack-c16ce9408e02d09baecf7d991e8e272c777c24f4.zip | |
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.
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/qt5-macos12.patch | 12 |
2 files changed, 17 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 87806c431d..4b76f6fd70 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -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') diff --git a/var/spack/repos/builtin/packages/qt/qt5-macos12.patch b/var/spack/repos/builtin/packages/qt/qt5-macos12.patch new file mode 100644 index 0000000000..242c38c861 --- /dev/null +++ b/var/spack/repos/builtin/packages/qt/qt5-macos12.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 <CoreGraphics/CGColorSpace.h> + #include <qpa/qplatformgraphicsbuffer.h> + #include <private/qcore_mac_p.h> + |