[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: jami-libclient: Properly return the list of
From: |
guix-commits |
Subject: |
branch master updated: gnu: jami-libclient: Properly return the list of audio managers. |
Date: |
Thu, 27 Jan 2022 14:30:32 -0500 |
This is an automated email from the git hooks/post-receive script.
apteryx pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 1916d6df6f gnu: jami-libclient: Properly return the list of audio
managers.
1916d6df6f is described below
commit 1916d6df6fc03a788bc4bbb56c01bdeb15fc8389
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Jan 27 13:57:54 2022 -0500
gnu: jami-libclient: Properly return the list of audio managers.
* gnu/packages/patches/jami-libclient-audio-managers.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/jami.scm (jami)[source]: Move all patches to...
(%jami-sources): here and add the newly added patch.
---
gnu/local.mk | 1 +
gnu/packages/jami.scm | 10 +++++-----
.../patches/jami-libclient-audio-managers.patch | 23 ++++++++++++++++++++++
3 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index b52e7b29cb..27e7877361 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1301,6 +1301,7 @@ dist_patch_DATA =
\
%D%/packages/patches/jami-fix-crash-on-quit.patch \
%D%/packages/patches/jami-images-loading.patch \
%D%/packages/patches/jami-memory-usage.patch \
+ %D%/packages/patches/jami-libclient-audio-managers.patch \
%D%/packages/patches/jamvm-1.5.1-aarch64-support.patch \
%D%/packages/patches/jamvm-1.5.1-armv7-support.patch \
%D%/packages/patches/jamvm-2.0.0-aarch64-support.patch \
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index c4300daf1b..443e42e2db 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -86,6 +86,10 @@
"client-ios"
"client-macosx"
"client-uwp"))))
+ (patches (search-patches "jami-libclient-audio-managers.patch"
+ "jami-fix-crash-on-quit.patch"
+ "jami-images-loading.patch"
+ "jami-memory-usage.patch"))
(sha256
(base32
"12h4a0nj3gh05w64gkywrrb64agrhn6y3q4b9cqnhvr1vdkzlj0h"))))
@@ -566,11 +570,7 @@ decentralized calling using P2P-DHT.")
(package
(name "jami")
(version %jami-version)
- (source (origin
- (inherit %jami-sources)
- (patches (search-patches "jami-fix-crash-on-quit.patch"
- "jami-images-loading.patch"
- "jami-memory-usage.patch"))))
+ (source %jami-sources)
(build-system qt-build-system)
(outputs '("out" "debug"))
(arguments
diff --git a/gnu/packages/patches/jami-libclient-audio-managers.patch
b/gnu/packages/patches/jami-libclient-audio-managers.patch
new file mode 100644
index 0000000000..1f8a5585e6
--- /dev/null
+++ b/gnu/packages/patches/jami-libclient-audio-managers.patch
@@ -0,0 +1,23 @@
+From f5e4619d02526d961c14012a6cae1a091aa149d4 Mon Sep 17 00:00:00 2001
+From: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
+Date: Thu, 27 Jan 2022 13:48:32 -0500
+Subject: [PATCH] misc: link getSupportedAudioManagers
+q
+Change-Id: I897e49cd131d3cbffef9fb1d5c9be3c0bc9bcb3f
+GitLab: #495
+---
+
+diff --git a/lrc/src/qtwrapper/configurationmanager_wrap.h
b/lrc/src/qtwrapper/configurationmanager_wrap.h
+index a680138..2807f8a 100644
+--- a/lrc/src/qtwrapper/configurationmanager_wrap.h
++++ b/lrc/src/qtwrapper/configurationmanager_wrap.h
+@@ -526,8 +526,7 @@
+
+ QStringList getSupportedAudioManagers()
+ {
+- QStringList temp;
+- return temp;
++ return convertStringList(DRing::getSupportedAudioManagers());
+ }
+
+ QStringList getSupportedTlsMethod()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: jami-libclient: Properly return the list of audio managers.,
guix-commits <=