* [gentoo-commits] repo/gentoo:master commit in: net-im/dino/files/, net-im/dino/
@ 2021-10-22 12:09 Andrey Utkin
0 siblings, 0 replies; 3+ messages in thread
From: Andrey Utkin @ 2021-10-22 12:09 UTC (permalink / raw
To: gentoo-commits
commit: ba37afa4406e0cf14e9fb5af84d528f2980ff065
Author: Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 22 10:39:20 2021 +0000
Commit: Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org>
CommitDate: Fri Oct 22 11:45:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba37afa4
net-im/dino: document how to enable video calls
Video calls need some runtime dependencies.
Video calls are not going to be used by everyone (at least not
immediately) so these dependencies are optional. So they go to
post-installation notice and not RDEPEND for now.
Bug: https://bugs.gentoo.org/795129
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andrey Utkin <andrey_utkin <AT> gentoo.org>
net-im/dino/dino-9999.ebuild | 12 +++++++++++-
net-im/dino/files/README.gentoo | 23 +++++++++++++++++++++++
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/net-im/dino/dino-9999.ebuild b/net-im/dino/dino-9999.ebuild
index 408e90c2968..ec609bb4854 100644
--- a/net-im/dino/dino-9999.ebuild
+++ b/net-im/dino/dino-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
CMAKE_MAKEFILE_GENERATOR="ninja"
VALA_MIN_API_VERSION="0.34"
-inherit cmake vala xdg
+inherit cmake vala xdg readme.gentoo-r1
DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala"
HOMEPAGE="https://dino.im"
@@ -79,3 +79,13 @@ src_configure() {
src_test() {
"${BUILD_DIR}"/xmpp-vala-test || die
}
+
+src_install() {
+ cmake_src_install
+ readme.gentoo_create_doc
+}
+
+src_postinst() {
+ xdg_pkg_postinst
+ readme.gentoo_print_elog
+}
diff --git a/net-im/dino/files/README.gentoo b/net-im/dino/files/README.gentoo
new file mode 100644
index 00000000000..b51e4391562
--- /dev/null
+++ b/net-im/dino/files/README.gentoo
@@ -0,0 +1,23 @@
+To enable video calls, install the following packages.
+
+Transport level security:
+- gst-plugins-srtp
+- gst-plugins-dtls
+
+Peer to peer connection reliability:
+- gst-plugins-libnice
+
+Video output into a window:
+- gst-plugins-gtk
+
+At least one codec is needed in common with the other end of the call, as they
+are negotiated when the call begins.
+
+Video codecs:
+- gst-plugins-x264
+- gst-plugins-vpx
+
+Audio codecs:
+- gst-plugins-good
+- gst-plugins-speex
+- gst-plugins-opus
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/dino/files/, net-im/dino/
@ 2024-03-04 5:45 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-03-04 5:45 UTC (permalink / raw
To: gentoo-commits
commit: 0a5a81b94069143e452d8196d659b1d8a8565475
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 4 05:44:19 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 4 05:44:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a5a81b9
net-im/dino: fix modern C issues
Closes: https://bugs.gentoo.org/926073
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-im/dino/dino-0.4.3-r1.ebuild | 103 +++++++++++++++++++++++++++++++++
net-im/dino/files/dino-0.4.3-c99.patch | 57 ++++++++++++++++++
2 files changed, 160 insertions(+)
diff --git a/net-im/dino/dino-0.4.3-r1.ebuild b/net-im/dino/dino-0.4.3-r1.ebuild
new file mode 100644
index 000000000000..0badcf1fd992
--- /dev/null
+++ b/net-im/dino/dino-0.4.3-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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
+ 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"
+fi
+
+RDEPEND="
+ dev-db/sqlite:3
+ dev-libs/glib:2
+ dev-libs/icu:=
+ dev-libs/libgee:0.8=
+ gui-libs/gtk:4
+ >=gui-libs/libadwaita-1.2.0:1[vala]
+ media-libs/graphene
+ net-libs/glib-networking
+ net-libs/gnutls:=
+ >=net-libs/libnice-0.1.15
+ 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 )
+ notification-sound? ( media-libs/libcanberra:0[sound] )
+ omemo? (
+ dev-libs/libgcrypt:=
+ media-gfx/qrencode:=
+ )
+ rtp? (
+ media-libs/gst-plugins-base:1.0
+ media-libs/gstreamer:1.0
+ media-libs/webrtc-audio-processing:0
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ media-libs/gst-plugins-base
+ media-libs/gstreamer
+"
+BDEPEND="
+ sys-devel/gettext
+ $(vala_depend)
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-c99.patch
+)
+
+src_configure() {
+ vala_setup
+
+ local disabled_plugins=(
+ $(usex gpg "" "openpgp")
+ $(usex omemo "" "omemo")
+ $(usex http "" "http-files")
+ $(usex rtp "" rtp)
+ )
+ local enabled_plugins=(
+ $(usex notification-sound "notification-sound" "")
+ )
+ local mycmakeargs=(
+ "-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")"
+ "-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")"
+ "-DVALA_EXECUTABLE=${VALAC}"
+ "-DSOUP_VERSION=2"
+ "-DBUILD_TESTS=$(usex test)"
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ "${BUILD_DIR}"/xmpp-vala-test || die
+}
+
+src_install() {
+ cmake_src_install
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ readme.gentoo_print_elog
+}
diff --git a/net-im/dino/files/dino-0.4.3-c99.patch b/net-im/dino/files/dino-0.4.3-c99.patch
new file mode 100644
index 000000000000..d21ff5e4adec
--- /dev/null
+++ b/net-im/dino/files/dino-0.4.3-c99.patch
@@ -0,0 +1,57 @@
+https://bugs.gentoo.org/926073
+https://github.com/dino/dino/commit/0c45387bf903e5b0d02502d27642dd2a78aa6539
+
+From 0c45387bf903e5b0d02502d27642dd2a78aa6539 Mon Sep 17 00:00:00 2001
+From: fiaxh <git@lightrise.org>
+Date: Sat, 7 Oct 2023 13:56:38 +0200
+Subject: [PATCH] Fix implicit-function-declaration compiler warnings
+
+--- a/xmpp-vala/src/module/xep/0384_omemo/omemo_encryptor.vala
++++ b/xmpp-vala/src/module/xep/0384_omemo/omemo_encryptor.vala
+@@ -72,27 +72,27 @@ namespace Xmpp.Xep.Omemo {
+ }
+
+ public class EncryptionResult {
+- public int lost { get; internal set; }
+- public int success { get; internal set; }
+- public int unknown { get; internal set; }
+- public int failure { get; internal set; }
++ public int lost { get; set; }
++ public int success { get; set; }
++ public int unknown { get; set; }
++ public int failure { get; set; }
+ }
+
+ public class EncryptState {
+- public bool encrypted { get; internal set; }
+- public int other_devices { get; internal set; }
+- public int other_success { get; internal set; }
+- public int other_lost { get; internal set; }
+- public int other_unknown { get; internal set; }
+- public int other_failure { get; internal set; }
+- public int other_waiting_lists { get; internal set; }
+-
+- public int own_devices { get; internal set; }
+- public int own_success { get; internal set; }
+- public int own_lost { get; internal set; }
+- public int own_unknown { get; internal set; }
+- public int own_failure { get; internal set; }
+- public bool own_list { get; internal set; }
++ public bool encrypted { get; set; }
++ public int other_devices { get; set; }
++ public int other_success { get; set; }
++ public int other_lost { get; set; }
++ public int other_unknown { get; set; }
++ public int other_failure { get; set; }
++ public int other_waiting_lists { get; set; }
++
++ public int own_devices { get; set; }
++ public int own_success { get; set; }
++ public int own_lost { get; set; }
++ public int own_unknown { get; set; }
++ public int own_failure { get; set; }
++ public bool own_list { get; set; }
+
+ public void add_result(EncryptionResult enc_res, bool own) {
+ if (own) {
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/dino/files/, net-im/dino/
@ 2024-07-03 0:59 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-07-03 0:59 UTC (permalink / raw
To: gentoo-commits
commit: 17b280061ae4915912092cb9ea6c7a6b89f6c86b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 3 00:59:07 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 3 00:59:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17b28006
net-im/dino: backport new Vala compile fix
This is in 0.4.4 but let's backport it so we can stable it quickly.
Closes: https://bugs.gentoo.org/930539
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-im/dino/dino-0.4.3-r1.ebuild | 1 +
net-im/dino/files/dino-0.4.3-vala-gpgme.patch | 32 +++++++++++++++++++++++++++
2 files changed, 33 insertions(+)
diff --git a/net-im/dino/dino-0.4.3-r1.ebuild b/net-im/dino/dino-0.4.3-r1.ebuild
index 0badcf1fd992..4f9c5a607668 100644
--- a/net-im/dino/dino-0.4.3-r1.ebuild
+++ b/net-im/dino/dino-0.4.3-r1.ebuild
@@ -63,6 +63,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${P}-c99.patch
+ "${FILESDIR}"/${P}-vala-gpgme.patch
)
src_configure() {
diff --git a/net-im/dino/files/dino-0.4.3-vala-gpgme.patch b/net-im/dino/files/dino-0.4.3-vala-gpgme.patch
new file mode 100644
index 000000000000..fa609a97d88d
--- /dev/null
+++ b/net-im/dino/files/dino-0.4.3-vala-gpgme.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/930539
+https://github.com/dino/dino/issues/1576
+https://github.com/dino/dino/commit/a90edd05389d2f8011eccda3acd5f24f3948b8b5
+
+From a90edd05389d2f8011eccda3acd5f24f3948b8b5 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sun, 28 Apr 2024 21:30:12 +0200
+Subject: [PATCH] Annotating with array_null_terminated doesn't imply a missing
+ array_length
+
+Taken from https://github.com/GNOME/vala-extra-vapis/commit/6b8a3e4faaabc462f90ffcb0cf0f91991ee58077
+---
+ plugins/gpgme-vala/vapi/gpgme_public.vapi | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/gpgme-vala/vapi/gpgme_public.vapi b/plugins/gpgme-vala/vapi/gpgme_public.vapi
+index bcf125696..4f9010c98 100644
+--- a/plugins/gpgme-vala/vapi/gpgme_public.vapi
++++ b/plugins/gpgme-vala/vapi/gpgme_public.vapi
+@@ -22,9 +22,9 @@ public class Key {
+ public string issuer_name;
+ public string chain_id;
+ public Validity owner_trust;
+- [CCode(array_null_terminated = true)]
++ [CCode (array_length = false, array_null_terminated = true)]
+ public SubKey[] subkeys;
+- [CCode(array_null_terminated = true)]
++ [CCode (array_length = false, array_null_terminated = true)]
+ public UserID[] uids;
+ public KeylistMode keylist_mode;
+ // public string fpr; // requires gpgme >= 1.7.0
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-07-03 0:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-03 0:59 [gentoo-commits] repo/gentoo:master commit in: net-im/dino/files/, net-im/dino/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-03-04 5:45 Sam James
2021-10-22 12:09 Andrey Utkin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox