diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2016-08-25 11:58:52 -0400 |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2016-09-06 16:00:21 -0400 |
| commit | 71c357e485cf1d1bd7dc24a7da3b3ad042ca2ee1 (patch) | |
| tree | 8bee073aff92994685525311a1df50325561e769 /var | |
| parent | aa9faceb0332e63c2dd83d90887e03ad6c2eb837 (diff) | |
| download | spack-71c357e485cf1d1bd7dc24a7da3b3ad042ca2ee1.tar.gz spack-71c357e485cf1d1bd7dc24a7da3b3ad042ca2ee1.tar.bz2 spack-71c357e485cf1d1bd7dc24a7da3b3ad042ca2ee1.tar.xz spack-71c357e485cf1d1bd7dc24a7da3b3ad042ca2ee1.zip | |
qt: support building with 10.10+ SDKs
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/qt4-el-capitan.patch | 31 |
2 files changed, 32 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 80efc83c5a..3f62c5c77f 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -56,6 +56,7 @@ class Qt(Package): patch('btn_trigger_happy.patch', when='@5.7.0:') patch('qt4-corewlan-new-osx.patch', when='@4') + patch('qt4-el-capitan.patch', when='@4') # Use system openssl for security. depends_on("openssl") diff --git a/var/spack/repos/builtin/packages/qt/qt4-el-capitan.patch b/var/spack/repos/builtin/packages/qt/qt4-el-capitan.patch new file mode 100644 index 0000000000..35f154d3b0 --- /dev/null +++ b/var/spack/repos/builtin/packages/qt/qt4-el-capitan.patch @@ -0,0 +1,31 @@ +From 27aa46933bb32a88c310fe5918a49a3f34d65dfe Mon Sep 17 00:00:00 2001 +From: Mike McQuaid <mike@mikemcquaid.com> +Date: Sun, 13 Sep 2015 11:55:59 +0100 +Subject: [PATCH] Fix El Capitan build. + +--- + src/gui/painting/qpaintengine_mac.cpp | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/src/gui/painting/qpaintengine_mac.cpp b/src/gui/painting/qpaintengine_mac.cpp +index 4aa0668..63b646d 100644 +--- a/src/gui/painting/qpaintengine_mac.cpp ++++ b/src/gui/painting/qpaintengine_mac.cpp +@@ -340,13 +340,7 @@ CGColorSpaceRef QCoreGraphicsPaintEngine::macDisplayColorSpace(const QWidget *wi + } + + // Get the color space from the display profile. +- CGColorSpaceRef colorSpace = 0; +- CMProfileRef displayProfile = 0; +- CMError err = CMGetProfileByAVID((CMDisplayIDType)displayID, &displayProfile); +- if (err == noErr) { +- colorSpace = CGColorSpaceCreateWithPlatformColorSpace(displayProfile); +- CMCloseProfile(displayProfile); +- } ++ CGColorSpaceRef colorSpace = CGDisplayCopyColorSpace(displayID); + + // Fallback: use generic DeviceRGB + if (colorSpace == 0) +-- +2.3.8 (Apple Git-58) + |