<!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>[127528] trunk/dports/aqua/qt5-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/127528">127528</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2014-10-28 21:25:13 -0700 (Tue, 28 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>* update version 5.3.1 -> 5.3.2
* macdeployqt should look for frameworks in the correct location (fixes #44934)
* add explicit cast to allow build on Yosemite (fixes #45298)
* add patch to allow build on 32-bit systems
* fix include directories in .pc files (fixes #44204)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqt5macPortfile">trunk/dports/aqua/qt5-mac/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqt5macfilespatchavfmediaplayersessiondiff">trunk/dports/aqua/qt5-mac/files/patch-avfmediaplayersession.diff</a></li>
<li><a href="#trunkdportsaquaqt5macfilespatchqmacstyle_macdiff">trunk/dports/aqua/qt5-mac/files/patch-qmacstyle_mac.diff</a></li>
<li><a href="#trunkdportsaquaqt5macfilespatchshareddiff">trunk/dports/aqua/qt5-mac/files/patch-shared.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquaqt5macPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/qt5-mac/Portfile (127527 => 127528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5-mac/Portfile 2014-10-29 03:02:47 UTC (rev 127527)
+++ trunk/dports/aqua/qt5-mac/Portfile 2014-10-29 04:25:13 UTC (rev 127528)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name qt5-mac
</span><del>-version 5.3.1
</del><ins>+version 5.3.2
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx">
</span><span class="cx"> categories aqua
</span><span class="lines">@@ -22,8 +22,8 @@
</span><span class="cx">
</span><span class="cx"> master_sites http://download.qt-project.org/official_releases/qt/${branch}/${version}/single/
</span><span class="cx">
</span><del>-checksums rmd160 4cf6af424fe84223c5d9570848b4e21e251c5cdf \
- sha256 ba898625ba525d90a54739d2e33e4701d0bcd22d45663737b8123cd9b17b35a1
</del><ins>+checksums rmd160 5cd61acc2fbfba2597a386a09d83710ed2fdf483 \
+ sha256 c8d3fd2ead30705c6673c5e4af6c6f3973346b4fb2bd6079c7be0943a5b0282d
</ins><span class="cx">
</span><span class="cx"> if { ${os.major} < 10 } {
</span><span class="cx"> pre-fetch {
</span><span class="lines">@@ -115,6 +115,15 @@
</span><span class="cx"> # During testing, NSStringFromRect requires NSRect.
</span><span class="cx"> patchfiles-append patch-tst_qaccessibilitymac_helpers.diff
</span><span class="cx">
</span><ins>+ # see #44934 (and #35067 for the qt4-mac version)
+ patchfiles-append patch-shared.diff
+
+ # see https://bugreports.qt-project.org/browse/QTBUG-41136
+ patchfiles-append patch-avfmediaplayersession.diff
+
+ # see https://bugreports.qt-project.org/browse/QTBUG-41367
+ patchfiles-append patch-qmacstyle_mac.diff
+
</ins><span class="cx"> # --prefix is not recognized.
</span><span class="cx"> configure.pre_args-delete --prefix=${prefix}
</span><span class="cx">
</span><span class="lines">@@ -288,6 +297,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><ins>+
+ # see #44204
+ foreach f [glob -nocomplain -directory ${destroot}${qt_frameworks_dir}/pkgconfig *.pc] {
+ set framework [file rootname [file tail ${f}]]
+ set incname [string map {Qt5 Qt} ${framework}]
+ reinplace "s|-I\${includedir}/${incname}|-I\${includedir}|g" ${f}
+ reinplace "s|includedir=\${prefix}/include|includedir=\${libdir}/${framework}/Headers|g" ${f}
+ }
+
</ins><span class="cx"> # move items out of the Frameworks directory that are more appropriate to lib directory
</span><span class="cx"> xinstall -m 775 -d ${destroot}${qt_cmake_module_dir}
</span><span class="cx"> foreach d [glob -tails -nocomplain -directory ${destroot}${qt_frameworks_dir}/cmake *] {
</span></span></pre></div>
<a id="trunkdportsaquaqt5macfilespatchavfmediaplayersessiondiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/qt5-mac/files/patch-avfmediaplayersession.diff (0 => 127528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5-mac/files/patch-avfmediaplayersession.diff (rev 0)
+++ trunk/dports/aqua/qt5-mac/files/patch-avfmediaplayersession.diff 2014-10-29 04:25:13 UTC (rev 127528)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- qtmultimedia/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm.orig 2014-10-26 12:44:28.000000000 -0700
++++ qtmultimedia/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm 2014-10-26 12:46:11.000000000 -0700
+@@ -295,7 +295,7 @@
+ //AVPlayerItem "status" property value observer.
+ if (context == AVFMediaPlayerSessionObserverStatusObservationContext)
+ {
+- AVPlayerStatus status = [[change objectForKey:NSKeyValueChangeNewKey] integerValue];
++ AVPlayerStatus status = (AVPlayerStatus)[[change objectForKey:NSKeyValueChangeNewKey] integerValue];
+ switch (status)
+ {
+ //Indicates that the status of the player is not yet known because
</ins></span></pre></div>
<a id="trunkdportsaquaqt5macfilespatchqmacstyle_macdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/qt5-mac/files/patch-qmacstyle_mac.diff (0 => 127528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5-mac/files/patch-qmacstyle_mac.diff (rev 0)
+++ trunk/dports/aqua/qt5-mac/files/patch-qmacstyle_mac.diff 2014-10-29 04:25:13 UTC (rev 127528)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+--- .//qtbase/src/widgets/styles/qmacstyle_mac.mm.orig 2014-09-11 03:48:01.000000000 -0700
++++ .//qtbase/src/widgets/styles/qmacstyle_mac.mm 2014-10-28 19:28:34.000000000 -0700
+@@ -3667,9 +3667,9 @@
+
+ NSBezierPath *pushButtonFocusRingPath;
+ if (bdi.kind == kThemeBevelButton)
+- pushButtonFocusRingPath = [NSBezierPath bezierPathWithRect:focusRect];
++ pushButtonFocusRingPath = [NSBezierPath bezierPathWithRect:NSRectFromCGRect(focusRect)];
+ else
+- pushButtonFocusRingPath = [NSBezierPath bezierPathWithRoundedRect:focusRect xRadius:4 yRadius:4];
++ pushButtonFocusRingPath = [NSBezierPath bezierPathWithRoundedRect:NSRectFromCGRect(focusRect) xRadius:4 yRadius:4];
+ qt_drawFocusRingOnPath(cg, pushButtonFocusRingPath);
+ }
+
</ins></span></pre></div>
<a id="trunkdportsaquaqt5macfilespatchshareddiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/qt5-mac/files/patch-shared.diff (0 => 127528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5-mac/files/patch-shared.diff (rev 0)
+++ trunk/dports/aqua/qt5-mac/files/patch-shared.diff 2014-10-29 04:25:13 UTC (rev 127528)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- .//qttools/src/macdeployqt/shared/shared.cpp.orig 2014-09-11 03:48:25.000000000 -0700
++++ .//qttools/src/macdeployqt/shared/shared.cpp 2014-10-26 11:14:49.000000000 -0700
+@@ -168,7 +168,7 @@
+ state = DylibName;
+ continue;
+ } else if (part < parts.count() && parts.at(part).endsWith(".framework")) {
+- info.installName += "/" + (qtPath + "lib/").simplified();
++ info.installName += "/" + (qtPath + "Frameworks/").simplified();
+ info.frameworkDirectory = info.installName;
+ state = FrameworkName;
+ continue;
</ins></span></pre>
</div>
</div>
</body>
</html>