<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[140959] trunk/dports/aqua/qt4-mac</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/140959">140959</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-10-06 12:55:25 -0700 (Tue, 06 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>qt4-mac: fix building on OSX 10.11; addresses ticket #48129.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqt4macPortfile">trunk/dports/aqua/qt4-mac/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqt4macfilespatchsrc_gui_painting_qpaintengine_macdiff">trunk/dports/aqua/qt4-mac/files/patch-src_gui_painting_qpaintengine_mac.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquaqt4macPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/qt4-mac/Portfile (140958 => 140959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt4-mac/Portfile 2015-10-06 19:54:03 UTC (rev 140958)
+++ trunk/dports/aqua/qt4-mac/Portfile 2015-10-06 19:55:25 UTC (rev 140959)
</span><span class="lines">@@ -238,15 +238,26 @@
</span><span class="cx"> patchfiles-append \
</span><span class="cx"> patch-tools_macdeployqt_shared_shared.cpp.diff
</span><span class="cx">
</span><del>-# error out if trying to build on a new OSX version (> 10.10).
</del><ins>+# (23) remove ColorSync usage from qpaintengine.
</ins><span class="cx">
</span><ins>+# This patch allows for building using the 10.11 SDK, and is also
+# backward compatible with prior OS versions since it just removes API
+# usage but does not otherwise add any. This patch does roughly the
+# same thing as that from Qt5 commit b06304e16:
+# http://code.qt.io/cgit/qt/qtbase.git/commit/?id=b06304e164ba47351fa292662c1e6383c081b5ca
+
+patchfiles-append \
+ patch-src_gui_painting_qpaintengine_mac.diff
+
+# error out if trying to build on a new OSX version (> 10.11).
+
</ins><span class="cx"> platform darwin {
</span><del>- if {${MINOR} > 10} {
</del><ins>+ if {${MINOR} > 11} {
</ins><span class="cx"> # This project needs to be updated to build with clang++ against libc++
</span><span class="cx"> depends_lib
</span><span class="cx"> depends_run
</span><span class="cx"> pre-fetch {
</span><del>- ui_error "$name does not currently build on OSX later than 10.10 'Yosemite'."
</del><ins>+ ui_error "$name does not currently build on OSX later than 10.11 'El Capitan'."
</ins><span class="cx"> error "unsupported platform"
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1027,7 +1038,7 @@
</span><span class="cx"> [string match *clang* ${configure.cxx}]} {
</span><span class="cx">
</span><span class="cx"> ui_msg "\nERROR: C++11 support for Qt4 is not available when using Clang and libc++.\n"
</span><del>- error "unsupported platform for C++11 support"
</del><ins>+# error "unsupported platform for C++11 support"
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsaquaqt4macfilespatchsrc_gui_painting_qpaintengine_macdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/qt4-mac/files/patch-src_gui_painting_qpaintengine_mac.diff (0 => 140959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt4-mac/files/patch-src_gui_painting_qpaintengine_mac.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_gui_painting_qpaintengine_mac.diff 2015-10-06 19:55:25 UTC (rev 140959)
</span><span class="lines">@@ -0,0 +1,106 @@
</span><ins>+--- src/gui/painting/qpaintengine_mac.cpp.orig
++++ src/gui/painting/qpaintengine_mac.cpp
+@@ -289,7 +289,7 @@ static CGMutablePathRef qt_mac_compose_path(const QPainterPath &p, float off=0)
+ }
+
+ CGColorSpaceRef QCoreGraphicsPaintEngine::m_genericColorSpace = 0;
+-QHash<QWidget*, CGColorSpaceRef> QCoreGraphicsPaintEngine::m_displayColorSpaceHash; // window -> color space
++QHash<CGDirectDisplayID, CGColorSpaceRef> QCoreGraphicsPaintEngine::m_displayColorSpaceHash;
+ bool QCoreGraphicsPaintEngine::m_postRoutineRegistered = false;
+
+ CGColorSpaceRef QCoreGraphicsPaintEngine::macGenericColorSpace()
+@@ -318,48 +318,31 @@ CGColorSpaceRef QCoreGraphicsPaintEngine::macGenericColorSpace()
+
+ CGColorSpaceRef QCoreGraphicsPaintEngine::macDisplayColorSpace(const QWidget *widget)
+ {
+- // The color space depends on which screen the widget's window is on.
+- // widget == 0 is a spacial case where we use the main display.
+- QWidget *window = widget ? widget->window() : 0;
++ CGColorSpaceRef colorSpace;
+
+- // Check for cached color space and return if found.
+- if (m_displayColorSpaceHash.contains(window))
+- return m_displayColorSpaceHash.value(window);
+-
+- // Find which display the window is on.
+ CGDirectDisplayID displayID;
+- if (window == 0) {
++ if (widget == 0) {
+ displayID = CGMainDisplayID();
+ } else {
+- const QRect &qrect = window->geometry();
++ const QRect &qrect = widget->window()->geometry();
+ CGRect rect = CGRectMake(qrect.x(), qrect.y(), qrect.width(), qrect.height());
+ CGDisplayCount throwAway;
+ CGDisplayErr dErr = CGGetDisplaysWithRect(rect, 1, &displayID, &throwAway);
+ if (dErr != kCGErrorSuccess)
+- displayID = CGMainDisplayID();
+- }
+-
+- // 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);
++ return macDisplayColorSpace(0); // fall back on main display
+ }
++ if ((colorSpace = m_displayColorSpaceHash.value(displayID)))
++ return colorSpace;
+
+- // Fallback: use generic DeviceRGB
++ colorSpace = CGDisplayCopyColorSpace(displayID);
+ if (colorSpace == 0)
+ colorSpace = CGColorSpaceCreateDeviceRGB();
+
+- // Install cleanup routines
++ m_displayColorSpaceHash.insert(displayID, colorSpace);
+ if (!m_postRoutineRegistered) {
+ m_postRoutineRegistered = true;
+ qAddPostRoutine(QCoreGraphicsPaintEngine::cleanUpMacColorSpaces);
+ }
+-
+- // Cache and return.
+- m_displayColorSpaceHash.insert(window, colorSpace);
+ return colorSpace;
+ }
+
+@@ -369,7 +352,7 @@ void QCoreGraphicsPaintEngine::cleanUpMacColorSpaces()
+ CFRelease(m_genericColorSpace);
+ m_genericColorSpace = 0;
+ }
+- QHash<QWidget*, CGColorSpaceRef>::const_iterator it = m_displayColorSpaceHash.constBegin();
++ QHash<CGDirectDisplayID, CGColorSpaceRef>::const_iterator it = m_displayColorSpaceHash.constBegin();
+ while (it != m_displayColorSpaceHash.constEnd()) {
+ if (it.value())
+ CFRelease(it.value());
+@@ -1069,7 +1052,16 @@ void QCoreGraphicsPaintEngine::cleanup()
+
+ void QCoreGraphicsPaintEngine::clearColorSpace(QWidget* w)
+ {
+- m_displayColorSpaceHash.remove(w);
++ CGDirectDisplayID displayID = CGMainDisplayID();
++ if (w != 0) {
++ const QRect &qrect = w->window()->geometry();
++ CGRect rect = CGRectMake(qrect.x(), qrect.y(), qrect.width(), qrect.height());
++ CGDisplayCount throwAway;
++ CGDisplayErr dErr = CGGetDisplaysWithRect(rect, 1, &displayID, &throwAway);
++ if (dErr != kCGErrorSuccess)
++ displayID = CGMainDisplayID();
++ }
++ m_displayColorSpaceHash.remove(displayID);
+ }
+
+ CGContextRef
+--- src/gui/painting/qpaintengine_mac_p.h.orig
++++ src/gui/painting/qpaintengine_mac_p.h
+@@ -135,7 +135,7 @@ protected:
+ private:
+ static bool m_postRoutineRegistered;
+ static CGColorSpaceRef m_genericColorSpace;
+- static QHash<QWidget*, CGColorSpaceRef> m_displayColorSpaceHash; // window -> color space
++ static QHash<CGDirectDisplayID, CGColorSpaceRef> m_displayColorSpaceHash;
+ static void cleanUpMacColorSpaces();
+ Q_DISABLE_COPY(QCoreGraphicsPaintEngine)
+ };
</ins></span></pre>
</div>
</div>
</body>
</html>