<!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>[153015] 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/153015">153015</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2016-09-22 04:34:56 -0700 (Thu, 22 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>qt4-mac:
+ fix typos;
+ allow building on 10.12;
+ add patch to allow building when using libc++ForOlderSystems on Leopard and Snow Leopard, which addresses ticket #51844.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqt4macPortfile">trunk/dports/aqua/qt4-mac/Portfile</a></li>
<li><a href="#trunkdportsaquaqt4macfilessplit_sourcesprf">trunk/dports/aqua/qt4-mac/files/split_sources.prf</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 (153014 => 153015)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt4-mac/Portfile 2016-09-22 10:24:02 UTC (rev 153014)
+++ trunk/dports/aqua/qt4-mac/Portfile 2016-09-22 11:34:56 UTC (rev 153015)
</span><span class="lines">@@ -11,10 +11,6 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx">
</span><span class="cx"> name qt4-mac
</span><del>-# qt4-mac-devel is "replaced_by" this port,
-# so this port cannot conflict with it.
-#conflicts qt3 qt3-mac qt4-mac-devel
-conflicts qt3 qt3-mac
</del><span class="cx"> version 4.8.7
</span><span class="cx"> revision 4
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="lines">@@ -271,15 +267,15 @@
</span><span class="cx"> patchfiles-append \
</span><span class="cx"> patch-src_gui_dialogs_qfiledialog_mac.mm.diff
</span><span class="cx">
</span><del>-# error out if trying to build on a new OSX version (> 10.11).
</del><ins>+# error out if trying to build on a new OSX version (> 10.12).
</ins><span class="cx">
</span><span class="cx"> platform darwin {
</span><del>- if {${MINOR} > 11} {
</del><ins>+ if {${MINOR} > 12} {
</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.11 'El Capitan'."
</del><ins>+ ui_error "$name does not currently build on Mac OS X later than 10.12 'Sierra'."
</ins><span class="cx"> error "unsupported platform"
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -585,6 +581,19 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ # on Leopard and Snow Leopard with libc++ForOlderSystems
+ # installed, SDK must be unset as we can only use system libraries
+ # also, a missing library link must be replaced for build to
+ # succeed: <https://trac.macports.org/ticket/51844>
+ platform darwin {
+ if {${os.major} == 9 || ${os.major} == 10} {
+ if {${configure.cxx_stdlib} eq "libc++"} {
+ set SDK ""
+ configure.ldflags-append "-lobjc"
+ }
+ }
+ }
+
</ins><span class="cx"> # set the SDK, if it was found and exists
</span><span class="cx">
</span><span class="cx"> if {[file exists ${SDK}]} {
</span></span></pre></div>
<a id="trunkdportsaquaqt4macfilessplit_sourcesprf"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/qt4-mac/files/split_sources.prf (153014 => 153015)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt4-mac/files/split_sources.prf 2016-09-22 10:24:02 UTC (rev 153014)
+++ trunk/dports/aqua/qt4-mac/files/split_sources.prf 2016-09-22 11:34:56 UTC (rev 153015)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# move Obective C and C++ files from SOURCES to OBJECTIVE_SOURCES
</del><ins>+# move Objective C and C++ files from SOURCES to OBJECTIVE_SOURCES
</ins><span class="cx">
</span><span class="cx"> for(source, SOURCES) {
</span><span class="cx"> contains(source,.*\\.m$) {
</span></span></pre>
</div>
</div>
</body>
</html>