<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/df7a324cd28dc9e432a16e54885f1a1f966b2537">https://github.com/macports/macports-ports/commit/df7a324cd28dc9e432a16e54885f1a1f966b2537</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit df7a324cd28dc9e432a16e54885f1a1f966b2537
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Wed Sep 29 07:32:00 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-pyqt5: use latest version with all Qt versions and OSes
</span>---
python/py-pyqt5/Portfile | 15 +--------------
...atch-project.py_5.15.4.diff => patch-project.py.diff} | 0
python/py-pyqt5/files/patch-project.py_5.14.2.diff | 16 ----------------
3 files changed, 1 insertion(+), 30 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 8e5e106d1d5..ea8949ec5e1 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;'>@@ -22,25 +22,12 @@ checksums rmd160 c0f93412d4010e5e0d8e14e61af9579b66065bb4 \
</span> sha256 2a69597e0dd11caabe75fae133feca66387819fc9bc050f547e5551bce97e5be \
size 3258085
<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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp ${qt5.version} 5.11] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/61006
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.14.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</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;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> python.versions 35 36 37 38 39
if {${name} ne ${subport}} {
PortGroup qmake5 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-project.py_${version}.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-project.py.diff
</span>
post-patch {
reinplace "s|@PYVER@|${python.version}|g" ${worksrcpath}/project.py
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyqt5/files/patch-project.py_5.15.4.diff b/python/py-pyqt5/files/patch-project.py.diff
</span>similarity index 100%
rename from python/py-pyqt5/files/patch-project.py_5.15.4.diff
rename to python/py-pyqt5/files/patch-project.py.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyqt5/files/patch-project.py_5.14.2.diff b/python/py-pyqt5/files/patch-project.py_5.14.2.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 33a614675f0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyqt5/files/patch-project.py_5.14.2.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- project.py.orig 2021-09-27 23:12:24.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ project.py 2021-09-27 23:33:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -194,11 +194,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if tool in ('build', 'install'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if self.designer_plugin and 'QtDesigner' in self.bindings:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self._add_plugin('designer', "Qt Designer", 'pyqt5',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'designer')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'designer/Py@PYVER@Qt5')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if self.qml_plugin and 'QtQml' in self.bindings:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self._add_plugin('qmlscene', "qmlscene", 'pyqt5qmlplugin',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'PyQt5')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'Py@PYVER@Qt5')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Add the dbus-python support.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if self.dbus_python:
</span></pre><pre style='margin:0'>
</pre>