<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1e2bf83ad9b3fd5677d14b16bb4ded83ecfd39da">https://github.com/macports/macports-ports/commit/1e2bf83ad9b3fd5677d14b16bb4ded83ecfd39da</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1e2bf83 py*-sip: update to 4.19.10.
</span>1e2bf83 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1e2bf83ad9b3fd5677d14b16bb4ded83ecfd39da
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Jun 25 15:02:49 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> py*-sip: update to 4.19.10.
</span>---
python/py-sip/Portfile | 13 +++++++------
python/py-sip/files/patch-add_ppc64.diff | 2 +-
python/py-sip/files/patch-configure.py.diff | 2 +-
python/py-sip/files/patch-siputils.py.diff | 16 ++++++++--------
4 files changed, 17 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-sip/Portfile b/python/py-sip/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 816606a..64dc1b8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-sip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-sip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ long_description \
</span>
homepage https://www.riverbankcomputing.com/software/sip/intro
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.19.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.19.10
</span>
# from siplib/sip.h.in:
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ version 4.19.8
</span> # removed or the order changed then the major number must be
# incremented and the minor number set to 0.
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# SIP 4.19.8 provides SIP API 12.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# SIP 4.19.[8-9] provides SIP API 12.4
</span> # SIP 4.19.[4-7] provides SIP API 12.3
# SIP 4.19.3 provides SIP API 12.2
# SIP 4.19.[1-2] provides SIP API 12.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,9 +60,9 @@ if {${name} ne ${subport}} {
</span> distname sip-${version}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 064948f2cd178191a00fd691f292a85b7360f2a5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7eaf7a2ea7d4d38a56dd6d2506574464bddf7cf284c960801679942377c297bc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1024548
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 2c028d9a8220a4365084836975a08921b1df7ebc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 31ac7d48be8fd2df5f3bdb712f66a7d9a858cc1f6cb35fc95d829e0a69c3dd48 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1032653
</span>
patchfiles patch-siputils.py.diff \
patch-specs_macx-g++.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,7 +92,8 @@ if {${name} ne ${subport}} {
</span> --bindir=${prefix}/bin \
--destdir=${python.pkgd} \
--incdir=${python.include} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --sipdir=${prefix}/share/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --sipdir=${prefix}/share/${subport} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --no-dist-info
</span>
# always add some arch flags, since the user might have overridden
# the default arch build (e.g., ticket #44086).
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-sip/files/patch-add_ppc64.diff b/python/py-sip/files/patch-add_ppc64.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e4d2e2..c4e6f9b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-sip/files/patch-add_ppc64.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-sip/files/patch-add_ppc64.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- configure.py.orig
+++ configure.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -707,7 +707,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -747,7 +747,7 @@
</span>
g = optparse.OptionGroup(p, title="MacOS X Configuration")
g.add_option("--arch", action="append", default=[], dest="arch",
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-sip/files/patch-configure.py.diff b/python/py-sip/files/patch-configure.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 416250f..7565844 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-sip/files/patch-configure.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-sip/files/patch-configure.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- configure.py.orig
+++ configure.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -944,7 +944,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -988,7 +988,6 @@
</span> raise
except:
sys.stderr.write(
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-sip/files/patch-siputils.py.diff b/python/py-sip/files/patch-siputils.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8341b0b..073f4d8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-sip/files/patch-siputils.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-sip/files/patch-siputils.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- siputils.py.orig 2015-02-06 09:58:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ siputils.py 2015-02-25 21:58:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -297,7 +297,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- siputils.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ siputils.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -298,7 +298,7 @@
</span> # These require special handling as they are (potentially) a set of
# space separated values rather than a single value that might
# contain spaces.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> val = val.split()
# We also want to treat lists of libraries in the same way so that
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -614,6 +614,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -615,6 +615,16 @@
</span> libdir.extend(libdir_qt)
rpaths.extend(libdir_qt)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@
</span> if qt_version >= 0x040000:
# Try and read QT_LIBINFIX from qconfig.pri.
qconfig = os.path.join(mkspecs, "qconfig.pri")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -749,7 +759,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -750,7 +760,7 @@
</span> if mod == "QAxContainer":
incdir.append(os.path.join(qtincdir[0], "ActiveQt"))
elif self._is_framework(mod):
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@
</span>
if mod == "QtAssistant" and qt_version < 0x040202:
mod = "QtAssistantClient"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -835,7 +845,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -836,7 +846,7 @@
</span> def _is_framework(self, mod):
"""Return true if the given Qt module is a framework.
"""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,7 @@
</span>
def _qt_module_to_lib(self, mname):
"""Return the name of the Qt library corresponding to a module.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -963,7 +973,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -964,7 +974,7 @@
</span> if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
prl_name = os.path.join(self.config.qt_lib_dir, clib + ".prl")
elif sys.platform == "darwin" and framework:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@
</span> else:
prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib + ".prl")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2506,6 +2516,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2510,6 +2520,40 @@
</span> lhs = line[:assstart].strip()
rhs = line[assend + 1:].strip()
</pre><pre style='margin:0'>
</pre>