<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/60c75e32b69a155ec8de92b2e5f3266b218ae4fe">https://github.com/macports/macports-ports/commit/60c75e32b69a155ec8de92b2e5f3266b218ae4fe</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 60c75e3  py*-sip: update to 4.19, which provides SIP API 12.0 & thus requires dependent ports to be rev-bumped. This new API changes internal struct variable names, and the transition isn't entirely complete even though there's a new release ... so add in a temporary patch to fix the major variable name change from 'type' to 'wt_td' in the generated SIP code.
</span>60c75e3 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 60c75e32b69a155ec8de92b2e5f3266b218ae4fe
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Dec 30 21:20:29 2016 -0500

<span style='display:block; white-space:pre;color:#404040;'>    py*-sip: update to 4.19, which provides SIP API 12.0 & thus requires dependent ports to be rev-bumped. This new API changes internal struct variable names, and the transition isn't entirely complete even though there's a new release ... so add in a temporary patch to fix the major variable name change from 'type' to 'wt_td' in the generated SIP code.
</span>---
 python/py-sip/Portfile                          | 10 ++++--
 python/py-sip/files/patch-configure.py.diff     |  2 +-
 python/py-sip/files/patch-sipgen_gencode.c.diff | 47 +++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 4 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 98ac9c9..48ea92e 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.18.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             4.19
</span> 
 # from siplib/sip.h.in:
 #
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,6 +31,7 @@ version             4.18.1
</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:#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;'>@@ -55,13 +56,16 @@ if {${name} ne ${subport}} {
</span>         distname        sip-${version}
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums           rmd160 adcbd5a87b375e1b357922b608db45862ccf37ea \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256 9bce7a2dbf7f105bf68ad1bab58eebc0ce33087ec40396da756463f086ffa290
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums           rmd160 260c814e0ed4aa5ea90a8ac1f9100e7b9452ae21 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256 014bf55f653e0d8bcc582705ef4fbd61e0859a36e959ab46d8fa060cdf0b5e27
</span> 
     patchfiles          patch-siputils.py.diff \
                         patch-specs_macx-g++.diff \
                         patch-configure.py.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # temporary patch to fix struct variable name generation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append   patch-sipgen_gencode.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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-configure.py.diff b/python/py-sip/files/patch-configure.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 572bb48..a108c47 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;'>-@@ -921,7 +921,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -922,7 +922,6 @@
</span>          raise
      except:
          sys.stderr.write(
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..522548a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-sip/files/patch-sipgen_gencode.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,47 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- sipgen/gencode.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ sipgen/gencode.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -716,7 +716,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "#define sipSaveSlot                 sipAPI_%s->api_save_slot\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "#define sipClearAnySlotReference    sipAPI_%s->api_clear_any_slot_reference\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "#define sipVisitSlot                sipAPI_%s->api_visit_slot\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-"#define sipWrappedTypeName(wt)      ((wt)->type->td_cname)\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++"#define sipWrappedTypeName(wt)      ((wt)->wt_td->td_cname)\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "#define sipDeprecated               sipAPI_%s->api_deprecated\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "#define sipGetReference             sipAPI_%s->api_get_reference\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "#define sipKeepReference            sipAPI_%s->api_keep_reference\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -768,19 +768,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "#define sipConvertToArray           sipAPI_%s->api_convert_to_array\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "#define sipConvertToTypedArray      sipAPI_%s->api_convert_to_typed_array\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "#define sipWrapper_Check(w)         PyObject_TypeCheck((w), sipAPI_%s->api_wrapper_type)\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-"#define sipGetWrapper(p, wt)        sipGetPyObject((p), (wt)->type)\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-"#define sipReleaseInstance(p, wt, s)    sipReleaseType((p), (wt)->type, (s))\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++"#define sipGetWrapper(p, wt)        sipGetPyObject((p), (wt)->wt_td)\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++"#define sipReleaseInstance(p, wt, s)    sipReleaseType((p), (wt)->wt_td, (s))\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "#define sipReleaseMappedType        sipReleaseType\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-"#define sipCanConvertToInstance(o, wt, f)   sipCanConvertToType((o), (wt)->type, (f))\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++"#define sipCanConvertToInstance(o, wt, f)   sipCanConvertToType((o), (wt)->wt_td, (f))\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "#define sipCanConvertToMappedType   sipCanConvertToType\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-"#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:#e0ffe0;'>++"#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:#e0ffe0;'>+ "#define sipConvertToMappedType      sipConvertToType\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-"#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:#e0ffe0;'>++"#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:#e0ffe0;'>+ "#define sipForceConvertToMappedType sipForceConvertToType\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-"#define sipConvertFromInstance(p, wt, t)    sipConvertFromType((p), (wt)->type, (t))\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++"#define sipConvertFromInstance(p, wt, t)    sipConvertFromType((p), (wt)->wt_td, (t))\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "#define sipConvertFromMappedType    sipConvertFromType\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "#define sipConvertFromNamedEnum(v, pt)  sipConvertFromEnum((v), ((sipEnumTypeObject *)(pt))->type)\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-"#define sipConvertFromNewInstance(p, wt, t) sipConvertFromNewType((p), (wt)->type, (t))\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++"#define sipConvertFromNewInstance(p, wt, t) sipConvertFromNewType((p), (wt)->wt_td, (t))\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         ,mname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         ,mname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         ,mname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2885,7 +2885,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if (needs_sipClass)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             prcode(fp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-"    return (sipClass ? sipClass->type : 0);\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++"    return (sipClass ? sipClass->wt_td : 0);\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "}\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         else
</span></pre><pre style='margin:0'>

</pre>