<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/c5d188572f16f7a66e19fac3998d7cbb388a5903">https://github.com/macports/macports-ports/commit/c5d188572f16f7a66e19fac3998d7cbb388a5903</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c5d188572f16f7a66e19fac3998d7cbb388a5903
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat Aug 7 08:41:13 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-libxml2: update to 2.9.12
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - following update of libxml2 in 6b5f6905141cb8e99e4a14c7a3602dfe195794a8
</span>---
python/py-libxml2/Portfile | 11 ++--
python/py-libxml2/files/patch-python-libxml.c.diff | 76 ----------------------
2 files changed, 5 insertions(+), 82 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-libxml2/Portfile b/python/py-libxml2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b550c42854a..2f9f2da121f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-libxml2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-libxml2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup python 1.0
</span>
# Please keep the version of the libxml2 and py-libxml2 ports the same.
name py-libxml2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.9.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.9.12
</span> revision 0
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,9 @@ master_sites http://www.xmlsoft.org/sources/ \
</span> distname libxml2-${version}
dist_subdir libxml2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 455f81e1f121c63dac96802de7f83ce4483f1afe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5624761
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 766b9460b9e62b8152f431747c30c88c868c0c7e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5681632
</span>
python.versions 27 35 36 37 38 39
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,8 +37,7 @@ if {${name} ne ${subport}} {
</span>
worksrcdir ${worksrcdir}/python
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-python-libxml.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-setup.py.diff
</span>
post-patch {
reinplace "s|@PREFIX@|${prefix}|" ${worksrcpath}/setup.py
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-libxml2/files/patch-python-libxml.c.diff b/python/py-libxml2/files/patch-python-libxml.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 42ce09e0b0b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-libxml2/files/patch-python-libxml.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,76 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# From https://gitlab.gnome.org/GNOME/libxml2/-/commit/e4fb36841800038c289997432ca547c9bfef9db1 .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Also see
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://bugzilla.redhat.com/show_bug.cgi?id=1808343
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://src.fedoraproject.org/rpms/libxml2/pull-request/9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://gitlab.gnome.org/GNOME/libxml2/-/merge_requests/71
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ru ../../libxml2-2.9.10.orig/python/libxml.c ./libxml.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../../libxml2-2.9.10.orig/python/libxml.c 2019-10-22 11:46:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./libxml.c 2021-01-28 21:48:09.818199191 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -294,7 +294,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lenread = PyBytes_Size(ret);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- data = PyBytes_AsString(ret);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef PyUnicode_Check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else if PyUnicode_Check (ret) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else if (PyUnicode_Check (ret)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if PY_VERSION_HEX >= 0x03030000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_ssize_t size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *tmp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -359,7 +359,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lenread = PyBytes_Size(ret);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- data = PyBytes_AsString(ret);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef PyUnicode_Check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else if PyUnicode_Check (ret) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else if (PyUnicode_Check (ret)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if PY_VERSION_HEX >= 0x03030000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_ssize_t size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *tmp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ru ../../libxml2-2.9.10.orig/python/types.c ./types.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../../libxml2-2.9.10.orig/python/types.c 2019-10-22 11:46:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./types.c 2021-01-28 21:48:09.818965318 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -602,16 +602,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (obj == 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;'>-- if PyFloat_Check (obj) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (PyFloat_Check (obj)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret = xmlXPathNewFloat((double) PyFloat_AS_DOUBLE(obj));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else if PyLong_Check(obj) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else if (PyLong_Check(obj)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef PyLong_AS_LONG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret = xmlXPathNewFloat((double) PyLong_AS_LONG(obj));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret = xmlXPathNewFloat((double) PyInt_AS_LONG(obj));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef PyBool_Check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else if PyBool_Check (obj) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else if (PyBool_Check (obj)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (obj == Py_True) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret = xmlXPathNewBoolean(1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -620,14 +620,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret = xmlXPathNewBoolean(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else if PyBytes_Check (obj) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else if (PyBytes_Check (obj)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xmlChar *str;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- str = xmlStrndup((const xmlChar *) PyBytes_AS_STRING(obj),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyBytes_GET_SIZE(obj));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret = xmlXPathWrapString(str);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef PyUnicode_Check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else if PyUnicode_Check (obj) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else if (PyUnicode_Check (obj)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if PY_VERSION_HEX >= 0x03030000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xmlChar *str;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *tmp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -650,7 +650,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret = xmlXPathWrapString(str);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else if PyList_Check (obj) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else if (PyList_Check (obj)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *node;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xmlNodePtr cur;
</span></pre><pre style='margin:0'>
</pre>