<!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>[117941] trunk/dports/python/py-sip</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/117941">117941</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-03-17 09:44:00 -0700 (Mon, 17 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>py*-sip:
+ update to 4.15.5, which provides SIP API 11.0;
+ add SDK info for OS X 10.9.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpysipPortfile">trunk/dports/python/py-sip/Portfile</a></li>
<li><a href="#trunkdportspythonpysipfilespatchconfigurepydiff">trunk/dports/python/py-sip/files/patch-configure.py.diff</a></li>
<li><a href="#trunkdportspythonpysipfilespatchsiputilspydiff">trunk/dports/python/py-sip/files/patch-siputils.py.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpysipPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-sip/Portfile (117940 => 117941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-sip/Portfile 2014-03-17 16:08:18 UTC (rev 117940)
+++ trunk/dports/python/py-sip/Portfile 2014-03-17 16:44:00 UTC (rev 117941)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup python 1.0
</span><span class="cx">
</span><span class="cx"> name py-sip
</span><del>-version 4.15.4
</del><ins>+version 4.15.5
</ins><span class="cx"> python.versions 24 25 26 27 31 32 33 34
</span><span class="cx"> python.default_version 27
</span><span class="cx"> categories-append devel
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx">
</span><span class="cx"> distname sip-${version}
</span><span class="cx">
</span><del>- checksums rmd160 6bfee460b16f76c7f250f9454aef2a8c1610c1e2 \
- sha256 594b742873cd135dc945e61f0fff4d9d35ea5da8d23e2fc8f3820c3771a52228
</del><ins>+ checksums rmd160 94dc342a19b213b0a0997ced9ad46f1ff476241b \
+ sha256 9b11d87e7f382ce22bf013137f29462e75b56f5ea46f3fea6061bb20f967d559
</ins><span class="cx">
</span><span class="cx"> patchfiles patch-siputils.py.diff \
</span><span class="cx"> patch-specs_macx-g++.diff \
</span><span class="lines">@@ -88,6 +88,7 @@
</span><span class="cx"> 10 { configure.args-append "--sdk=${sdk_dir}/MacOSX10.6.sdk" }
</span><span class="cx"> 11 { configure.args-append "--sdk=${sdk_dir}/MacOSX10.7.sdk" }
</span><span class="cx"> 12 { configure.args-append "--sdk=${sdk_dir}/MacOSX10.8.sdk" }
</span><ins>+ 13 { configure.args-append "--sdk=${sdk_dir}/MacOSX10.9.sdk" }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> build.cmd make
</span></span></pre></div>
<a id="trunkdportspythonpysipfilespatchconfigurepydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-sip/files/patch-configure.py.diff (117940 => 117941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-sip/files/patch-configure.py.diff 2014-03-17 16:08:18 UTC (rev 117940)
+++ trunk/dports/python/py-sip/files/patch-configure.py.diff 2014-03-17 16:44:00 UTC (rev 117941)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.py.orig 2013-08-21 01:25:44.000000000 -0400
-+++ configure.py 2013-08-21 19:10:47.000000000 -0400
-@@ -547,7 +547,6 @@
</del><ins>+--- configure.py.orig 2014-03-14 10:09:34.000000000 -0400
++++ configure.py 2014-03-17 11:38:56.000000000 -0400
+@@ -548,7 +548,6 @@
</ins><span class="cx"> raise
</span><span class="cx"> except:
</span><span class="cx"> sys.stderr.write(
</span></span></pre></div>
<a id="trunkdportspythonpysipfilespatchsiputilspydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-sip/files/patch-siputils.py.diff (117940 => 117941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-sip/files/patch-siputils.py.diff 2014-03-17 16:08:18 UTC (rev 117940)
+++ trunk/dports/python/py-sip/files/patch-siputils.py.diff 2014-03-17 16:44:00 UTC (rev 117941)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- siputils.py.orig 2013-03-06 08:41:38.000000000 -0500
-+++ siputils.py 2013-03-27 08:24:05.000000000 -0400
</del><ins>+--- siputils.py.orig 2014-03-17 11:32:18.000000000 -0400
++++ siputils.py 2014-03-17 11:37:29.000000000 -0400
</ins><span class="cx"> @@ -297,7 +297,7 @@
</span><span class="cx"> # These require special handling as they are (potentially) a set of
</span><span class="cx"> # space separated values rather than a single value that might
</span><span class="lines">@@ -9,10 +9,11 @@
</span><span class="cx"> val = val.split()
</span><span class="cx">
</span><span class="cx"> # We also want to treat lists of libraries in the same way so that
</span><del>-@@ -613,6 +613,16 @@
</del><ins>+@@ -613,7 +613,17 @@
</ins><span class="cx"> libdir.extend(libdir_qt)
</span><span class="cx"> rpaths.extend(libdir_qt)
</span><span class="cx">
</span><ins>+- if qt_version >= 0x040000:
</ins><span class="cx"> + # projects using SIP may not define FRAMEWORKDIR_QT as a
</span><span class="cx"> + # configuration option, so try to retrieve it and fallback
</span><span class="cx"> + # as necessary to a reasonable default for MacPorts
</span><span class="lines">@@ -23,9 +24,10 @@
</span><span class="cx"> + libdir.extend(frameworkdir_qt)
</span><span class="cx"> + rpaths.extend(frameworkdir_qt)
</span><span class="cx"> +
</span><del>- if qt_version >= 0x040000:
</del><ins>++ if qt_version >= 0x040000:
</ins><span class="cx"> # Try and read QT_LIBINFIX from qconfig.pri.
</span><span class="cx"> qconfig = os.path.join(mkspecs, "qconfig.pri")
</span><ins>+ self._infix = self._extract_value(qconfig, "QT_LIBINFIX")
</ins><span class="cx"> @@ -748,7 +758,7 @@
</span><span class="cx"> if mod == "QAxContainer":
</span><span class="cx"> incdir.append(os.path.join(qtincdir[0], "ActiveQt"))
</span><span class="lines">@@ -53,18 +55,7 @@
</span><span class="cx"> else:
</span><span class="cx"> prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib + ".prl")
</span><span class="cx">
</span><del>-@@ -1561,8 +1571,8 @@
- # Note that I can't remember why we need a framework build.
- dl = get_python_inc().split(os.sep)
-
-- if "Python.framework" not in dl:
-- error("SIP requires Python to be built as a framework")
-+# if "Python.framework" not in dl:
-+# error("SIP requires Python to be built as a framework")
-
- self.LFLAGS.append("-undefined dynamic_lookup")
-
-@@ -2472,6 +2482,40 @@
</del><ins>+@@ -2462,6 +2472,40 @@
</ins><span class="cx"> lhs = line[:assstart].strip()
</span><span class="cx"> rhs = line[assend + 1:].strip()
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>