<!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>[141285] 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/141285">141285</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-10-14 10:45:49 -0700 (Wed, 14 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>qt4-mac:
+ add patches to address tickets #43746, #46608, and #48516;
+ nothing critical for most users, so no rev-bump;
+ fix commented out error when trying to build +cxx11 using clang (my bad).</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_corelib_io_qprocess_unixcppdiff">trunk/dports/aqua/qt4-mac/files/patch-src_corelib_io_qprocess_unix.cpp.diff</a></li>
<li><a href="#trunkdportsaquaqt4macfilespatchsrc_gui_dialogs_qfiledialog_macmmdiff">trunk/dports/aqua/qt4-mac/files/patch-src_gui_dialogs_qfiledialog_mac.mm.diff</a></li>
<li><a href="#trunkdportsaquaqt4macfilespatchsrc_gui_kernel_qcursor_macmmdiff">trunk/dports/aqua/qt4-mac/files/patch-src_gui_kernel_qcursor_mac.mm.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 (141284 => 141285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt4-mac/Portfile 2015-10-14 15:38:55 UTC (rev 141284)
+++ trunk/dports/aqua/qt4-mac/Portfile 2015-10-14 17:45:49 UTC (rev 141285)
</span><span class="lines">@@ -249,6 +249,28 @@
</span><span class="cx"> patchfiles-append \
</span><span class="cx"> patch-src_gui_painting_qpaintengine_mac.diff
</span><span class="cx">
</span><ins>+# (24) fix qcursor_mac; already committed upstream; see also:
+# https://trac.macports.org/ticket/48516
+# http://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/cocoa/qcocoacursor.mm?id=02ea0235216beef390e9868ff770c7a54d70db83
+# https://developer.apple.com/library/prerelease/mac/documentation/Carbon/Reference/QuartzEventServicesRef/#//apple_ref/c/func/CGEventCreateMouseEvent
+
+patchfiles-append \
+ patch-src_gui_kernel_qcursor_mac.mm.diff
+
+# (25) avoid zombie processes; see also:
+# https://trac.macports.org/ticket/46608
+# https://codereview.qt-project.org/#/c/61294/
+# approved by abandoned.
+
+patchfiles-append \
+ patch-src_corelib_io_qprocess_unix.cpp.diff
+
+# (26) fix build on Leopard; see also:
+# https://trac.macports.org/ticket/43746
+
+patchfiles-append \
+ patch-src_gui_dialogs_qfiledialog_mac.mm.diff
+
</ins><span class="cx"> # error out if trying to build on a new OSX version (> 10.11).
</span><span class="cx">
</span><span class="cx"> platform darwin {
</span><span class="lines">@@ -1037,7 +1059,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_corelib_io_qprocess_unixcppdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/qt4-mac/files/patch-src_corelib_io_qprocess_unix.cpp.diff (0 => 141285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt4-mac/files/patch-src_corelib_io_qprocess_unix.cpp.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_corelib_io_qprocess_unix.cpp.diff 2015-10-14 17:45:49 UTC (rev 141285)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+--- src/corelib/io/qprocess_unix.cpp.orig 2015-10-14 13:02:18.000000000 -0400
++++ src/corelib/io/qprocess_unix.cpp 2015-10-14 13:02:43.000000000 -0400
+@@ -1302,11 +1302,11 @@
+
+ // read a byte from the death pipe
+ char c;
+- qt_safe_read(deathPipe[0], &c, 1);
++ qint64 readcount = qt_safe_read(deathPipe[0], &c, 1);
+
+ // check if our process is dead
+ int exitStatus;
+- if (qt_safe_waitpid(pid_t(pid), &exitStatus, WNOHANG) > 0) {
++ if (qt_safe_waitpid(pid_t(pid), &exitStatus, readcount > 0 ? WNOHANG : 0) > 0) {
+ processManager()->remove(q);
+ crashed = !WIFEXITED(exitStatus);
+ exitCode = WEXITSTATUS(exitStatus);
</ins></span></pre></div>
<a id="trunkdportsaquaqt4macfilespatchsrc_gui_dialogs_qfiledialog_macmmdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/qt4-mac/files/patch-src_gui_dialogs_qfiledialog_mac.mm.diff (0 => 141285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt4-mac/files/patch-src_gui_dialogs_qfiledialog_mac.mm.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_gui_dialogs_qfiledialog_mac.mm.diff 2015-10-14 17:45:49 UTC (rev 141285)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+--- src/gui/dialogs/qfiledialog_mac.mm.orig 2015-05-07 10:14:43.000000000 -0400
++++ src/gui/dialogs/qfiledialog_mac.mm 2015-10-14 12:02:40.000000000 -0400
+@@ -297,6 +297,7 @@
+ CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, (CFStringRef)filename, kCFURLPOSIXPathStyle, isDir);
+ CFBooleanRef isHidden;
+ Boolean errorOrHidden = false;
++#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+ if (!CFURLCopyResourcePropertyForKey(url, kCFURLIsHiddenKey, &isHidden, NULL)) {
+ errorOrHidden = true;
+ } else {
+@@ -304,6 +305,7 @@
+ errorOrHidden = true;
+ CFRelease(isHidden);
+ }
++#endif
+ CFRelease(url);
+ return errorOrHidden;
+ #else
</ins></span></pre></div>
<a id="trunkdportsaquaqt4macfilespatchsrc_gui_kernel_qcursor_macmmdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/qt4-mac/files/patch-src_gui_kernel_qcursor_mac.mm.diff (0 => 141285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt4-mac/files/patch-src_gui_kernel_qcursor_mac.mm.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_gui_kernel_qcursor_mac.mm.diff 2015-10-14 17:45:49 UTC (rev 141285)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+--- src/gui/kernel/qcursor_mac.mm.orig
++++ src/gui/kernel/qcursor_mac.mm
+@@ -319,9 +319,11 @@
+ pos.x = x;
+ pos.y = y;
+
+- CGEventRef e = CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, 0);
+- CGEventPost(kCGHIDEventTap, e);
+- CFRelease(e);
++ CGEventRef e = CGEventCreateMouseEvent(NULL, kCGEventMouseMoved, pos, kCGMouseButtonLeft);
++ if (e != NULL) {
++ CGEventPost(kCGHIDEventTap, e);
++ CFRelease(e);
++ }
+ #else
+ CGWarpMouseCursorPosition(CGPointMake(x, y));
+
</ins></span></pre>
</div>
</div>
</body>
</html>