summary refs log tree commit diff
path: root/gnu/packages
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-01-27 13:57:54 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-01-27 14:01:34 -0500
commit1916d6df6fc03a788bc4bbb56c01bdeb15fc8389 (patch)
tree5561b440b41b5360576435bd774faf57be6c5df6 /gnu/packages
parent95a74533f12a2636caafc93f24a8058adc8d27c9 (diff)
downloadguix-1916d6df6fc03a788bc4bbb56c01bdeb15fc8389.tar.gz
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.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/jami.scm10
-rw-r--r--gnu/packages/patches/jami-libclient-audio-managers.patch23
2 files changed, 28 insertions, 5 deletions
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()