<pre style='margin:0'>
Mark Moll (mamoll) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/363ab1ad713cd0e7c50669f084d045407ffcf5b5">https://github.com/macports/macports-ports/commit/363ab1ad713cd0e7c50669f084d045407ffcf5b5</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 363ab1a py-pyqt5 : reorganise and upgrade to 5.11.3
</span>363ab1a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 363ab1ad713cd0e7c50669f084d045407ffcf5b5
</span>Author: R.J.V. Bertin <rjvbertin@gmail.com>
AuthorDate: Tue Dec 18 22:46:15 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> py-pyqt5 : reorganise and upgrade to 5.11.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> PyQt5 is designed to build against any more or less recent Qt5 version;
</span><span style='display:block; white-space:pre;color:#404040;'> version 5.11.3 builds against Qt5 as old as 5.6.2 . It is thus not
</span><span style='display:block; white-space:pre;color:#404040;'> necessary to peg PyQt5 to an older version on older OS X versions (build
</span><span style='display:block; white-space:pre;color:#404040;'> failures should be reported upstream).
</span><span style='display:block; white-space:pre;color:#404040;'> The .sip files are completely independent from the Python version used
</span><span style='display:block; white-space:pre;color:#404040;'> and are thus better installed in a standard, central location rather than
</span><span style='display:block; white-space:pre;color:#404040;'> in the Python framework. The new py-pyqt5-common subport takes care of
</span><span style='display:block; white-space:pre;color:#404040;'> that. A symlink makes them available through the Python framework;
</span><span style='display:block; white-space:pre;color:#404040;'> another symlink makes them available through the default sip directory
</span><span style='display:block; white-space:pre;color:#404040;'> of the sip version we use (sipconfig.Configuration().default_sip_dir).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This reorganisation allows to simplify port:qgis3 and port:py-poppler-qt5
</span>---
gis/qgis3/Portfile | 8 +-
gis/qgis3/files/patch-FindPyQt5_py.diff | 11 ---
python/py-poppler-qt5/Portfile | 7 +-
python/py-poppler-qt5/files/patch-fix-qt-dirs.diff | 15 ---
python/py-pyqt5/Portfile | 102 +++++++++++++--------
python/py-pyqt5/files/patch-use-default-sip.diff | 47 ++++++----
6 files changed, 93 insertions(+), 97 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis3/Portfile b/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dedd89a..fc4943c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,19 +63,15 @@ depends_lib-append port:libiconv \
</span>
depends_build-append \
port:bison \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ld64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ld64
</span>
patchfiles patch-app_info_plist_in.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-CMakelists_txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-FindPyQt5_py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-CMakelists_txt.diff
</span>
post-patch {
reinplace -E "s|@PREFIX@|${prefix}|g" \
${worksrcpath}/mac/app.info.plist.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|@FRAMEWORKS_DIR@|${frameworks_dir}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/cmake/FindPyQt5.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Handle QGIS Fix #11399 which doesn’t seem to work anymore
reinplace -E "s|#ifdef Q_OS_MAC$|#if 0|" \
${worksrcpath}/src/app/layout/qgslayoutdesignerdialog.cpp
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis3/files/patch-FindPyQt5_py.diff b/gis/qgis3/files/patch-FindPyQt5_py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0dd8838..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis3/files/patch-FindPyQt5_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;'>---- cmake/FindPyQt5.py.orig 2018-02-23 06:09:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/FindPyQt5.py 2018-02-27 08:01:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import os.path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import sys
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cfg = sipconfig.Configuration()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sip_dir = cfg.default_sip_dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sip_dir = "@FRAMEWORKS_DIR@/Python.framework/Versions/@PYVERSION@/share/sip"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if sys.platform.startswith('freebsd'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- py_version = str(sys.version_info.major) + str(sys.version_info.minor)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sip_dir = sip_dir.replace(py_version, '')
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-poppler-qt5/Portfile b/python/py-poppler-qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 74d5949..ec9a4cd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-poppler-qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-poppler-qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,15 +41,12 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-pyqt5
patchfiles patch-fix-qtxml.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-qt-dirs.diff \
</span> patch-fix-cxx11.diff \
patch-fix-demo.diff \
patch-types.sip.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|%%QMAKE%%|${qt_qmake_cmd}|g" ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|%%PYQTSIPDIR%%|${python.prefix}/share/sip/PyQt5/|g" ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.pre_args build_ext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --qmake-bin=${qt_qmake_cmd}
</span>
post-destroot {
set doc_dir ${destroot}${prefix}/share/doc/${subport}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-poppler-qt5/files/patch-fix-qt-dirs.diff b/python/py-poppler-qt5/files/patch-fix-qt-dirs.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0142b61..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-poppler-qt5/files/patch-fix-qt-dirs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -137,10 +137,10 @@ class build_ext(build_ext_base):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build_ext_base.initialize_options(self)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.poppler_version = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.qmake_bin = 'qmake'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ self.qmake_bin = '%%QMAKE%%'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.qt_include_dir = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.pyqt_sip_dir = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ self.pyqt_sip_dir = '%%PYQTSIPDIR%%'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.pyqt_sip_flags = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def finalize_options (self):
</span><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 ad9e994..6d7310f 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;'>@@ -4,8 +4,7 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-pyqt5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.11.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.11.3
</span> categories-append devel
platforms darwin
maintainers {mmoll @mamoll} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,23 +15,31 @@ homepage http://www.riverbankcomputing.co.uk/software/pyqt/intro
</span> license GPL-3
master_sites sourceforge:pyqt
distname PyQt5_gpl-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 efe3ecc837b7a21cd0afeaa49554de22e564cf5f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7caa581155c3433716b7e6aba71fe1378cd7d92f4155c266d60e5cffb64e9603 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3119615
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 01f76afac6ddc9267dda3a0510795b8d2df57247 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c9b57d15601d436faf35dacf8e0acefa220194829a653e771e80b189b3261073 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3121036
</span>
python.versions 27 34 35 36 37
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} <= 14 && ${os.platform} eq "darwin"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.9.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname PyQt5_gpl-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 744f54000240c25ce2b39dbe62f5b3d2afd83e8b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c190dac598c97b0113ca5e7a37c71c623f02d1d713088addfacac4acfa4b8394 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3102848
</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 {${name} ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport "${name}-common" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "${name}-common"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description-append (.sip sourcefiles)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description-append This port contains the .sip source files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/share/sip/PyQt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # copy all relevant directories from ${worksrcpath}/sip into the destination.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This is exactly what the regular build system does, except that here we
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use the same location as used on Linux, not the one hidden in the Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # framework that is apparently the default on Mac.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy {*}[glob -directory ${worksrcpath}/sip/ Q*] ${destroot}${prefix}/share/sip/PyQt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/sip/Enginio ${destroot}${prefix}/share/sip/PyQt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${name} ne ${subport}} {
</span> PortGroup qmake5 1.0
# pull in the Qt5 meta-port
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +54,11 @@ if {${name} ne ${subport}} {
</span> depends_lib-append port:py27-enum34
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # declare a runtime, arch-independent dependency on ${name}-common
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:${name}-common
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_skip_archcheck-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${name}-common
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure yes
configure.pre_args
configure.cmd "${python.bin} configure.py"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +72,7 @@ if {${name} ne ${subport}} {
</span> --designer-plugindir=${qt_plugins_dir}/designer/Py${python.version}Qt5 \
--qml-plugindir=${qt_plugins_dir}/Py${python.version}Qt5 \
--no-qsci-api \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --no-sip-files \
</span> --disable=QtWebKit \
--disable=QtWebKitWidgets \
--disable=QtWebEngine \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,56 +83,65 @@ if {${name} ne ${subport}} {
</span> # using --dbus means the compiler will find dbus-python.h but not
# the DBus headers themselves
# do not clear include directories just because --dbus is given
<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;'>- # only use patch on current version, not the pegged version for older versions of macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} > 14 || ${os.platform} ne "darwin"} {
</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;'>- 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:#e0ffe0;'>+ patchfiles-append patch-dbus_includes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 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:#e0ffe0;'>+ # (actually, the insistance appears to be on sip using a private module directory;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see the online pyqt5 build-from-source instructions).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-use-default-sip.diff
</span>
build.cmd make
build.target all
destroot.cmd ${build.cmd}
destroot.destdir DESTDIR=${destroot}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make the .sip files accessible via the "normal" path too
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}${python.prefix}/share/sip/PyQt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${python.prefix}/share/sip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/share/sip/PyQt5 ${destroot}${python.prefix}/share/sip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # as well as via the actual sip repository of the version we're using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/share/py${python.version}-sip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ../sip/PyQt5 ${destroot}${prefix}/share/py${python.version}-sip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant debug description "Build debug libraries" {
configure.cmd-append --debug
}
variant scintilla description {Build the PyQt API for QScintilla} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qscintilla-qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --no-qsci-api \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --qsci-api
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:qscintilla-qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --no-qsci-api \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --qsci-api
</span>
post-destroot {
# move the Qsci API file to a Python specific name
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # it is generated during the configure step and differs only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (and slightly) for python 2.x vs. python 3.x .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Figure out a way to install only a single copy...
</span> move ${destroot}${qt_data_dir}/qsci/api/python/PyQt5.api \
${destroot}${qt_data_dir}/qsci/api/python/PyQt5-Python${python.branch}.api
}
}
variant webengine conflicts universal description {Build QtWebEngine module} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.depends_component qtwebengine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable=QtWebEngine \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable=QtWebEngineCore \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable=QtWebEngineWidgets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_component qtwebengine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable=QtWebEngine \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable=QtWebEngineCore \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable=QtWebEngineWidgets
</span> }
variant webkit description {Build QtWebKit module} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.depends_component qtwebkit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable=QtWebKit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable=QtWebKitWidgets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_component qtwebkit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable=QtWebKit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable=QtWebKitWidgets
</span> }
variant graceful description {Don't abort (crash) on Python errors} {
<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;'>+ patchfiles-append patch-no-abort-on-python-errors.diff
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</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 http://pyqt.sourceforge.net/Docs/PyQt5/introduction.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex PyQt5 (5.\[0-9\]+(.\[0-9\]+)?)
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url http://www.riverbankcomputing.co.uk/software/pyqt/download5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex >PyQt5_gpl-(\[0-9.\]*).tar.gz<
</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><span style='display:block; white-space:pre;color:#808080;'>index 250d635..14db625 100644
</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;'>+++ b/python/py-pyqt5/files/patch-use-default-sip.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.py.orig 2018-08-16 09:10:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.py 2018-08-16 09:12:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -644,7 +644,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check there is a private copy of the sip module already installed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- from PyQt5 import sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except ImportError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Unable to import PyQt5.sip. Make sure you have "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2438,7 +2438,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- orig.configure.py 2018-12-15 17:42:37.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.py 2018-12-15 17:50:21.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2440,7 +2440,7 @@
</span> the target configuration.
"""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,12 +9,28 @@
</span>
# If we don't check for signed interpreters, we exclude the 'VendorID'
# feature
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2916,7 +2916,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- designer/orig.pluginloader.cpp 2018-10-01 15:38:22.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ designer/pluginloader.cpp 2018-12-15 17:50:50.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,7 +167,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Make sure we have sip.unwrapinstance.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!sip_unwrapinstance)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sip_unwrapinstance = getModuleAttr("PyQt5.sip", "unwrapinstance");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sip_unwrapinstance = getModuleAttr("sip", "unwrapinstance");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!sip_unwrapinstance)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qmlscene/orig.pluginloader.cpp 2018-10-01 15:38:22.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qmlscene/pluginloader.cpp 2018-12-15 17:51:32.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -412,9 +412,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void PyQt5QmlPlugin::getSipAPI()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(SIP_USE_PYCAPSULE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sip = (const sipAPIDef *)PyCapsule_Import("PyQt5.sip._C_API", 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sip = (const sipAPIDef *)PyCapsule_Import("sip._C_API", 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PyObject *c_api = getModuleAttr("PyQt5.sip", "_C_API");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PyObject *c_api = getModuleAttr("sip", "_C_API");
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check there is a private copy of the sip module already installed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- from PyQt5 import sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except ImportError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Unable to import PyQt5.sip. Make sure you have configured "
</span>\ No newline at end of file
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (c_api)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span></pre><pre style='margin:0'>
</pre>