git: 44471d06e0ea - main - net-im/dino: Update to 0.3.1

From: Ashish SHUKLA <ashish_at_FreeBSD.org>
Date: Sat, 12 Nov 2022 03:07:18 UTC
The branch main has been updated by ashish:

URL: https://cgit.FreeBSD.org/ports/commit/?id=44471d06e0eadb0f9e929281938ed8db434d45be

commit 44471d06e0eadb0f9e929281938ed8db434d45be
Author:     Ashish SHUKLA <ashish@FreeBSD.org>
AuthorDate: 2022-11-12 02:57:53 +0000
Commit:     Ashish SHUKLA <ashish@FreeBSD.org>
CommitDate: 2022-11-12 02:58:53 +0000

    net-im/dino: Update to 0.3.1
    
    - Add option for notifications sound
    - Remove the upstreamed patch
    - Move SQLite3 dependency check to pre-configure[0]
    
    PR:             267608 [0]
    Reported by:    Bryan Baldwin <bryan at katofiad dot co dot nz> [0]
---
 net-im/dino/Makefile                                       | 14 +++++++++-----
 net-im/dino/distinfo                                       |  6 +++---
 .../files/patch-libdino_src_service_call__peer__state.vala | 14 --------------
 net-im/dino/pkg-plist                                      |  1 +
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/net-im/dino/Makefile b/net-im/dino/Makefile
index 82cc73534fc1..fc32583fffa0 100644
--- a/net-im/dino/Makefile
+++ b/net-im/dino/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=		dino
 DISTVERSIONPREFIX=	v
-DISTVERSION=		0.3.0
-PORTREVISION=		6
+DISTVERSION=		0.3.1
 CATEGORIES=		net-im
 
 MAINTAINER=		ashish@FreeBSD.org
@@ -26,8 +25,8 @@ USES=		cmake cpe desktop-file-utils gettext-tools gnome \
 
 USE_GITHUB=	yes
 
-OPTIONS_DEFINE=		OMEMO UPLOAD GNUPG ICE RTP
-OPTIONS_DEFAULT=	OMEMO UPLOAD GNUPG ICE RTP
+OPTIONS_DEFINE=		OMEMO UPLOAD GNUPG ICE RTP CANBERRA
+OPTIONS_DEFAULT=	OMEMO UPLOAD GNUPG ICE RTP CANBERRA
 OPTIONS_SUB=		yes
 
 HAS_CONFIGURE=	yes
@@ -37,6 +36,7 @@ USE_LDCONFIG=	yes
 
 USE_GNOME=	cairo gdkpixbuf2 glib20 gnomeprefix gtk30 intlhack
 
+CANBERRA_DESC=	Notifications sounds support
 ICE_DESC=		ICE NAT traversal plugin
 OMEMO_DESC=		OMEMO plugin
 RTP_DESC=		RTP plugin
@@ -44,6 +44,7 @@ UPLOAD_DESC=		HTTP file upload plugin
 ICE_LIB_DEPENDS=	libnice.so:net-im/libnice \
 			libgnutls.so:security/gnutls
 ICE_VARS=		ENABLED_PLUGINS+=ice
+ICE_CMAKE_ON=		-DSOUP_VERSION:INT=2
 ICE_VARS_OFF=		DISABLED_PLUGINS+=ice
 RTP_LIB_DEPENDS=	libgnutls.so:security/gnutls \
 			libwebrtc-audio-processing-1.so:audio/webrtc-audio-processing
@@ -62,11 +63,14 @@ UPLOAD_VARS_OFF=	DISABLED_PLUGINS+=http-files
 GNUPG_LIB_DEPENDS=	libgpgme.so:security/gpgme
 GNUPG_VARS=		ENABLED_PLUGINS+=openpgp
 GNUPG_VARS_OFF=		DISABLED_PLUGINS+=openpgp
