From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 06A641584AD for ; Sun, 13 Apr 2025 18:29:13 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id E7CC93430EE for ; Sun, 13 Apr 2025 18:29:12 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 014BA1104BB; Sun, 13 Apr 2025 18:29:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id E45D91104BB for ; Sun, 13 Apr 2025 18:29:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 98DA43430B0 for ; Sun, 13 Apr 2025 18:29:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB26727FC for ; Sun, 13 Apr 2025 18:28:57 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1744568918.4edde7e605f7d845acba5ec0acadc7546b940f56.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/dino/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/dino/dino-0.4.5-r1.ebuild net-im/dino/dino-9999.ebuild net-im/dino/metadata.xml X-VCS-Directories: net-im/dino/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 4edde7e605f7d845acba5ec0acadc7546b940f56 X-VCS-Branch: master Date: Sun, 13 Apr 2025 18:28:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 250dacab-ab97-482a-b7f5-c191be6f6aec X-Archives-Hash: 05c498177ab33c1b3ecd767e2c7a47be commit: 4edde7e605f7d845acba5ec0acadc7546b940f56 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 13 15:39:12 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 13 18:28:38 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4edde7e6 net-im/dino: go back to libsoup3 Also ensure libsoup3-using >=net-libs/libnice-0.1.22-r1 Bug: https://bugs.gentoo.org/948374 Bug: https://bugs.gentoo.org/953635 Signed-off-by: Andreas Sturmlechner gentoo.org> .../{dino-9999.ebuild => dino-0.4.5-r1.ebuild} | 24 ++++++++++------------ net-im/dino/dino-9999.ebuild | 24 ++++++++++------------ net-im/dino/metadata.xml | 2 +- 3 files changed, 23 insertions(+), 27 deletions(-) diff --git a/net-im/dino/dino-9999.ebuild b/net-im/dino/dino-0.4.5-r1.ebuild similarity index 85% copy from net-im/dino/dino-9999.ebuild copy to net-im/dino/dino-0.4.5-r1.ebuild index aa0695a944b6..87f2f6b87e59 100644 --- a/net-im/dino/dino-9999.ebuild +++ b/net-im/dino/dino-0.4.5-r1.ebuild @@ -8,20 +8,20 @@ inherit cmake vala xdg readme.gentoo-r1 DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala" HOMEPAGE="https://dino.im" -LICENSE="GPL-3" -SLOT="0" -IUSE="+gpg +http +omemo +notification-sound +rtp test" -RESTRICT="!test? ( test )" - MY_REPO_URI="https://github.com/dino/dino" -if [[ ${PV} == "9999" ]]; then +if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="${MY_REPO_URI}.git" inherit git-r3 else - KEYWORDS="~amd64 ~arm64" SRC_URI="${MY_REPO_URI}/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm64" fi +LICENSE="GPL-3" +SLOT="0" +IUSE="+gpg +http +notification-sound +omemo +rtp test" +RESTRICT="!test? ( test )" + RDEPEND=" dev-db/sqlite:3 dev-libs/glib:2 @@ -32,14 +32,14 @@ RDEPEND=" media-libs/graphene net-libs/glib-networking net-libs/gnutls:= - >=net-libs/libnice-0.1.15 + >=net-libs/libnice-0.1.22-r1 net-libs/libsignal-protocol-c net-libs/libsrtp:2= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango gpg? ( app-crypt/gpgme:= ) - http? ( net-libs/libsoup:2.4 ) + http? ( net-libs/libsoup:3.0 ) notification-sound? ( media-libs/libcanberra:0[sound(+)] ) omemo? ( dev-libs/libgcrypt:= @@ -48,7 +48,7 @@ RDEPEND=" rtp? ( media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 - media-libs/webrtc-audio-processing:0 + media-libs/webrtc-audio-processing:1 ) " DEPEND="${RDEPEND} @@ -76,9 +76,7 @@ src_configure() { "-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")" "-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")" "-DVALA_EXECUTABLE=${VALAC}" - # libsoup-2 for bug #948374 - # dino -> libnice[upnp] -> gupnp-igd:0 -> gupnp:0 -> libsoup:2.4 - "-DSOUP_VERSION=2" + "-DSOUP_VERSION=3" # fixed bug #948374 "-DBUILD_TESTS=$(usex test)" ) diff --git a/net-im/dino/dino-9999.ebuild b/net-im/dino/dino-9999.ebuild index aa0695a944b6..87f2f6b87e59 100644 --- a/net-im/dino/dino-9999.ebuild +++ b/net-im/dino/dino-9999.ebuild @@ -8,20 +8,20 @@ inherit cmake vala xdg readme.gentoo-r1 DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala" HOMEPAGE="https://dino.im" -LICENSE="GPL-3" -SLOT="0" -IUSE="+gpg +http +omemo +notification-sound +rtp test" -RESTRICT="!test? ( test )" - MY_REPO_URI="https://github.com/dino/dino" -if [[ ${PV} == "9999" ]]; then +if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="${MY_REPO_URI}.git" inherit git-r3 else - KEYWORDS="~amd64 ~arm64" SRC_URI="${MY_REPO_URI}/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm64" fi +LICENSE="GPL-3" +SLOT="0" +IUSE="+gpg +http +notification-sound +omemo +rtp test" +RESTRICT="!test? ( test )" + RDEPEND=" dev-db/sqlite:3 dev-libs/glib:2 @@ -32,14 +32,14 @@ RDEPEND=" media-libs/graphene net-libs/glib-networking net-libs/gnutls:= - >=net-libs/libnice-0.1.15 + >=net-libs/libnice-0.1.22-r1 net-libs/libsignal-protocol-c net-libs/libsrtp:2= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango gpg? ( app-crypt/gpgme:= ) - http? ( net-libs/libsoup:2.4 ) + http? ( net-libs/libsoup:3.0 ) notification-sound? ( media-libs/libcanberra:0[sound(+)] ) omemo? ( dev-libs/libgcrypt:= @@ -48,7 +48,7 @@ RDEPEND=" rtp? ( media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 - media-libs/webrtc-audio-processing:0 + media-libs/webrtc-audio-processing:1 ) " DEPEND="${RDEPEND} @@ -76,9 +76,7 @@ src_configure() { "-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")" "-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")" "-DVALA_EXECUTABLE=${VALAC}" - # libsoup-2 for bug #948374 - # dino -> libnice[upnp] -> gupnp-igd:0 -> gupnp:0 -> libsoup:2.4 - "-DSOUP_VERSION=2" + "-DSOUP_VERSION=3" # fixed bug #948374 "-DBUILD_TESTS=$(usex test)" ) diff --git a/net-im/dino/metadata.xml b/net-im/dino/metadata.xml index 8798c1dab8d4..4f5967b0d20a 100644 --- a/net-im/dino/metadata.xml +++ b/net-im/dino/metadata.xml @@ -9,8 +9,8 @@ Enable OpenPGP encryption plugin Enable HTTP file upload plugin - Enable OMEMO encryption plugin notification sounds plugin + Enable OMEMO encryption plugin Enable Audio/Video calls over XMPP using RTP