<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/e78f034a3063d65ca2b2849b85c7f1e718436b08">https://github.com/macports/macports-ports/commit/e78f034a3063d65ca2b2849b85c7f1e718436b08</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e78f034a3063d65ca2b2849b85c7f1e718436b08
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sun Sep 5 12:03:03 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-pyqt5: switch to upstream's build system with recent SIP
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - assume maintainership
</span>---
python/py-pyqt5/Portfile | 221 ++++++---------------
python/py-pyqt5/files/patch-dbus_includes.diff | 11 -
.../files/patch-no-abort-on-python-errors.diff | 41 ----
python/py-pyqt5/files/patch-project.py.diff | 16 ++
python/py-pyqt5/files/patch-use-default-sip.diff | 36 ----
5 files changed, 78 insertions(+), 247 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyqt5/Portfile b/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c382d16002..c35022616a9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,185 +1,88 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup python 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name py-pyqt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.rootname PyQt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories-append devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description PyQt5 is a set of Python bindings for the Qt5 toolkit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}. The bindings \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- are implemented as a set of Python modules and contain over 620 classes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.riverbankcomputing.com/software/pyqt/intro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set just_want_qt5_version_info yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-unset just_want_qt5_version_info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup python 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name py-pyqt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.rootname PyQt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.15.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories-append devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {reneeotten @reneeotten} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description PyQt5 is a set of Python bindings for the Qt5 toolkit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${description}. The bindings are implemented as a set of Python modules and contain over 620 classes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.riverbankcomputing.com/software/pyqt/intro
</span>
if {[vercmp ${qt5.version} 5.11] < 0} {
# https://trac.macports.org/ticket/61006
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.14.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 9f4672ff0a2165a7557216ac3a14fadbb9db9375 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bd230c6fd699eabf1ceb51e13a8b79b74c00a80272c622427b80141a22269eb0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3246557
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # we the next bump check --allow-sip-warnings if needed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.15.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 c0f93412d4010e5e0d8e14e61af9579b66065bb4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2a69597e0dd11caabe75fae133feca66387819fc9bc050f547e5551bce97e5be \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3258085
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 5.14.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 9f4672ff0a2165a7557216ac3a14fadbb9db9375 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bd230c6fd699eabf1ceb51e13a8b79b74c00a80272c622427b80141a22269eb0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3246557
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 35 36 37 38 39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport "${name}-common" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c0f93412d4010e5e0d8e14e61af9579b66065bb4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2a69597e0dd11caabe75fae133feca66387819fc9bc050f547e5551bce97e5be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3258085
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach py_ver ${python.versions} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subport "py${py_ver}-pyqt5-webengine" {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subport "py${py_ver}-pyqt5-chart" {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 35 36 37 38 39
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq "${name}-common"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description-append (.sip sourcefiles)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description-append This port contains the .sip source files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 -d ${destroot}${prefix}/share/sip/PyQt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # copy all relevant directories from ${worksrcpath}/sip into the destination.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This is exactly what the regular build system does, except that here we
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # use the same location as used on Linux, not the one hidden in the Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # framework that is apparently the default on Mac.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy {*}[glob -directory ${worksrcpath}/sip/ Q*] ${destroot}${prefix}/share/sip/PyQt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/sip/Enginio ${destroot}${prefix}/share/sip/PyQt5
</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;'>-} elseif {[string first "webengine" ${subport}] != -1 || [string first "chart" ${subport}] != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${name} ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-project.py.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-pyqt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_configure yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args
</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;'>- qt5.spec_cmd --spec=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -q ${qt_qmake_cmd} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --verbose \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --sip=${prefix}/bin/sip-${python.branch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --no-qsci-api \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --no-dist-info
</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;'>- destroot.cmd ${build.cmd}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.destdir DESTDIR=${destroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string first "webengine" ${subport}] != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.rootname PyQtWebEngine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.15.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description PyQt5 Webengine bindings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 2e073104865646c9c5e2afaa9c839e23ce392385 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cedc28f54165f4b8067652145aec7f732a17eadf6736835852868cf76119cc19 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 49022
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.depends_component \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qtwebengine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[string first "chart" ${subport}] != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.rootname PyQtChart
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.15.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description PyQt5 Charts bindings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 d6177d643f23faeb557d17e0d6b77941d8d67a40 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e47750632851e105eabc27fdfa8180989d120b822181e512f6643b3c5c4d8074 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 69252
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.depends_component \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qtcharts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PYVER@|${python.version}|g" ${worksrcpath}/project.py
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${name} ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # pull in the Qt5 meta-port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> qt5.depends_component \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qtscript \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt3d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-sip4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:dbus-python${python.version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} == 27} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py27-enum34
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtscript \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt3d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- use_configure yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args
</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;'>- qt5.spec_cmd --spec=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -q ${qt_qmake_cmd} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --verbose \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --confirm-license \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --sip=${prefix}/bin/sip-${python.branch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --dbus=${python.include}/dbus-1.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --designer-plugindir=${qt_plugins_dir}/designer/Py${python.version}Qt5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --qml-plugindir=${qt_plugins_dir}/Py${python.version}Qt5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --no-qsci-api \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable=QtWebKit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable=QtWebKitWidgets \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --no-dist-info \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --allow-sip-warnings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # using --dbus means the compiler will find dbus-python.h but not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the DBus headers themselves
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # do not clear include directories just because --dbus is given
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-dbus_includes.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # PyQt5 insists on using a private copy of sip, but the default sip seems to work just fine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (actually, the insistence appears to be on sip using a private module directory;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see the online pyqt5 build-from-source instructions).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-use-default-sip.diff
</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;'>- destroot.cmd ${build.cmd}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.destdir DESTDIR=${destroot}
</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}-pyqt-builder
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant debug description "Build debug libraries" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cmd-append --debug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:dbus-python${python.version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyqt5-sip
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant scintilla description {Build the PyQt API for QScintilla} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:qscintilla-qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --no-qsci-api \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --qsci-api
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # move the Qsci API file to a Python specific name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # it is generated during the configure step and differs only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (and slightly) for python 2.x vs. python 3.x .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Figure out a way to install only a single copy...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${qt_data_dir}/qsci/api/python/PyQt5.api \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${qt_data_dir}/qsci/api/python/PyQt5-Python${python.branch}.api
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --qmake ${qt_qmake_cmd} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --verbose \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --confirm-license \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --dbus=${python.include}/dbus-1.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable QtWebKit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable QtWebKitWidgets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.cmd sip-build-${python.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|sip-distinfo|sip-distinfo-${python.branch}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${build.dir}/build/Makefile
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.cmd make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.dir ${build.dir}/build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant webkit description {Build QtWebKit module} {
qt5.depends_component qtwebkit
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable=QtWebKit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-delete --disable=QtWebKit \
</span> --disable=QtWebKitWidgets
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant graceful description {Don't abort (crash) on Python errors} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-no-abort-on-python-errors.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant debug description "Build debug libraries" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.cmd-append --debug
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyqt5/files/patch-dbus_includes.diff b/python/py-pyqt5/files/patch-dbus_includes.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0e63ed33916..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyqt5/files/patch-dbus_includes.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 2021-03-05 04:57:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.py 2021-03-18 22:13:16.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2314,7 +2314,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Instead we look where DBus itself is installed - which in most cases will
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # be where dbus-python is also installed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if target_config.pydbus_inc_dir != '':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- target_config.dbus_inc_dirs = [target_config.pydbus_inc_dir]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_config.dbus_inc_dirs.append(target_config.pydbus_inc_dir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for d in target_config.dbus_inc_dirs:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if os.access(os.path.join(d, 'dbus', 'dbus-python.h'), os.F_OK):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyqt5/files/patch-no-abort-on-python-errors.diff b/python/py-pyqt5/files/patch-no-abort-on-python-errors.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e20f6322b7b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyqt5/files/patch-no-abort-on-python-errors.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,41 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- qpy/QtCore/qpycore_public_api.cpp.orig 2020-05-31 08:10:54.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ qpy/QtCore/qpycore_public_api.cpp 2020-06-11 19:43:03.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,7 +79,7 @@
</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;'>--// A replacement for PyErr_Print() that passes the exception to qFatal().
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// A replacement for PyErr_Print() that passes the exception to qCritical().
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void pyqt5_err_print()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if PY_MAJOR_VERSION >= 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -175,7 +175,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyErr_Restore(exception, value, traceback);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyErr_Print();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // This will be passed to qFatal() if we can't get the detailed text.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // This will be passed to qCritical() if we can't get the detailed text.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QByteArray message("Unhandled Python exception");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Extract the detailed text if it was redirected.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -191,7 +191,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (text)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // Strip the text as qFatal() likes to add a newline.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Strip the text as qCritical() likes to add a newline.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *stripped = PyObject_CallMethod(text,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONST_CAST("strip"), NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -249,9 +249,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_DECREF(new_stderr);
</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;'>-- // qFatal() may not call abort.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // qCritical() will not call abort.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_BEGIN_ALLOW_THREADS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- qFatal("%s", message.data());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ qCritical("%s", message.data());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_END_ALLOW_THREADS
</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;color:#808080;'>diff --git a/python/py-pyqt5/files/patch-project.py.diff b/python/py-pyqt5/files/patch-project.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4dc413b4395
</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-pyqt5/files/patch-project.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- project.py.orig 2021-09-20 16:05:20.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ project.py 2021-09-20 16:14:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -210,11 +210,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if tool in ('build', 'install'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if self.designer_plugin and 'QtDesigner' in self.bindings:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self._add_plugin('designer', "Qt Designer", 'pyqt5',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'designer', others_debug)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'designer/Py@PYVER@Qt5', others_debug)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if self.qml_plugin and 'QtQml' in self.bindings:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self._add_plugin('qmlscene', "qmlscene", 'pyqt5qmlplugin',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'PyQt5', others_debug)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'Py@PYVER@Qt5', others_debug)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add the dbus-python support.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if self.dbus_python:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyqt5/files/patch-use-default-sip.diff b/python/py-pyqt5/files/patch-use-default-sip.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 998e33e7d59..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyqt5/files/patch-use-default-sip.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.py.orig 2021-03-18 22:08:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.py 2021-03-18 22:08:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2490,7 +2490,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the target configuration.
</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;'>-- sip_flags = ['-n', 'PyQt5.sip']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sip_flags = ['-n', 'sip']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If we don't check for signed interpreters, we exclude the 'VendorID'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # feature
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- designer/pluginloader.cpp.orig 2021-03-05 04:57:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ designer/pluginloader.cpp 2021-03-18 22:08:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -169,7 +169,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Make sure we have sip.unwrapinstance.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!sip_unwrapinstance)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sip_unwrapinstance = getModuleAttr("PyQt5.sip", "unwrapinstance");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sip_unwrapinstance = getModuleAttr("sip", "unwrapinstance");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!sip_unwrapinstance)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- qmlscene/pluginloader.cpp.orig 2021-03-05 04:57:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ qmlscene/pluginloader.cpp 2021-03-18 22:08:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -414,9 +414,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void PyQt5QmlPlugin::getSipAPI()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(SIP_USE_PYCAPSULE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sip = (const sipAPIDef *)PyCapsule_Import("PyQt5.sip._C_API", 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sip = (const sipAPIDef *)PyCapsule_Import("sip._C_API", 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PyObject *c_api = getModuleAttr("PyQt5.sip", "_C_API");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyObject *c_api = getModuleAttr("sip", "_C_API");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (c_api)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span></pre><pre style='margin:0'>
</pre>