Fix build on el capitan

2 files changed, 29 insertions, 1 deletions

diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 031f3379e2b..8dd3995ea3e 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.104 2015/11/04 03:28:52 agc Exp $
+$NetBSD: distinfo,v 1.105 2015/11/19 00:06:15 wiedi Exp $
 
 SHA1 (qt-everywhere-opensource-src-4.8.7.tar.gz) = 76aef40335c0701e5be7bb3a9101df5d22fe3666
 RMD160 (qt-everywhere-opensource-src-4.8.7.tar.gz) = afb5e5a99388e6429faca59cb5000054feffd166
@@ -70,6 +70,7 @@ SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_qt_PlatformKeyboardEvent
 SHA1 (patch-src_corelib_io_io.pri) = cde98927b524c92fae1e053c2359e77bde2c240a
 SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = bb16b95d20286b1aa069dc25843d7e0067cc0268
 SHA1 (patch-src_corelib_thread_qthread__unix.cpp) = 1d2104fb43f6789729b5bb88191fa5fa4d4184b1
+SHA1 (patch-src_gui_painting_qpaintengine__mac.cpp) = dc44116d5d138020e5d525ec5b7fd0f1b44ebeca
 SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 3ad682b86d2e9bd2b282caa298508dc3e9dd8566
 SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = 417846ba9edab8638cafa41a54ef60029467ef80
 SHA1 (patch-src_plugins_accessible_widgets_itemviews.cpp) = 1456fbaacef33f3b2422158d758d02990845048a
diff --git a/x11/qt4-libs/patches/patch-src_gui_painting_qpaintengine__mac.cpp b/x11/qt4-libs/patches/patch-src_gui_painting_qpaintengine__mac.cpp
new file mode 100644
index 00000000000..799db8e70c6
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-src_gui_painting_qpaintengine__mac.cpp
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_gui_painting_qpaintengine__mac.cpp,v 1.1 2015/11/19 00:06:15 wiedi Exp $
+
+CMGetProfileByAVID and CMCloseProfile have been deprecated.
+Fixes errors like:
+	error: use of undeclared identifier 'CMGetProfileByAVID'
+	error: use of undeclared identifier 'CMCloseProfile'
+
+Taken from homebrew https://raw.githubusercontent.com/Homebrew/patches/480b7142c4e2ae07de6028f672695eb927a34875/qt/el-capitan.patch
+which is based on upstream issue http://code.qt.io/cgit/qt/qtbase.git/commit/?id=b06304e164ba47351fa292662c1e6383c081b5ca
+
+--- src/gui/painting/qpaintengine_mac.cpp.orig	2015-05-07 14:14:43.000000000 +0000
++++ src/gui/painting/qpaintengine_mac.cpp
+@@ -340,13 +340,7 @@ CGColorSpaceRef QCoreGraphicsPaintEngine
+     }
+ 
+     // 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)