<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ca248a487474dc259f29d489aa9463ea56b2c6a9">https://github.com/macports/macports-ports/commit/ca248a487474dc259f29d489aa9463ea56b2c6a9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ca248a487474dc259f29d489aa9463ea56b2c6a9
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Tue Aug 24 10:14:16 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-sip: provide PY3 subports and update to 6.1.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - pin to 5.5.0 for PY35
</span>---
python/py-sip/Portfile | 171 ++++++-------------------
python/py-sip/files/patch-add_ppc64.diff | 11 --
python/py-sip/files/patch-configure.py.diff | 11 --
python/py-sip/files/patch-siplib_siplib.c.diff | 11 --
python/py-sip/files/patch-siputils.py.diff | 96 --------------
python/py-sip/files/patch-specs_macx-g++.diff | 28 ----
6 files changed, 36 insertions(+), 292 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 372aa1061a4..329cac5c8a2 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;'>@@ -4,145 +4,57 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-sip
<span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories-append devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {michaelld @michaelld} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span> license {GPL-2 GPL-3 PSF}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms macosx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description create Python bindings for C and C++ libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SIP is a tool that makes it very easy to create \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Python bindings for C and C++ libraries. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- It was originally developed to create PyQt, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the Python bindings for the Qt toolkit, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- but can be used to create bindings for any \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- C or C++ library.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.riverbankcomputing.com/software/sip/intro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {michaelld @michaelld} {reneeotten @reneeotten} openmaintainer
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.19.25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description A Python bindings generator for C/C++ libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description SIP is a tool that makes it very easy to create \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Python bindings for C and C++ libraries. It was \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ originally developed to create PyQt, the Python \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bindings for the Qt toolkit, but can be used to \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ create bindings for any C or C++ library.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# 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:#ffe0e0;'>-# configuration errors in py*-qscitilla-qt5 and py*-pyqt4, and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# possibly others. See also: https://trac.macports.org/ticket/56746 .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-epoch 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.riverbankcomputing.com/software/sip/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# from siplib/sip.h[.in]:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Define the current API version number. SIP must handle modules with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the same major number and with the same or earlier minor number.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Whenever data structure elements are added they must be appended and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the minor number incremented. Whenever data structure elements are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# removed or the order changed then the major number must be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# incremented and the minor number set to 0.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# SIP 4.19.[19-25] provides SIP API 12.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# SIP 4.19.[14-18] provides SIP API 12.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# SIP 4.19.[12-13] provides SIP API 12.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# SIP 4.19.[9-11] do not work with MacPorts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -> see the "epoch" note above for more info
</span><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:#ffe0e0;'>-# SIP 4.19.[4-7] provides SIP API 12.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# SIP 4.19.3 provides SIP API 12.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# SIP 4.19.[1-2] provides SIP API 12.1
</span><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:#ffe0e0;'>-# SIP 4.18.[0-1] provides SIP API 11.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# SIP 4.17.0 provides SIP API 11.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# SIP 4.16.[8-9] provides SIP API 11.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -> BUT: the change is to the private API, not the public one.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -> SO: no rev-bumps are be needed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# SIP 4.16.[1-7] provides SIP API 11.1.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# SIP 4.15.5 provided SIP API 11.0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9379cc96aa6a2672e3ad632d2dca92dbe60dcd60 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1441692
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 35 36 37 38 39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 35 36 37 38 39
</span>
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites https://www.riverbankcomputing.com/static/Downloads/sip/${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set patch [lindex [split ${version} .] 2]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${patch} == 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname sip-${branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname sip-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts py${python.version}-sip4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} == 35} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 5.5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 fe56e4f7617fcc8aad3c63e10b19996f58ba44dc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5d024c419b30fea8a6de8c71a560c7ab0bc3c221fbfb14d55a5b865bd58eaac5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1108126
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 9709eda79d7e0a73eca82e25cbbfd0af6da074c8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b39d93e937647807bac23579edbff25fe46d16213f708370072574ab1f1b4211 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1056384
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-siputils.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-specs_macx-g++.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-add_ppc64.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-packaging \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-toml
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- use_configure yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ensure correct compilers are used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@CC@|${configure.cc}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/specs/macx-g++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@CXX@|${configure.cxx}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/specs/macx-g++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cmd ${python.bin} configure.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args -b ${python.prefix}/bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -d ${python.pkgd} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -e ${python.include} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -v ${python.prefix}/share/sip \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -p macx-g++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # always add some arch flags, since the user might have overridden
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the default arch build (e.g., ticket #44086).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.add_archflags no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} < 38} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-importlib-metadata
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append "--arch=${arch}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.post_args LFLAGS="-F${frameworks_dir} -L${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${configure.universal_ldflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.post_args-append CFLAGS="${configure.universal_cflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.post_args-append CXXFLAGS="${configure.universal_cxxflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append "--arch=${configure.build_arch}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.post_args LFLAGS="-F${frameworks_dir} -L${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${configure.ld_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.post_args-append CFLAGS="${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.post_args-append CXXFLAGS="${configure.cxx_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.sdkroot} eq ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set configure.sdkroot "/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --sdk=${configure.sdkroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.cmd make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test.cmd cd siplib && ${python.bin} -c 'import sip'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.cmd make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.destdir DESTDIR=${destroot}
</span>
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/share/doc
</span> file copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/${subport}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} LICENSE LICENSE-GPL2 LICENSE-GPL3 NEWS README \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} LICENSE LICENSE-GPL2 LICENSE-GPL3 NEWS README ChangeLog \
</span> ${destroot}${prefix}/share/doc/${subport}
system "${python.bin} ${python.libdir}/compileall.py ${destroot}${prefix}"
system "${python.bin} -O ${python.libdir}/compileall.py ${destroot}${prefix}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,16 +66,5 @@ if {${name} ne ${subport}} {
</span> GPL-2 or GPL-3 licenses are also available. For details see
${prefix}/share/doc/${subport}/LICENSE \[-GPL2 -GPL3\]\n\n"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string last devel ${subport}] != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url https://www.riverbankcomputing.com/software/sip/download
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex sip-(4(\\.\\d+)+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span> }
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 89287508dc2..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -788,7 +788,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g = optparse.OptionGroup(p, title="MacOS X Configuration")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g.add_option("--arch", action="append", default=[], dest="arch",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- choices=["i386", "x86_64", "ppc"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ choices=["i386", "x86_64", "ppc", "ppc64", "arm64"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- help="build for architecture ARCH")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g.add_option("--deployment-target", action="store", default='',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- metavar="VERSION", dest="deployment_target",
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8ed3b5b8f3a..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1046,7 +1046,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- raise
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.stderr.write(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"""An internal error occured. Please report all the output from the program,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--including the following traceback, to support@riverbankcomputing.com.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"""An internal error occured. Please follow the instructions provided by MacPorts < http://www.macports.org > to report this issue. Please do not report this issue to Riverbank Computing until MacPorts developers have determined that it is appropriate to do so.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- raise
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-sip/files/patch-siplib_siplib.c.diff b/python/py-sip/files/patch-siplib_siplib.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3784d9557b3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-sip/files/patch-siplib_siplib.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,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- siplib/siplib.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ siplib/siplib.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13073,7 +13073,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name_str = _PyUnicode_AsString(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* We don't handle Unicode names. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!PyStringCheck(name))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!PyString_Check(name))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyErr_Format(PyExc_TypeError,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "attribute name must be string, not '%.200s'",
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 073f4d8a5b2..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,96 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- siputils.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ siputils.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -298,7 +298,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # These require special handling as they are (potentially) a set of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # space separated values rather than a single value that might
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # contain spaces.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if m in ("DEFINES", "CONFIG") or m[:6] in ("INCDIR", "LIBDIR"):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if m in ("DEFINES", "CONFIG") or m[:6] in ("INCDIR", "LIBDIR") or m[:12] in ("FRAMEWORKDIR"):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- val = val.split()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We also want to treat lists of libraries in the same way so that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -615,6 +615,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libdir.extend(libdir_qt)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rpaths.extend(libdir_qt)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # projects using SIP may not define FRAMEWORKDIR_QT as a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # configuration option, so try to retrieve it and fallback
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # as necessary to a reasonable default for MacPorts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ frameworkdir_qt = self.optional_list("FRAMEWORKDIR_QT")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ except:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ frameworkdir_qt = self.config.qt_dir + "/Library/Frameworks"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ libdir.extend(frameworkdir_qt)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rpaths.extend(frameworkdir_qt)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if qt_version >= 0x040000:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Try and read QT_LIBINFIX from qconfig.pri.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qconfig = os.path.join(mkspecs, "qconfig.pri")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -750,7 +760,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if mod == "QAxContainer":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- incdir.append(os.path.join(qtincdir[0], "ActiveQt"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif self._is_framework(mod):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- idir = libdir_qt[0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ idir = frameworkdir_qt[0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if mod == "QtAssistant" and qt_version < 0x040202:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mod = "QtAssistantClient"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -836,7 +846,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def _is_framework(self, mod):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """Return true if the given Qt module is a framework.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return (self.config.qt_framework and (self.config.qt_version >= 0x040200 or mod != "QtAssistant"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (self.config.qt_framework and (self.config.qt_version >= 0x040200 or mod != "QtAssistant") and (mod != "phonon"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def _qt_module_to_lib(self, mname):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """Return the name of the Qt library corresponding to a module.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -964,7 +974,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prl_name = os.path.join(self.config.qt_lib_dir, clib + ".prl")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif sys.platform == "darwin" and framework:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- prl_name = os.path.join(self.config.qt_lib_dir, clib + ".framework", clib + ".prl")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ prl_name = os.path.join(self.config.qt_framework_dir, clib + ".framework", clib + ".prl")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib + ".prl")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2510,6 +2520,40 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lhs = line[:assstart].strip()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rhs = line[assend + 1:].strip()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# print "lhs is", lhs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# print "rhs is", rhs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # check for X = foo $$X (like += but prepending)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s_start = rhs.find(lhs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if s_start != -1:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# print "maybe found substr"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s_pre_s = s_start
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while s_pre_s >= 0 and rhs[s_pre_s] not in string.whitespace:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s_pre_s -= 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s_pre_s += 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s_pre_str = rhs[s_pre_s:s_start]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s_end = s_start
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while s_end < len(rhs) and rhs[s_end] not in string.whitespace:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s_end += 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s_str = rhs[s_start:s_end]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# print "before: s_str =", s_str
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# print "befire: s_pre_str =", s_pre_str
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if s_pre_str.find("$$") == 0:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # $$ something, maybe; find that something
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if len(s_pre_str) == 3:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# print "looking for brackets at end"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # verify termination is a bracket type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if s_str[len(s_str)-1] in "}]":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s_str = s_str[:(len(s_str)-1)]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# print "s_str is", s_str
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if len(s_str) == len(lhs):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# print "found match"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # make sure 'lhs' is already in 'raw'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ orig_rhs = raw.get(lhs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if orig_rhs is not None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rhs = rhs[:s_pre_s] + orig_rhs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# print "new rhs is", rhs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove the escapes for any quotes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rhs = rhs.replace(r'\"', '"').replace(r"\'", "'")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-sip/files/patch-specs_macx-g++.diff b/python/py-sip/files/patch-specs_macx-g++.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index acd3c43843c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-sip/files/patch-specs_macx-g++.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- specs/macx-g++.orig 2012-08-16 14:56:34.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ specs/macx-g++ 2012-08-16 14:59:56.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,7 +11,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_INCREMENTAL_STYLE = sublibs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_CC = cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_CC = @CC@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_LEX = flex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_LEXFLAGS =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_YACC = yacc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,7 +33,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CFLAGS_PPC = -arch ppc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CFLAGS_X86 = -arch i386
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_CXX = c++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_CXX = @CXX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,6 +49,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_LIBDIR =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_FRAMEWORKDIR_QT = $$[QT_INSTALL_FRAMEWORKS]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /System/Library/Frameworks/AGL.framework/Headers/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>