qt: support building with 10.10+ SDKs
This commit is contained in:
parent
aa9faceb03
commit
71c357e485
@ -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")
|
||||
|
31
var/spack/repos/builtin/packages/qt/qt4-el-capitan.patch
Normal file
31
var/spack/repos/builtin/packages/qt/qt4-el-capitan.patch
Normal file
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user