<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/66f083d98ef3d9029a82f5a996b5e84f9d980d1c">https://github.com/macports/macports-ports/commit/66f083d98ef3d9029a82f5a996b5e84f9d980d1c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 66f083d98ef3d9029a82f5a996b5e84f9d980d1c
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Sep 3 16:54:01 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-poppler-qt5: remove support for python 27, 35, 36
</span>---
python/py-poppler-qt5/Portfile | 51 ++++++++--------------
python/py-poppler-qt5/files/patch-fix-qt-dirs.diff | 9 ----
2 files changed, 19 insertions(+), 41 deletions(-)
<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 bf9022c6098..46d873ca1fd 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;'>@@ -27,7 +27,7 @@ checksums md5 83a1c785aa3d0a0b0e82a7805492eabb \
</span> sha256 add766db2c04026a6087f38f2044e66c8b053c81002f3753d8059713497d022d \
size 28235
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 35 36 37 38 39 310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 37 38 39 310
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,44 +36,31 @@ if {${name} ne ${subport}} {
</span> use_xcode yes
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} eq 27} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt5 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:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-sip4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-types.sip.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-py36.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-fix-qt-dirs.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-types.sip.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-py36.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pyqt-builder
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:${python.prefix}/bin/sip-build:py${python.version}-sip
</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;'>- build.cmd sip-build-${python.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --qmake ${qt_qmake_cmd} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --verbose
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:${python.prefix}/bin/sip-build:py${python.version}-sip
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|sip-distinfo|sip-distinfo-${python.branch}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/build/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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.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;'>+ build.target
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.cmd make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.dir ${build.dir}/build
</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> depends_build-append \
port:py${python.version}-setuptools
<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 6d1e08cdde0..00000000000
</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,9 +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;'>-@@ -138,5 +138,5 @@ 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;'>-- 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;'>- self.qt_include_dir = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.pyqt_sip_dir = None
</span></pre><pre style='margin:0'>
</pre>