+CANBERRA_VARS=		ENABLED_PLUGINS+=notification-sound
+CANBERRA_VARS_OFF=		DISABLED_PLUGINS+=notification-sound
+CANBERRA_LIB_DEPENDS=	libcanberra.so:audio/libcanberra
 
 CMAKE_ARGS+=	-DENABLED_PLUGINS="${ENABLED_PLUGINS:S/ /;/gW}"
 CMAKE_ARGS+=	-DDISABLED_PLUGINS="${DISABLED_PLUGINS:S/ /;/gW}"
 
-pre-everything::
+pre-configure:
 	@if [ -z "${PACKAGE_BUILDING}" ]; then if ! ${PKG_BIN} query \
 			'%o-%Ok-%Od' databases/sqlite3 | \
 			${GREP} -F -wq databases/sqlite3-UNICODE61-on; then \
diff --git a/net-im/dino/distinfo b/net-im/dino/distinfo
index f50b5b685843..8a8025ec894e 100644
--- a/net-im/dino/distinfo
+++ b/net-im/dino/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1644701764
-SHA256 (dino-dino-v0.3.0_GH0.tar.gz) = 110faee764bc9acbee0f5f4133e21eb25e6757ce81eb4b8d22dd113c7e4b5326
-SIZE (dino-dino-v0.3.0_GH0.tar.gz) = 804955
+TIMESTAMP = 1668210773
+SHA256 (dino-dino-v0.3.1_GH0.tar.gz) = 7178fc6b5efcea4e4ab49a7cae58224b5236660816e247a23124466984a9fbf9
+SIZE (dino-dino-v0.3.1_GH0.tar.gz) = 806800
 SHA256 (signalapp-libsignal-protocol-c-v2.3.3_GH0.tar.gz) = c22e7690546e24d46210ca92dd808f17c3102e1344cd2f9a370136a96d22319d
 SIZE (signalapp-libsignal-protocol-c-v2.3.3_GH0.tar.gz) = 272073
diff --git a/net-im/dino/files/patch-libdino_src_service_call__peer__state.vala b/net-im/dino/files/patch-libdino_src_service_call__peer__state.vala
deleted file mode 100644
index f07a18f02c82..000000000000
--- a/net-im/dino/files/patch-libdino_src_service_call__peer__state.vala
+++ /dev/null
@@ -1,14 +0,0 @@
---- libdino/src/service/call_peer_state.vala	2022-02-13 00:18:06.000000000 +0300
-+++ libdino/src/service/call_peer_state.vala	2022-08-15 12:07:56.735765000 +0300
-@@ -45,7 +45,10 @@
-         this.stream_interactor = stream_interactor;
-         this.calls = stream_interactor.get_module(Calls.IDENTITY);
- 
--        var session_info_type = stream_interactor.module_manager.get_module(call.account, Xep.JingleRtp.Module.IDENTITY).session_info_type;
-+        Xep.JingleRtp.Module jinglertp_module = stream_interactor.module_manager.get_module(call.account, Xep.JingleRtp.Module.IDENTITY);
-+        if (jinglertp_module == null) return;
-+
-+        var session_info_type = jinglertp_module.session_info_type;
-         session_info_type.mute_update_received.connect((session,mute, name) => {
-             if (this.sid != session.sid) return;
- 
diff --git a/net-im/dino/pkg-plist b/net-im/dino/pkg-plist
index 218690dc8ed7..28528f729b74 100644
--- a/net-im/dino/pkg-plist
+++ b/net-im/dino/pkg-plist
@@ -9,6 +9,7 @@ include/crypto-vala.h
 %%GNUPG%%lib/dino/plugins/openpgp.so
 %%ICE%%lib/dino/plugins/ice.so
 %%RTP%%lib/dino/plugins/rtp.so
+%%CANBERRA%%lib/dino/plugins/notification-sound.so
 lib/libdino.so
 lib/libdino.so.0
 lib/libdino.so.0.0