ports@, Here a diff to update net/dino to version 0.5.0 which includes kn@ remarks.
This update requires one new port: net/libomemo-c which is attached to this
email as tgz. This library is dino's fork of net/libsignal-protocol-c.
Also, I would like to take care of both prots.
It was tested on -current/amd64 against net/ejabberd.
Ok?
Index: net/dino/Makefile
===================================================================
RCS file: /home/cvs/ports/net/dino/Makefile,v
diff -u -p -r1.37 Makefile
--- net/dino/Makefile 3 Mar 2025 19:53:30 -0000 1.37
+++ net/dino/Makefile 16 Apr 2025 16:49:58 -0000
@@ -1,21 +1,23 @@
COMMENT= XMPP desktop client
-VERSION= 0.4.5
+VERSION= 0.5.0
DISTNAME= dino-${VERSION}
CATEGORIES= net x11
-SHARED_LIBS += crypto-vala 0.1 # 0.0
-SHARED_LIBS += dino 3.2 # 0.0
-SHARED_LIBS += qlite 0.1 # 0.1
-SHARED_LIBS += xmpp-vala 3.2 # 0.1
+SHARED_LIBS += crypto-vala 1.0 # 0.0
+SHARED_LIBS += dino 4.0 # 0.0
+SHARED_LIBS += qlite 1.0 # 0.1
+SHARED_LIBS += xmpp-vala 4.0 # 0.1
HOMEPAGE= https://dino.im/
SITES= https://github.com/dino/dino/releases/download/v${VERSION}/
+MAINTAINER= Kirill A. Korinsky <kir...@korins.ky>
+
# GPLv3 only
PERMIT_PACKAGE= Yes
-MODULES= devel/cmake
+MODULES= devel/meson
BUILD_DEPENDS= devel/gettext,-tools \
lang/vala
RUN_DEPENDS= devel/desktop-file-utils \
@@ -27,7 +29,7 @@ LIB_DEPENDS= audio/libcanberra,-main \
graphics/libqrencode \
multimedia/gstreamer1/plugins-base \
net/libnice \
- net/libsignal-protocol-c \
+ net/libomemo-c \
security/gnutls \
security/gpgme \
security/libgcrypt \
@@ -36,21 +38,13 @@ LIB_DEPENDS= audio/libcanberra,-main \
x11/gnome/libadwaita \
x11/gtk+4
-WANTLIB += adwaita-1 c cairo cairo-gobject canberra gcrypt gdk_pixbuf-2.0
-WANTLIB += gee-0.8 gio-2.0 glib-2.0 gmodule-2.0 gnutls gobject-2.0
-WANTLIB += gpgme graphene-1.0 gstapp-1.0 gstaudio-1.0 gstbase-1.0
-WANTLIB += gstreamer-1.0 gstrtp-1.0 gstvideo-1.0 gtk-4 harfbuzz
-WANTLIB += icudata icuuc intl m nice pango-1.0 pangocairo-1.0
-WANTLIB += qrencode signal-protocol-c soup-3.0 sqlite3 srtp2 vulkan
-
-
-CONFIGURE_ARGS = -DBUILD_TESTS=ON \
- -DUSE_SOUP3=ON \
- -DENABLED_PLUGINS=notification-sound
-
-MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
+WANTLIB += adwaita-1 c cairo canberra gcrypt gdk_pixbuf-2.0 gee-0.8
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gnutls gobject-2.0 gpgme
+WANTLIB += graphene-1.0 gstapp-1.0 gstbase-1.0 gstreamer-1.0 gstrtp-1.0
+WANTLIB += gstvideo-1.0 gtk-4 icuuc intl m nice pango-1.0 qrencode
+WANTLIB += omemo-c soup-3.0 sqlite3 srtp2
-do-test:
- find ${WRKBUILD} -type f -perm -+x -name \*-test -print -exec {} \;
+CONFIGURE_ARGS= -Dplugin-notification-sound=enabled \
+ -Dplugin-rtp-webrtc-audio-processing=disabled
.include <bsd.port.mk>
Index: net/dino/distinfo
===================================================================
RCS file: /home/cvs/ports/net/dino/distinfo,v
diff -u -p -r1.13 distinfo
--- net/dino/distinfo 3 Mar 2025 19:53:30 -0000 1.13
+++ net/dino/distinfo 11 Apr 2025 18:52:38 -0000
@@ -1,2 +1,2 @@
-SHA256 (dino-0.4.5.tar.gz) = geOue+OjYawl8G18Y+5C7wtkbYIlO1M57+C6MREBO4k=
-SIZE (dino-0.4.5.tar.gz) = 886933
+SHA256 (dino-0.5.0.tar.gz) = kU4mX69Wpf9P/DuVffGBIi5crKtrWnRO1yaWBBv18ME=
+SIZE (dino-0.5.0.tar.gz) = 1002577
Index: net/dino/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/net/dino/pkg/PLIST,v
diff -u -p -r1.7 PLIST
--- net/dino/pkg/PLIST 13 Jun 2023 10:23:10 -0000 1.7
+++ net/dino/pkg/PLIST 12 Apr 2025 22:03:37 -0000
@@ -29,6 +29,8 @@ share/locale/ca/LC_MESSAGES/dino.mo
share/locale/cs/LC_MESSAGES/dino-omemo.mo
share/locale/cs/LC_MESSAGES/dino-openpgp.mo
share/locale/cs/LC_MESSAGES/dino.mo
+share/locale/da/LC_MESSAGES/dino-omemo.mo
+share/locale/da/LC_MESSAGES/dino-openpgp.mo
share/locale/da/LC_MESSAGES/dino.mo
share/locale/de/LC_MESSAGES/dino-omemo.mo
share/locale/de/LC_MESSAGES/dino-openpgp.mo
@@ -45,6 +47,9 @@ share/locale/eo/LC_MESSAGES/dino.mo
share/locale/es/LC_MESSAGES/dino-omemo.mo
share/locale/es/LC_MESSAGES/dino-openpgp.mo
share/locale/es/LC_MESSAGES/dino.mo
+share/locale/et/LC_MESSAGES/dino-omemo.mo
+share/locale/et/LC_MESSAGES/dino-openpgp.mo
+share/locale/et/LC_MESSAGES/dino.mo
share/locale/eu/LC_MESSAGES/dino-omemo.mo
share/locale/eu/LC_MESSAGES/dino-openpgp.mo
share/locale/eu/LC_MESSAGES/dino.mo
@@ -52,6 +57,7 @@ share/locale/fa/LC_MESSAGES/dino-omemo.m
share/locale/fa/LC_MESSAGES/dino-openpgp.mo
share/locale/fa/LC_MESSAGES/dino.mo
share/locale/fi/LC_MESSAGES/dino-omemo.mo
+share/locale/fi/LC_MESSAGES/dino-openpgp.mo
share/locale/fi/LC_MESSAGES/dino.mo
share/locale/fr/LC_MESSAGES/dino-omemo.mo
share/locale/fr/LC_MESSAGES/dino-openpgp.mo
@@ -59,9 +65,13 @@ share/locale/fr/LC_MESSAGES/dino.mo
share/locale/gl/LC_MESSAGES/dino-omemo.mo
share/locale/gl/LC_MESSAGES/dino-openpgp.mo
share/locale/gl/LC_MESSAGES/dino.mo
+share/locale/hi/LC_MESSAGES/dino.mo
share/locale/hu/LC_MESSAGES/dino-omemo.mo
share/locale/hu/LC_MESSAGES/dino-openpgp.mo
share/locale/hu/LC_MESSAGES/dino.mo
+share/locale/hy/LC_MESSAGES/dino.mo
+share/locale/ia/LC_MESSAGES/dino-openpgp.mo
+share/locale/ia/LC_MESSAGES/dino.mo
share/locale/id/LC_MESSAGES/dino-omemo.mo
share/locale/id/LC_MESSAGES/dino-openpgp.mo
share/locale/id/LC_MESSAGES/dino.mo
@@ -113,12 +123,15 @@ share/locale/ro/LC_MESSAGES/dino.mo
share/locale/ru/LC_MESSAGES/dino-omemo.mo
share/locale/ru/LC_MESSAGES/dino-openpgp.mo
share/locale/ru/LC_MESSAGES/dino.mo
+share/locale/si/LC_MESSAGES/dino.mo
share/locale/sq/LC_MESSAGES/dino-omemo.mo
share/locale/sq/LC_MESSAGES/dino-openpgp.mo
share/locale/sq/LC_MESSAGES/dino.mo
share/locale/sv/LC_MESSAGES/dino-omemo.mo
share/locale/sv/LC_MESSAGES/dino-openpgp.mo
share/locale/sv/LC_MESSAGES/dino.mo
+share/locale/ta/LC_MESSAGES/dino-omemo.mo
+share/locale/ta/LC_MESSAGES/dino-openpgp.mo
share/locale/ta/LC_MESSAGES/dino.mo
share/locale/tr/LC_MESSAGES/dino-omemo.mo
share/locale/tr/LC_MESSAGES/dino-openpgp.mo
@@ -126,6 +139,9 @@ share/locale/tr/LC_MESSAGES/dino.mo
share/locale/uk/LC_MESSAGES/dino-omemo.mo
share/locale/uk/LC_MESSAGES/dino-openpgp.mo
share/locale/uk/LC_MESSAGES/dino.mo
+share/locale/vi/LC_MESSAGES/dino-omemo.mo
+share/locale/vi/LC_MESSAGES/dino-openpgp.mo
+share/locale/vi/LC_MESSAGES/dino.mo
share/locale/zh_CN/LC_MESSAGES/dino-omemo.mo
share/locale/zh_CN/LC_MESSAGES/dino-openpgp.mo
share/locale/zh_CN/LC_MESSAGES/dino.mo
Index: net/dino/patches/patch-libdino_meson_build
===================================================================
RCS file: net/dino/patches/patch-libdino_meson_build
diff -N net/dino/patches/patch-libdino_meson_build
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ net/dino/patches/patch-libdino_meson_build 19 Apr 2025 09:43:20 -0000
@@ -0,0 +1,24 @@
+https://github.com/dino/dino/issues/1694
+
+Index: libdino/meson.build
+--- libdino/meson.build.orig
++++ libdino/meson.build
+@@ -1,7 +1,8 @@
+ # version_vala
++version_py = meson.current_source_dir() / 'version.py'
+ dot_git = meson.current_source_dir() / '../.git'
+ version_file = meson.current_source_dir() / '../VERSION'
+-command = [prog_python, files('version.py'), version_file, '--git-repo',
meson.current_source_dir()]
++command = [prog_python, version_py, version_file, '--git-repo',
meson.current_source_dir()]
+ if prog_git.found()
+ command += ['--git', prog_git]
+ endif
+@@ -85,7 +86,7 @@ vala_args = []
+ if meson.get_compiler('vala').version().version_compare('=0.56.11')
+ vala_args += ['-D', 'VALA_0_56_11']
+ endif
+-lib_dino = library('libdino', sources, c_args: c_args, vala_args: vala_args,
include_directories: include_directories('src'), dependencies: dependencies,
name_prefix: '', version: '0.0', install: true, install_dir: [true, true,
true], install_rpath: default_install_rpath)
++lib_dino = library('dino', sources, c_args: c_args, vala_args: vala_args,
include_directories: include_directories('src'), dependencies: dependencies,
version: '0.0', install: true, install_dir: [true, true, true], install_rpath:
default_install_rpath)
+ dep_dino = declare_dependency(link_with: lib_dino, include_directories:
include_directories('.', 'src'))
+
+ install_data('dino.deps', install_dir: get_option('datadir') / 'vala/vapi',
install_tag: 'devel') # TODO: workaround for
https://github.com/mesonbuild/meson/issues/9756
libomemo-c.tgz
Description: Binary data
