<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/02ad3350d4521d9c486542878d6ff41da8644a5a">https://github.com/macports/macports-ports/commit/02ad3350d4521d9c486542878d6ff41da8644a5a</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 02ad3350d45 py-pyqt5: separate patchfile for each version
</span>02ad3350d45 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 02ad3350d4521d9c486542878d6ff41da8644a5a
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Mon Sep 27 23:15:22 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-pyqt5: separate patchfile for each version
</span>---
python/py-pyqt5/Portfile | 7 +------
...{patch-project.py.diff => patch-project.py_5.14.2.diff} | 14 +++++++-------
...{patch-project.py.diff => patch-project.py_5.15.4.diff} | 0
3 files changed, 8 insertions(+), 13 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 c2fb13df08b..564ba9a3edc 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;'>@@ -35,17 +35,12 @@ if {[vercmp ${qt5.version} 5.11] < 0} {
</span> python.versions 35 36 37 38 39
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-project.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-project.py_${version}.diff
</span>
post-patch {
reinplace "s|@PYVER@|${python.version}|g" ${worksrcpath}/project.py
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-project.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PYVER@|${python.version}|g" ${worksrcpath}/project.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> compiler.cxx_standard 2011
qt5.depends_component \
<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_5.14.2.diff
</span>similarity index 53%
copy from python/py-pyqt5/files/patch-project.py.diff
copy to python/py-pyqt5/files/patch-project.py_5.14.2.diff
<span style='display:block; white-space:pre;color:#808080;'>index 4dc413b4395..33a614675f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyqt5/files/patch-project.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyqt5/files/patch-project.py_5.14.2.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- project.py.orig 2021-09-20 16:05:20.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ project.py 2021-09-20 16:14:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -210,11 +210,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- project.py.orig 2021-09-27 23:12:24.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ project.py 2021-09-27 23:33:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -194,11 +194,11 @@
</span> if tool in ('build', 'install'):
if self.designer_plugin and 'QtDesigner' in self.bindings:
self._add_plugin('designer', "Qt Designer", 'pyqt5',
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'designer', others_debug)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'designer/Py@PYVER@Qt5', others_debug)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'designer')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'designer/Py@PYVER@Qt5')
</span>
if self.qml_plugin and 'QtQml' in self.bindings:
self._add_plugin('qmlscene', "qmlscene", 'pyqt5qmlplugin',
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'PyQt5', others_debug)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'Py@PYVER@Qt5', others_debug)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'PyQt5')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'Py@PYVER@Qt5')
</span>
# Add the dbus-python support.
if self.dbus_python:
<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_5.15.4.diff
</span>similarity index 100%
rename from python/py-pyqt5/files/patch-project.py.diff
rename to python/py-pyqt5/files/patch-project.py_5.15.4.diff
</pre><pre style='margin:0'>
</pre>