<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/d994dc3010dc47777db3765f7b68e6a5425b639d">https://github.com/macports/macports-ports/commit/d994dc3010dc47777db3765f7b68e6a5425b639d</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 d994dc3 py*-sip: revert to 4.19.8
</span>d994dc3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d994dc3010dc47777db3765f7b68e6a5425b639d
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Jun 29 15:16:21 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> py*-sip: revert to 4.19.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> ... due to issues building py*-Qsci-qt* and PyQt*.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> should address: https://trac.macports.org/ticket/56746
</span>---
python/py-sip/Portfile | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 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 942a551..55e2f0c 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,12 @@ long_description \
</span>
homepage https://www.riverbankcomputing.com/software/sip/intro
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.19.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.19.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# bumped the epoch to revert from 4.19.10 to 4.19.8. The former caused
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configuration errors in py*-qscitilla-qt5 and py*-pyqt4, and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# possibly others. See also: https://trac.macports.org/ticket/56746 .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 1
</span>
# from siplib/sip.h.in:
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +36,7 @@ version 4.19.10
</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-9] provides SIP API 12.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# SIP 4.19.[8-10] 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,16 +65,14 @@ if {${name} ne ${subport}} {
</span> distname sip-${version}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 2c028d9a8220a4365084836975a08921b1df7ebc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 31ac7d48be8fd2df5f3bdb712f66a7d9a858cc1f6cb35fc95d829e0a69c3dd48 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1032653
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 064948f2cd178191a00fd691f292a85b7360f2a5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7eaf7a2ea7d4d38a56dd6d2506574464bddf7cf284c960801679942377c297bc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1024548
</span>
patchfiles patch-siputils.py.diff \
patch-specs_macx-g++.diff \
patch-configure.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-add_ppc64.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-siplib_siplib.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-add_ppc64.diff
</span>
use_configure yes
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,8 +97,7 @@ 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:#ffe0e0;'>- --no-dist-info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --sipdir=${prefix}/share/${subport}
</span>
# always add some arch flags, since the user might have overridden
# the default arch build (e.g., ticket #44086).
</pre><pre style='margin:0'>
</pre>