<!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>[130063] 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/130063">130063</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-12-25 09:38:01 -0800 (Thu, 25 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>py[27,34]-sip: update to 4.16.5; SIP API remains unchanged so no rev-bump of dependencies needed.</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 (130062 => 130063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-sip/Portfile 2014-12-25 17:36:24 UTC (rev 130062)
+++ trunk/dports/python/py-sip/Portfile 2014-12-25 17:38:01 UTC (rev 130063)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx">
</span><span class="cx"> homepage http://www.riverbankcomputing.co.uk/software/sip/intro
</span><span class="cx">
</span><del>-version 4.16.4
</del><ins>+version 4.16.5
</ins><span class="cx">
</span><span class="cx"> # from siplib/sip.h.in:
</span><span class="cx"> #
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> # removed or the order changed then the major number must be
</span><span class="cx"> # incremented and the minor number set to 0.
</span><span class="cx"> #
</span><del>-# SIP 4.16.[1-4] provides SIP API 11.1.
</del><ins>+# SIP 4.16.[1-5] provides SIP API 11.1.
</ins><span class="cx"> # SIP 4.15.5 provided SIP API 11.0.
</span><span class="cx">
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="lines">@@ -51,8 +51,8 @@
</span><span class="cx"> distname sip-${version}
</span><span class="cx"> }
</span><span class="cx">
</span><del>- checksums rmd160 d1ce6d022272bb31bb90fd36ed55371bde7aa4be \
- sha256 ceda443fc5e129e67a067e2cd7b73ff037f8b10b50e407baa2b1d9f2199d57f5
</del><ins>+ checksums rmd160 a7ed8f728ad8cc50b1838be837e3967f69d9cd68 \
+ sha256 a00ba34c30bedc0f61916eb10bd12867b4754910a766647e3e58f88bd00f1e87
</ins><span class="cx">
</span><span class="cx"> patchfiles patch-siputils.py.diff \
</span><span class="cx"> patch-specs_macx-g++.diff \
</span></span></pre></div>
<a id="trunkdportspythonpysipfilespatchconfigurepydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-sip/files/patch-configure.py.diff (130062 => 130063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-sip/files/patch-configure.py.diff 2014-12-25 17:36:24 UTC (rev 130062)
+++ trunk/dports/python/py-sip/files/patch-configure.py.diff 2014-12-25 17:38:01 UTC (rev 130063)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.py.orig 2014-06-02 14:22:56.000000000 -0400
-+++ configure.py 2014-06-02 14:23:07.000000000 -0400
-@@ -880,7 +880,6 @@
</del><ins>+--- configure.py.orig 2014-12-24 04:56:52.000000000 -0500
++++ configure.py 2014-12-25 11:19:20.000000000 -0500
+@@ -890,7 +890,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 (130062 => 130063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-sip/files/patch-siputils.py.diff 2014-12-25 17:36:24 UTC (rev 130062)
+++ trunk/dports/python/py-sip/files/patch-siputils.py.diff 2014-12-25 17:38:01 UTC (rev 130063)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- siputils.py.orig 2014-05-10 11:00:48.000000000 -0400
-+++ siputils.py 2014-06-02 14:22:26.000000000 -0400
</del><ins>+--- siputils.py.orig 2014-11-29 08:50:28.000000000 -0500
++++ siputils.py 2014-12-25 11:19:20.000000000 -0500
</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,7 +9,7 @@
</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>+@@ -614,6 +614,16 @@
</ins><span class="cx"> libdir.extend(libdir_qt)
</span><span class="cx"> rpaths.extend(libdir_qt)
</span><span class="cx">
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> if qt_version >= 0x040000:
</span><span class="cx"> # Try and read QT_LIBINFIX from qconfig.pri.
</span><span class="cx"> qconfig = os.path.join(mkspecs, "qconfig.pri")
</span><del>-@@ -748,7 +758,7 @@
</del><ins>+@@ -749,7 +759,7 @@
</ins><span class="cx"> if mod == "QAxContainer":
</span><span class="cx"> incdir.append(os.path.join(qtincdir[0], "ActiveQt"))
</span><span class="cx"> elif self._is_framework(mod):
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> if mod == "QtAssistant" and qt_version < 0x040202:
</span><span class="cx"> mod = "QtAssistantClient"
</span><del>-@@ -834,7 +844,7 @@
</del><ins>+@@ -835,7 +845,7 @@
</ins><span class="cx"> def _is_framework(self, mod):
</span><span class="cx"> """Return true if the given Qt module is a framework.
</span><span class="cx"> """
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> def _qt_module_to_lib(self, mname):
</span><span class="cx"> """Return the name of the Qt library corresponding to a module.
</span><del>-@@ -962,7 +972,7 @@
</del><ins>+@@ -963,7 +973,7 @@
</ins><span class="cx"> if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
</span><span class="cx"> prl_name = os.path.join(self.config.qt_lib_dir, clib + ".prl")
</span><span class="cx"> elif sys.platform == "darwin" and framework:
</span><span class="lines">@@ -53,7 +53,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>-@@ -2471,6 +2481,40 @@
</del><ins>+@@ -2477,6 +2487,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>