diff options
| author | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/telephony.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/telephony.scm')
| -rw-r--r-- | gnu/packages/telephony.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index af7148bf84..48bbe12920 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 Francesco Frassinelli <[email protected]> ;;; Copyright © 2016, 2017 Nikita <[email protected]> ;;; Copyright © 2017, 2018 Ricardo Wurmus <[email protected]> -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <[email protected]> +;;; Copyright © 2017, 2018, 2021 Tobias Geerinckx-Rice <[email protected]> ;;; Copyright © 2017 Adonay Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <[email protected]> ;;; Copyright © 2018 Jovany Leandro G.C <[email protected]> ;;; Copyright © 2018 Tim Gesthuizen <[email protected]> @@ -324,14 +324,14 @@ GNU ccRTP stack and serves as library for other RTP stacks (define-public osip (package (name "osip") - (version "5.2.0") + (version "5.2.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/osip/libosip2-" version ".tar.gz")) (patches (search-patches "osip-CVE-2017-7853.patch")) (sha256 (base32 - "0xdk3cszkzb8nb757gl47slrr13mf6xz43ab4k343fv8llp8pd2g")))) + "1wibs2zs035ay7qvl5ai8drv6f0xw7iscb0frmpgax3pisy88dzf")))) (build-system gnu-build-system) (synopsis "Library implementing SIP (RFC-3261)") @@ -636,14 +636,14 @@ address of one of the participants.") (inputs `(("avahi" ,avahi) ("boost" ,boost) - ("libsndfile" ,libsndfile) + ("libsndfile" ,libsndfile/fixed) ("libxi" ,libxi) ("mesa" ,mesa) ; avoid bundled ("openssl" ,openssl) ("opus" ,opus) ; avoid bundled ("protobuf" ,protobuf) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("speech-dispatcher" ,speech-dispatcher) ("speex" ,speex) ; avoid bundled @@ -705,7 +705,7 @@ Mumble consists of two applications for separate usage: ("libilbc" ,libilbc) ("libsndfile" ,libsndfile) ("libxml2" ,libxml2) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtquickcontrols" ,qtquickcontrols) ("readline" ,readline) |