<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/69439abe6cb20815bfd78a4790cef4fc675a0006">https://github.com/macports/macports-ports/commit/69439abe6cb20815bfd78a4790cef4fc675a0006</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 69439ab py-poppler-qt[45]: fix compiler error
</span>69439ab is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 69439abe6cb20815bfd78a4790cef4fc675a0006
</span>Author: Davide Liessi <davide.liessi@gmail.com>
AuthorDate: Tue Nov 28 14:38:43 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> py-poppler-qt[45]: fix compiler error
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Replace PyList_SET_ITEM -> PyList_SetItem
</span><span style='display:block; white-space:pre;color:#404040;'> * Add maintainer's github handle
</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/55014
</span>---
python/py-poppler-qt4/Portfile | 4 +++-
python/py-poppler-qt4/files/patch-types.sip.diff | 13 +++++++++++++
python/py-poppler-qt5/Portfile | 5 +++--
python/py-poppler-qt5/files/patch-types.sip.diff | 13 +++++++++++++
4 files changed, 32 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-poppler-qt4/Portfile b/python/py-poppler-qt4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0c1b0b0..5940194 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-poppler-qt4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-poppler-qt4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ name py-poppler-qt4
</span> python.rootname python-poppler-qt4
set _n [string index ${python.rootname} 0]
version 0.24.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> platforms darwin
license LGPL-2.1+
maintainers {gmail.com:davide.liessi @dliessi} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,6 +38,8 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-sip \
port:py${python.version}-pyqt4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-types.sip.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
set doc_dir ${destroot}${prefix}/share/doc/${subport}
xinstall -d ${doc_dir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-poppler-qt4/files/patch-types.sip.diff b/python/py-poppler-qt4/files/patch-types.sip.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9a10338
</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-qt4/files/patch-types.sip.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://trac.macports.org/ticket/55014
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/wbsoft/python-poppler-qt4/issues/17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- types.sip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ types.sip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach (Poppler::Document::RenderBackend value, set)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PyObject *obj = PyLong_FromLong ((long) value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (obj == NULL || PyList_SetItem(l, i, obj) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Py_DECREF(l);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><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 da088b3..dc5b7c1 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;'>@@ -9,7 +9,7 @@ name py-poppler-qt5
</span> python.rootname python-poppler-qt5
set _n [string index ${python.rootname} 0]
version 0.24.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> platforms darwin
license LGPL-2.1+
maintainers {gmail.com:davide.liessi @dliessi} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,8 @@ if {${name} ne ${subport}} {
</span> patchfiles patch-fix-qtxml.diff \
patch-fix-qt-dirs.diff \
patch-fix-cxx11.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-demo.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-demo.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-types.sip.diff
</span>
post-patch {
reinplace "s|%%QMAKE%%|${qt_bins_dir}/qmake|g" ${worksrcpath}/setup.py
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9a10338
</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-types.sip.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://trac.macports.org/ticket/55014
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/wbsoft/python-poppler-qt4/issues/17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- types.sip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ types.sip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach (Poppler::Document::RenderBackend value, set)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PyObject *obj = PyLong_FromLong ((long) value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (obj == NULL || PyList_SetItem(l, i, obj) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Py_DECREF(l);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>