<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/667e8d75145ef3709de5992053aa3f6b3ae16361">https://github.com/macports/macports-ports/commit/667e8d75145ef3709de5992053aa3f6b3ae16361</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 667e8d7 py-poppler-qt5: restore workaround to find qmake
</span>667e8d7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 667e8d75145ef3709de5992053aa3f6b3ae16361
</span>Author: Davide Liessi <davide.liessi@gmail.com>
AuthorDate: Thu Oct 17 23:05:36 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> py-poppler-qt5: restore workaround to find qmake
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This partially reverts commit 363ab1ad713cd0e7c50669f084d045407ffcf5b5.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/59370
</span>---
python/py-poppler-qt5/Portfile | 6 ++++--
python/py-poppler-qt5/files/patch-fix-qt-dirs.diff | 11 +++++++++++
2 files changed, 15 insertions(+), 2 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 ec9a4cd..220b8a8 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,12 +41,14 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-pyqt5
patchfiles patch-fix-qtxml.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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;'>- build.pre_args build_ext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --qmake-bin=${qt_qmake_cmd}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|%%QMAKE%%|${qt_qmake_cmd}|g" ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2d03f7f
</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-poppler-qt5/files/patch-fix-qt-dirs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -137,7 +137,7 @@ class build_ext(build_ext_base):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build_ext_base.initialize_options(self)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.poppler_version = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.qmake_bin = 'qmake'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self.qmake_bin = '%%QMAKE%%'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.qt_include_dir = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.pyqt_sip_dir = None
</span></pre><pre style='margin:0'>
</pre>