<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/5b1d524f4389151c762d40d464f7269d17cfbdad">https://github.com/macports/macports-ports/commit/5b1d524f4389151c762d40d464f7269d17cfbdad</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 5b1d524f438 py-poppler-qt5: update to 21.3.0
</span>5b1d524f438 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5b1d524f4389151c762d40d464f7269d17cfbdad
</span>Author: Davide Liessi <davide.liessi@gmail.com>
AuthorDate: Sun Feb 19 11:30:59 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> py-poppler-qt5: update to 21.3.0
</span>---
python/py-poppler-qt5/Portfile | 14 ++-
python/py-poppler-qt5/files/patch-fix-py36.diff | 15 ----
python/py-poppler-qt5/files/patch-types.sip.diff | 105 -----------------------
3 files changed, 5 insertions(+), 129 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 46d873ca1fd..e02b7313b08 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;'>@@ -5,8 +5,7 @@ PortGroup python 1.0
</span>
name py-poppler-qt5
python.rootname python-poppler-qt5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 21.1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 21.3.0
</span>
platforms darwin
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,10 +21,10 @@ long_description ${python.rootname} is a Python binding for Poppler-Qt5 \
</span>
homepage https://github.com/wbsoft/${python.rootname}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 83a1c785aa3d0a0b0e82a7805492eabb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 26aea457226155b8a6120fa0e19f631a38c8afcc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 add766db2c04026a6087f38f2044e66c8b053c81002f3753d8059713497d022d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 28235
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 99c72b0a2043dfc7d5b92e0f167be4b2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 dc79ca00ae22256b8ea4ad035a8193a28721f804 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b477e8841f0ea0e09fdab6f2f305cf38df977d9e142e5693a374605d75dd6fe0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 28586
</span>
python.versions 37 38 39 310
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,9 +37,6 @@ if {${name} ne ${subport}} {
</span>
PortGroup qmake5 1.0
<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> depends_build-append \
port:py${python.version}-pyqt-builder
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-poppler-qt5/files/patch-fix-py36.diff b/python/py-poppler-qt5/files/patch-fix-py36.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5e45340a88f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-poppler-qt5/files/patch-fix-py36.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-see: https://github.com/frescobaldi/python-poppler-qt5/pull/44
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git project.py project.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 17df8da..74e397c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- project.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ project.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,7 +42,7 @@ class PopplerQt5Bindings(PyQtBindings):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def run_pkg_config(option):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- output = subprocess.check_output(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ['pkg-config', option, 'poppler-qt5'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- text=True)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ universal_newlines=True)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return output.rstrip()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def apply_user_defaults(self, tool):
</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 0171638b72f..00000000000
</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,105 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-see: https://github.com/frescobaldi/python-poppler-qt5/pull/45
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git types.sip types.sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 239b8c9..81cb283 100644
</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;'>-@@ -331,5 +331,98 @@ template <TYPE>
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Convert QVector< QPair<TYPE, TYPE> >
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * from and to a Python list of a 2-item tuple
</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;'>-+template<TYPE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%MappedType QVector< QPair<TYPE, TYPE> >
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%TypeHeaderCode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <qvector.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <qpair.h>
</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;'>-+%ConvertFromTypeCode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Create the list.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyObject *l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((l = PyList_New(sipCpp->size())) == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Set the list elements.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (int i = 0; i < sipCpp->size(); ++i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QPair<TYPE, TYPE>* p = new QPair<TYPE, TYPE>(sipCpp->at(i));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyObject *ptuple = PyTuple_New(2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyObject *pfirst;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyObject *psecond;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ TYPE *sfirst = new TYPE(p->first);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((pfirst = sipConvertFromType(sfirst, sipType_TYPE, sipTransferObj)) == NULL)
</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;'>-+ Py_DECREF(ptuple);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyTuple_SET_ITEM(ptuple, 0, pfirst);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ TYPE *ssecond = new TYPE(p->second);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((psecond = sipConvertFromType(ssecond, sipType_TYPE, sipTransferObj)) == NULL)
</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;'>-+ Py_DECREF(ptuple);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Py_DECREF(pfirst);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyTuple_SET_ITEM(ptuple, 1, psecond);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyList_SET_ITEM(l, i, ptuple);
</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;'>-+ return l;
</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;'>-+%ConvertToTypeCode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const sipTypeDef* qpair_type = sipFindType("QPair<TYPE, TYPE>");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Check the type if that is all that is required.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (sipIsErr == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!PySequence_Check(sipPy))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (int i = 0; i < PySequence_Size(sipPy); ++i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!sipCanConvertToType(PySequence_ITEM(sipPy, i), qpair_type, SIP_NOT_NONE))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 1;
</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;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QVector< QPair<TYPE, TYPE> > *qv = new QVector< QPair<TYPE, TYPE> >;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (int i = 0; i < PySequence_Size(sipPy); ++i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int state;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QPair<TYPE, TYPE> * p = reinterpret_cast< QPair<TYPE, TYPE> * >(sipConvertToType(PySequence_ITEM(sipPy, i), qpair_type, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (*sipIsErr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sipReleaseType(p, qpair_type, state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ delete qv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ qv->append(*p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sipReleaseType(p, qpair_type, state);
</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;'>-+ *sipCppPtr = qv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return sipGetState(sipTransferObj);
</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;'>-+};
</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;'>- /* kate: indent-width 4; space-indent on; hl c++; indent-mode cstyle; */
</span></pre><pre style='margin:0'>
</pre>