<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/939bd5f24cc031114c555da878558c9d5945523a">https://github.com/macports/macports-ports/commit/939bd5f24cc031114c555da878558c9d5945523a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 939bd5f24cc031114c555da878558c9d5945523a
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat May 6 19:26:25 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> libsoup: update to 3.4.2
</span>---
gnome/libsoup/Portfile | 69 ++++++++++++++++++++++--------
gnome/libsoup/files/patch-find-python.diff | 25 +++++++++++
2 files changed, 75 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libsoup/Portfile b/gnome/libsoup/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ae2f179c1a0..a11e7795013 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libsoup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libsoup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,11 +6,10 @@ PortGroup meson 1.0
</span> name libsoup
conflicts libsoup-devel
set my_name libsoup
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.74.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.4.2
</span> revision 0
categories gnome net
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license LGPL-2+
maintainers {mascguy @mascguy} {devans @dbevans} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,17 +28,23 @@ use_xz yes
</span> distname ${my_name}-${version}
dist_subdir ${my_name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b9d6df15524618f8376ed9735902952b49b0ddc6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f0a427656e5fe19e1df71c107e88dfa1b2e673c25c547b7823b6018b40d01159 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1497356
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2f4f639c52a9412c655bdb7235c2a69a4326d82d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 78c8fa37cb152d40ec8c4a148d6155e2f6947f3f1602a7cda3a31ad40f5ee2f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1535992
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver 3.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver_nodot [string map {. {}} ${py_ver}]
</span>
depends_build-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${py_ver_nodot} \
</span> port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk-doc \
</span> port:curl \
path:bin/vala:vala
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:brotli \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Pull in legacy bindings via 'libsoup-2.4', so that dependents don't have to be changed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsoup-2.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:brotli \
</span> path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:glib-networking \
path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,22 +52,37 @@ depends_lib port:brotli \
</span> port:libpsl \
port:libxml2 \
port:sqlite3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:nghttp2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:apache2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args -Dbrotli=enabled \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dgnome=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dbrotli=enabled \
</span> -Dgssapi=enabled \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dgtk_doc=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddocs=disabled \
</span> -Dintrospection=enabled \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dvapi=disabled \
</span> -Dntlm=disabled \
-Dsysprof=disabled \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dvapi=enabled \
</span> -Dtests=false
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# help it to find python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#patchfiles-append patch-find-python.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python${py_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PYTHON3_BIN@@|${configure.python}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/bin/env python3|${configure.python}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/get_apache_modules_dirs.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/libsoup/generate-header-names.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/libsoup/generate-version-header.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # uses g-ir-scanner, which uses $CC from env
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${universal_possible} && [variant_isset universal] } {
</span> foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span> lappend merger_destroot_env(${arch}) "CC=${configure.cc} -arch ${arch}"
}
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,14 +95,25 @@ platform darwin 8 {
</span> destroot.env-append "DYLD_LIBRARY_PATH=${build_dir}/${my_name}"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant docs description {Enable doc generation} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gi-docgen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk-doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddocs=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddocs=enabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant gnome description {Enable GNOME support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dgnome=false -Dgnome=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dvapi=disabled -Dvapi=enabled
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +gnome
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # vapigen is broken on PPC at the moment
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${build_arch} ne "ppc" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# default_variants-append +gnome
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
livecheck.type gnome
livecheck.name ${my_name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# restrict livecheck to 2.* release branch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# new 3.* branch breaks API/ABI
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex LATEST-IS-(2\\.\\d*\[02468\](?:\\.\\d+)*)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libsoup/files/patch-find-python.diff b/gnome/libsoup/files/patch-find-python.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d7eb257103b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libsoup/files/patch-find-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2022-05-17 12:15:10.480385710 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2022-05-17 12:17:51.654329294 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -282,21 +282,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_autobahn = false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_autobahn = find_program('wstest', required: get_option('autobahn')).found()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Quart server used for HTTP/2 tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ quart_found = false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not get_option('http2_tests').disabled()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pymod = import('python')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- python = pymod.find_installation('python3')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ python = pymod.find_installation('@@PYTHON3_BIN@@')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if python.found()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = run_command(python, '-c', 'import importlib\nassert(importlib.find_loader("quart"))', check: false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ret.returncode() == 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ quart_found = true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message('Python module quart found: @0@'.format(quart_found.to_string('YES', 'NO')))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if get_option('http2_tests').enabled() and not quart_found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error('quart is required for http2 tests')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span></pre><pre style='margin:0'>
</pre>