<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/a43df630b258865087907482ef0618b7423c8f5f">https://github.com/macports/macports-ports/commit/a43df630b258865087907482ef0618b7423c8f5f</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 a43df630b25 libsoup-devel: update to 3.0.6
</span>a43df630b25 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a43df630b258865087907482ef0618b7423c8f5f
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Tue May 17 09:53:36 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> libsoup-devel: update to 3.0.6
</span>---
gnome/libsoup-devel/Portfile | 40 ++++++++++++++++--------
gnome/libsoup-devel/files/patch-find-python.diff | 25 +++++++++++++++
2 files changed, 52 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libsoup-devel/Portfile b/gnome/libsoup-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 09b50c5dbb0..a3753de41cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libsoup-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libsoup-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup meson 1.0
</span> name libsoup-devel
conflicts libsoup
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.0.6
</span> revision 0
categories gnome net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,9 +29,9 @@ 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 57ba023d43546ab0224f3f8afea80a83122a250e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b45d59f840b9acf9bb45fd45854e3ef672f57e3ab957401c3ad8d7502ac23da6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1527232
</span>
depends_build-append \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,25 +40,39 @@ depends_build-append \
</span> path:bin/vala:vala
depends_lib port:brotli \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:glib2-upstream \
</span> port:glib-networking \
path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection \
port:kerberos5 \
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>
configure.args -Dbrotli=enabled \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dgnome=false \
</span> -Dgssapi=enabled \
-Dgtk_doc=true \
-Dintrospection=enabled \
-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/python3.9
</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;'>+ ${worksrcpath}/tests/http2-server.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {![info exists universal_possible]} {
set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,6 +87,11 @@ if {${universal_possible} && [variant_isset universal]} {
</span> destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin powerpc {
</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;'>+ configure.args-append -Dvapi=disabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin 8 {
# meson on Tiger cannot use rpaths, so we workaround with this to find dylib
destroot.env-append "DYLD_LIBRARY_PATH=${build_dir}/${my_name}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,10 +101,5 @@ variant gnome description {Enable GNOME support} {
</span> configure.args-replace -Dgnome=false -Dgnome=true
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +gnome
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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-devel/files/patch-find-python.diff b/gnome/libsoup-devel/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-devel/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>