<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ed1101851baabae8b3830c0521ba66808e3c88df">https://github.com/macports/macports-ports/commit/ed1101851baabae8b3830c0521ba66808e3c88df</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 ed1101851ba dino: update to 0.4.4
</span>ed1101851ba is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ed1101851baabae8b3830c0521ba66808e3c88df
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Mon Jul 1 16:33:23 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> dino: update to 0.4.4
</span>---
net/dino/Portfile | 58 ++++++++++++++++---------------
net/dino/files/patch-disable-openpgp.diff | 11 ------
net/dino/files/patch-fix-install.diff | 11 ++++++
net/dino/files/patch-fix-openpgp.diff | 12 +++++++
4 files changed, 53 insertions(+), 39 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dino/Portfile b/net/dino/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 22fe2f29f72..6756f5d4bec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/dino/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dino/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup dino dino 0.4.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup dino dino 0.4.4 v
</span> revision 0
categories net www
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,20 +12,21 @@ maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span> description Modern XMPP (Jabber) chat client
long_description {*}${description} using GTK+/Vala.
homepage https://dino.im
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4c19280920647390ea8a9de7b8e2a150bfb73341 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 432d7c3b5170c595b1b31a8d64d73ded26e32af9f03a2d1a01828c22a8ade3fa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 883755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b6f121c881191660e6632979010abb5e8ffefbb2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 29f37dc3a54fb123f223964d01de76fcea038ca6d134aa35b75c62b07acb9d03 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 884410
</span> github.tarball_from archive
# FIXME: on 10.6 it builds and launches, but trying to register an account results in an error:
# (dino:74601): Pango-WARNING **: 23:01:36.818: Invalid UTF-8 string passed to pango_layout_set_text()
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/dino/dino/issues/1593
</span>
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bin:cmake:cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/cmake:cmake \
</span> port:gettext \
port:ninja \
path:bin/pkg-config:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bin:vala:vala
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/vala:vala
</span> depends_lib-append port:desktop-file-utils \
path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
port:gettext-runtime \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,18 +48,22 @@ depends_lib-append port:desktop-file-utils \
</span> port:qrencode \
port:sqlite3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Temporarily disable openpgp plug-in due to:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# gpgme.vapi: error: no member named 'subkeys_length1' in 'struct _gpgme_key'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# account_settings_entry.vala: error: no member named 'uids_length1' in 'struct _gpgme_key'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# For some reason configure arg may or may not work, so patch it out from defaults.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-disable-openpgp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/dino/dino/issues/1602
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-openpgp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# CI builds ignore prefix passed to configure as an argument.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-install.diff
</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|@PREFIX@|${prefix}|" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
compiler.blacklist-append \
{*gcc-[34].*} {clang < 400}
configure.args-append \
--disable-fast-vapi \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-plugin=openpgp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --prefix=${prefix} \
</span> --with-libsoup3
if {${os.platform} eq "darwin" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,27 +83,24 @@ if {[string match *gcc* ${configure.compiler}]} {
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix dylibs:
</span> foreach dylib [ exec find ${destroot}${prefix}/lib -name "\*.dylib" ] {
regsub ":$" ${dylib} "" destroot_dylib_path
regsub ${destroot} ${destroot_dylib_path} "" dylib_path
system "install_name_tool -id ${dylib_path} ${destroot_dylib_path}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change @rpath/libcrypto-vala.0.dylib ${prefix}/lib/libcrypto-vala.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot_dylib_path}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change @rpath/libdino.0.dylib ${prefix}/lib/libdino.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot_dylib_path}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change @rpath/libxmpp-vala.0.dylib ${prefix}/lib/libxmpp-vala.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot_dylib_path}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change @rpath/libqlite.0.dylib ${prefix}/lib/libqlite.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot_dylib_path}"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f { bin/dino \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/libdino.0.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/libxmpp-vala.0.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/libqlite.0.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/dino/plugins/http-files.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/dino/plugins/ice.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/dino/plugins/omemo.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/dino/plugins/rtp.dylib } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${f}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -change @rpath/libdino.0.dylib ${prefix}/lib/libdino.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/${f}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -change @rpath/libxmpp-vala.0.dylib ${prefix}/lib/libxmpp-vala.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/${f}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -change @rpath/libqlite.0.dylib ${prefix}/lib/libqlite.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/${f}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix linking of the binary:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dlink { libdino.0.dylib libxmpp-vala.0.dylib libqlite.0.dylib } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change @rpath/${dlink} ${prefix}/lib/${dlink} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin/${name}"
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dino/files/patch-disable-openpgp.diff b/net/dino/files/patch-disable-openpgp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d78bcd4b8cf..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/dino/files/patch-disable-openpgp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt 2023-07-10 00:24:34
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2024-06-23 22:27:01
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,7 +11,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Prepare Plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(DEFAULT_PLUGINS omemo;openpgp;http-files;ice;rtp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(DEFAULT_PLUGINS omemo;http-files;ice;rtp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach (plugin ${DEFAULT_PLUGINS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ("$CACHE{DINO_PLUGIN_ENABLED_${plugin}}" STREQUAL "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (NOT DEFINED DINO_PLUGIN_ENABLED_${plugin}})
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dino/files/patch-fix-install.diff b/net/dino/files/patch-fix-install.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..125a9fc7ab0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dino/files/patch-fix-install.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure 2024-07-01 05:01:20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-07-01 16:29:04
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +12,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval set -- "$OPTS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PREFIX=${PREFIX:-/usr/local}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PREFIX=${PREFIX:-@PREFIX@}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENABLED_PLUGINS=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DISABLED_PLUGINS=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BUILD_LIBSIGNAL_IN_TREE=
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dino/files/patch-fix-openpgp.diff b/net/dino/files/patch-fix-openpgp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b972e39fc1f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dino/files/patch-fix-openpgp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- plugins/gpgme-vala/vapi/gpg-error.vapi 2024-07-01 05:01:20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plugins/gpgme-vala/vapi/gpg-error.vapi 2024-07-01 16:22:11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -442,7 +442,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public ErrorCode code { [CCode (cname = "gpg_err_code")] get; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public ErrorSource source { [CCode (cname = "gpg_err_source")] get; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [CCode (cname = "gpg_strerror")]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [CCode (cname = "gpgme_strerror")]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public unowned string to_string ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [CCode (cname = "gpg_strsource")]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\ No newline at end of file
</span></pre><pre style='margin:0'>
</pre>