<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/25e7a9d501e842d07c557e1f5adce977d7bbc306">https://github.com/macports/macports-ports/commit/25e7a9d501e842d07c557e1f5adce977d7bbc306</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 25e7a9d py*-sip: update to 4.19.1; remove integrated patch.
</span>25e7a9d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 25e7a9d501e842d07c557e1f5adce977d7bbc306
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Feb 16 11:04:09 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> py*-sip: update to 4.19.1; remove integrated patch.
</span>---
python/py-sip/Portfile | 12 +++----
python/py-sip/files/patch-sipgen_gencode.c.diff | 47 -------------------------
2 files changed, 5 insertions(+), 54 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 48ea92e..92dd91c 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 http://www.riverbankcomputing.co.uk/software/sip/intro
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.19.1
</span>
# from siplib/sip.h.in:
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,8 @@ version 4.19
</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[.0] provides SIP API 12.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# SIP 4.19.1 provides SIP API 12.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# SIP 4.19.0 provides SIP API 12.0
</span> # SIP 4.18.[0-1] provides SIP API 11.3
# SIP 4.17.0 provides SIP API 11.2
# SIP 4.16.[8-9] provides SIP API 11.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,16 +57,13 @@ if {${name} ne ${subport}} {
</span> distname sip-${version}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 260c814e0ed4aa5ea90a8ac1f9100e7b9452ae21 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 014bf55f653e0d8bcc582705ef4fbd61e0859a36e959ab46d8fa060cdf0b5e27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 007bd447c1baab2874999e2fc9783d7464425573 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 501852b8325349031b769d1c03d6eab04f7b9b97f790ec79f3d3d04bf065d83e
</span>
patchfiles patch-siputils.py.diff \
patch-specs_macx-g++.diff \
patch-configure.py.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to fix struct variable name generation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-sipgen_gencode.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_configure yes
pre-configure {
# Ensure correct compilers are used
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-sip/files/patch-sipgen_gencode.c.diff b/python/py-sip/files/patch-sipgen_gencode.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 522548a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-sip/files/patch-sipgen_gencode.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,47 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- sipgen/gencode.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ sipgen/gencode.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -716,7 +716,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "#define sipSaveSlot sipAPI_%s->api_save_slot\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "#define sipClearAnySlotReference sipAPI_%s->api_clear_any_slot_reference\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "#define sipVisitSlot sipAPI_%s->api_visit_slot\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"#define sipWrappedTypeName(wt) ((wt)->type->td_cname)\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"#define sipWrappedTypeName(wt) ((wt)->wt_td->td_cname)\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "#define sipDeprecated sipAPI_%s->api_deprecated\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "#define sipGetReference sipAPI_%s->api_get_reference\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "#define sipKeepReference sipAPI_%s->api_keep_reference\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -768,19 +768,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "#define sipConvertToArray sipAPI_%s->api_convert_to_array\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "#define sipConvertToTypedArray sipAPI_%s->api_convert_to_typed_array\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "#define sipWrapper_Check(w) PyObject_TypeCheck((w), sipAPI_%s->api_wrapper_type)\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"#define sipGetWrapper(p, wt) sipGetPyObject((p), (wt)->type)\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"#define sipReleaseInstance(p, wt, s) sipReleaseType((p), (wt)->type, (s))\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"#define sipGetWrapper(p, wt) sipGetPyObject((p), (wt)->wt_td)\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"#define sipReleaseInstance(p, wt, s) sipReleaseType((p), (wt)->wt_td, (s))\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "#define sipReleaseMappedType sipReleaseType\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"#define sipCanConvertToInstance(o, wt, f) sipCanConvertToType((o), (wt)->type, (f))\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"#define sipCanConvertToInstance(o, wt, f) sipCanConvertToType((o), (wt)->wt_td, (f))\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "#define sipCanConvertToMappedType sipCanConvertToType\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"#define sipConvertToInstance(o, wt, t, f, s, e) sipConvertToType((o), (wt)->type, (t), (f), (s), (e))\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"#define sipConvertToInstance(o, wt, t, f, s, e) sipConvertToType((o), (wt)->wt_td, (t), (f), (s), (e))\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "#define sipConvertToMappedType sipConvertToType\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"#define sipForceConvertToInstance(o, wt, t, f, s, e) sipForceConvertToType((o), (wt)->type, (t), (f), (s), (e))\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"#define sipForceConvertToInstance(o, wt, t, f, s, e) sipForceConvertToType((o), (wt)->wt_td, (t), (f), (s), (e))\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "#define sipForceConvertToMappedType sipForceConvertToType\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"#define sipConvertFromInstance(p, wt, t) sipConvertFromType((p), (wt)->type, (t))\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"#define sipConvertFromInstance(p, wt, t) sipConvertFromType((p), (wt)->wt_td, (t))\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "#define sipConvertFromMappedType sipConvertFromType\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "#define sipConvertFromNamedEnum(v, pt) sipConvertFromEnum((v), ((sipEnumTypeObject *)(pt))->type)\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"#define sipConvertFromNewInstance(p, wt, t) sipConvertFromNewType((p), (wt)->type, (t))\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"#define sipConvertFromNewInstance(p, wt, t) sipConvertFromNewType((p), (wt)->wt_td, (t))\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ,mname
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ,mname
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ,mname
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2885,7 +2885,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (needs_sipClass)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prcode(fp,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--" return (sipClass ? sipClass->type : 0);\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+" return (sipClass ? sipClass->wt_td : 0);\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "}\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span></pre><pre style='margin:0'>
</pre>