<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/82e039eb2e264ad8a628789b68223f8076e3f182">https://github.com/macports/macports-ports/commit/82e039eb2e264ad8a628789b68223f8076e3f182</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 82e039eb2e264ad8a628789b68223f8076e3f182
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Sep 20 01:16:17 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-libxml2: Update to 2.10.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/65865
</span>---
python/py-libxml2/Portfile | 25 ++++++++++------
python/py-libxml2/files/patch-setup.py.diff | 45 +++++++++++++++++------------
2 files changed, 43 insertions(+), 27 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 1038fcd97b8..91b7b033d42 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;'>@@ -4,10 +4,15 @@ PortSystem 1.0
</span> PortGroup python 1.0
# Please keep the version of the libxml2 and py-libxml2 ports the same.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> name py-libxml2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.9.14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.10.2
</span> revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c464042a3b0541c46d65332169cb8178627cefa9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d240abe6da9c65cb1900dd9bf3a3501ccf88b3c2a1cb98317d03f272dda5b265 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2636304
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch [join [lrange [split ${version} .] 0 1] .]
</span> categories-append textproc
license MIT
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,16 +21,10 @@ description Python bindings for libxml2
</span> long_description ${description}
homepage https://gitlab.gnome.org/GNOME/libxml2/-/wikis/Python-bindings
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://download.gnome.org/sources/libxml2/2.9/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites gnome:sources/libxml2/${branch}/
</span>
distname libxml2-${version}
dist_subdir libxml2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1feadd3f7e3a801f1fc1b9f4e90054f2f2c8fc33 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3129968
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_xz yes
python.versions 27 37 38 39 310
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,10 +35,17 @@ if {${name} ne ${subport}} {
</span>
worksrcdir ${worksrcdir}/python
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # setup.py is generated by configure and is no longer included
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # in the tarball, but we can generate it quicker with some
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patches.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/setup.py.in ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles patch-setup.py.diff
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|" ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@LIBXML_VERSION@|${version}|g;s|@prefix@|${prefix}|g" ${worksrcpath}/setup.py
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,3 +57,4 @@ if {${name} ne ${subport}} {
</span> }
livecheck.name libxml2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type gnome-with-unstable
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-libxml2/files/patch-setup.py.diff b/python/py-libxml2/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b9486b760d2..76fa26886e5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-libxml2/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-libxml2/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +1,39 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /Users/charlieclark/temp/setup.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,11 +67,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2022-05-02 07:10:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2022-09-20 01:07:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,13 +17,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ROOT = r'@prefix@'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Thread-enabled libxml2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-with_threads = @WITH_THREADS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++with_threads = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Features of libxml2 requiring external DLLs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-with_iconv = @WITH_ICONV@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-with_zlib = @WITH_ZLIB@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-with_lzma = @WITH_LZMA@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-with_icu = @WITH_ICU@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++with_iconv = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++with_zlib = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++with_lzma = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++with_icu = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ icu_series = 69
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,11 +66,7 @@
</span> # - libxml2/libxml/tree.h
# - libxslt/xsltconfig.h
includes_dir = [
-"/usr/include",
-"/usr/local/include",
-"/opt/include",
<span style='display:block; white-space:pre;background:#ffe0e0;'>--os.path.join(ROOT,'include'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os.path.join(ROOT,'include'),
</span> -HOME
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+"@PREFIX@/include",
</span> ];
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> xml_includes=""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -85,7 +82,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # those are added in the linker search path for libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libdirs = [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--os.path.join(ROOT,'lib'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"@PREFIX@/lib"
</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;'>- xml_files = ["libxml2-api.xml", "libxml2-python-api.xml",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -122,32 +119,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -122,32 +118,6 @@
</span> result.close()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> with_xslt=0
-if missing("libxslt-py.c") or missing("libxslt.py"):
- if missing("xsltgenerator.py") or missing("libxslt-api.xml"):
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,6 +61,6 @@
</span> - with_xslt=1
-else:
- with_xslt=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if with_xslt == 1:
xslt_includes=""
</pre><pre style='margin:0'>
</pre>