<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/5624f4894e0cf8cfb635f3de27a72e670b16db1a">https://github.com/macports/macports-ports/commit/5624f4894e0cf8cfb635f3de27a72e670b16db1a</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 5624f48 py-poppler-qt5: upgrade to 0.75.0; add Python 3.8
</span>5624f48 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5624f4894e0cf8cfb635f3de27a72e670b16db1a
</span>Author: Davide Liessi <davide.liessi@gmail.com>
AuthorDate: Sun Dec 22 19:17:22 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> py-poppler-qt5: upgrade to 0.75.0; add Python 3.8
</span>---
python/py-poppler-qt5/Portfile | 19 ++++-------
python/py-poppler-qt5/files/patch-fix-cxx11.diff | 10 ------
python/py-poppler-qt5/files/patch-fix-demo.diff | 37 ----------------------
python/py-poppler-qt5/files/patch-fix-qt-dirs.diff | 4 +--
python/py-poppler-qt5/files/patch-fix-qtxml.diff | 18 -----------
python/py-poppler-qt5/files/patch-types.sip.diff | 13 --------
6 files changed, 8 insertions(+), 93 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 f5170b2..73d0ac8 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;'>@@ -8,8 +8,7 @@ PortGroup cxx11 1.1
</span> name py-poppler-qt5
python.rootname python-poppler-qt5
set _n [string index ${python.rootname} 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.24.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.75.0
</span> platforms darwin
license LGPL-2.1+
maintainers {gmail.com:davide.liessi @dliessi} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,12 +25,12 @@ homepage https://github.com/wbsoft/${python.rootname}
</span> master_sites pypi:${_n}/${python.rootname}/
distname ${python.rootname}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 1f45ed0f7f3cacc1d0f9e626bd5fb5c8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 baa134c6a9e466dddcb15a23f7238b88d1eed8af \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3970c35ce1f0f1464a6c2746bea4c479b9780b4e17030c92479f7f1738a5c950 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20944
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 e411d6c8bb25faa9208387b1075895ad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ac42b3a4fbcd63e79fbfa42537f75087f06b170b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 23608
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 35 36 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 35 36 37 38
</span>
if {${name} ne ${subport}} {
depends_build-append port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,11 +39,7 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-sip \
port:py${python.version}-pyqt5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-fix-qtxml.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-qt-dirs.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-cxx11.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-demo.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-types.sip.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-fix-qt-dirs.diff
</span>
post-patch {
reinplace "s|%%QMAKE%%|${qt_qmake_cmd}|g" ${worksrcpath}/setup.py
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-poppler-qt5/files/patch-fix-cxx11.diff b/python/py-poppler-qt5/files/patch-fix-cxx11.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 369070c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-poppler-qt5/files/patch-fix-cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +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;'>-@@ -114,6 +114,7 @@ def pkg_config_version(package):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.stderr.write("Can't determine version of %s\n" % package)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ext_args = {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ext_args['extra_compile_args'] = ['-std=c++11']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pkg_config('poppler-qt5', ext_args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if 'libraries' not in ext_args:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-poppler-qt5/files/patch-fix-demo.diff b/python/py-poppler-qt5/files/patch-fix-demo.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fcaa1b4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-poppler-qt5/files/patch-fix-demo.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- demo.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ demo.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import sys
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--from PyQt5 import QtGui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+from PyQt5 import QtGui, QtWidgets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import popplerqt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- usage = """
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,7 +15,7 @@ Usage:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def pdf_view(filename):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """Return a Scrollarea showing the first page of the specified PDF file."""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- label = QtGui.QLabel()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ label = QtWidgets.QLabel()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- doc = popplerqt5.Poppler.Document.load(filename)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- doc.setRenderHint(popplerqt5.Poppler.Document.Antialiasing)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,15 +26,15 @@ def pdf_view(filename):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- label.setPixmap(QtGui.QPixmap.fromImage(image))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- area = QtGui.QScrollArea()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ area = QtWidgets.QScrollArea()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- area.setWidget(label)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- area.setWindowTitle(filename)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return area
</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;'>- def main():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- app = QtGui.QApplication(sys.argv)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- argv = QtGui.QApplication.arguments()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ app = QtWidgets.QApplication(sys.argv)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ argv = QtWidgets.QApplication.arguments()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if len(argv) < 2:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.stderr.write(usage)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.exit(2)
</span><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><span style='display:block; white-space:pre;color:#808080;'>index 2d03f7f..6d1e08c 100644
</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;'>+++ b/python/py-poppler-qt5/files/patch-fix-qt-dirs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,9 @@
</span> --- setup.py
+++ setup.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -137,7 +137,7 @@ class build_ext(build_ext_base):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,5 +138,5 @@ class build_ext(build_ext_base):
</span> build_ext_base.initialize_options(self)
self.poppler_version = None
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> - self.qmake_bin = 'qmake'
+ self.qmake_bin = '%%QMAKE%%'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> self.qt_include_dir = None
self.pyqt_sip_dir = None
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-poppler-qt5/files/patch-fix-qtxml.diff b/python/py-poppler-qt5/files/patch-fix-qtxml.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dae453b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-poppler-qt5/files/patch-fix-qtxml.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- poppler-qt5.sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ poppler-qt5.sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,11 +5,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Maintained by Wilbert Berendsen <wbsoft@xs4all.nl>
</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;'>-+%Feature QTXML_AVAILABLE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %Import QtCore/QtCoremod.sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %Import QtGui/QtGuimod.sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--%Feature QTXML_AVAILABLE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%If(QTXML_AVAILABLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%Import QtXml/QtXmlmod.sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%End
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %Timeline {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_V0_20_0
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-poppler-qt5/files/patch-types.sip.diff b/python/py-poppler-qt5/files/patch-types.sip.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9a10338..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-poppler-qt5/files/patch-types.sip.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://trac.macports.org/ticket/55014
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/wbsoft/python-poppler-qt4/issues/17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- types.sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ types.sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach (Poppler::Document::RenderBackend value, set)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *obj = PyLong_FromLong ((long) value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (obj == NULL || PyList_SetItem(l, i, obj) < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_DECREF(l);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>