commit: 4edde7e605f7d845acba5ec0acadc7546b940f56 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Apr 13 15:39:12 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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 @@ <use> <flag name="gpg">Enable OpenPGP encryption plugin</flag> <flag name="http">Enable HTTP file upload plugin</flag> - <flag name="omemo">Enable OMEMO encryption plugin</flag> <flag name="notification-sound">notification sounds plugin</flag> + <flag name="omemo">Enable OMEMO encryption plugin</flag> <flag name="rtp">Enable Audio/Video calls over XMPP using RTP</flag> </use> </pkgmetadata>
