[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/12: gnu: jami: Update to 20210326.1.cfba013 and rename to jami-gnome.
From: |
guix-commits |
Subject: |
11/12: gnu: jami: Update to 20210326.1.cfba013 and rename to jami-gnome. |
Date: |
Fri, 2 Apr 2021 07:47:37 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 60e64e28f3a5d8eaf5659b655af9b027eb396f1f
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Mar 30 22:45:34 2021 -0400
gnu: jami: Update to 20210326.1.cfba013 and rename to jami-gnome.
* gnu/packages/jami.scm (jami): Update to 20210326.1.cfba013. Rename to ...
(jami-gnome): ... this, in prevision to the soon released Jami Qt client.
(jami): Define as obsoleted by jami-gnome.
[inputs]: Sort lexico-graphically. Add libappindicator and network-manager.
[native-inputs]: Add a comment and fix a typo. Remove doxygen.
[propagated-inputs]: Remove evolution-data-server.
[synopsis]: More explicitly describe what this package is.
[description]: Describe the specifics before the generalities.
---
gnu/packages/jami.scm | 54 ++++++++++++++++++++++++++++-----------------------
1 file changed, 30 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 2d52b4b..e65e477 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -28,6 +28,7 @@
#:use-module (gnu packages base)
#:use-module (gnu packages crypto)
#:use-module (gnu packages documentation)
+ #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
@@ -509,44 +510,49 @@ decentralized calling using P2P-DHT.")
(home-page "https://jami.net")
(license license:gpl3+)))
-(define-public jami
+(define-public jami-gnome
(package
- (inherit libring)
- (name "jami")
+ (name "jami-gnome")
+ (version %jami-version)
+ (source %jami-sources)
(build-system cmake-build-system)
(inputs
- `(("libringclient" ,libringclient)
- ("gtk+" ,gtk+)
- ("qrencode" ,qrencode)
- ("libnotify" ,libnotify)
- ("clutter" ,clutter)
+ `(("clutter" ,clutter)
("clutter-gtk" ,clutter-gtk)
+ ("gtk+" ,gtk+)
("libcanberra" ,libcanberra)
- ("webkitgtk" ,webkitgtk)
- ("sqlite" ,sqlite)))
+ ("libappindicator" ,libappindicator)
+ ("libnotify" ,libnotify)
+ ("libringclient" ,libringclient)
+ ("network-manager" ,network-manager)
+ ("qrencode" ,qrencode)
+ ("sqlite" ,sqlite)
+ ("webkitgtk" ,webkitgtk)))
(native-inputs
`(("pkg-config" ,pkg-config)
("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin")
- ("doxygen" ,doxygen)))
+ ("glib:bin" ,glib "bin"))) ;for glib-compile-resources
(propagated-inputs
- `(("libring" ,libring) ; Contains `dring', the daemon, which is
automatically by d-bus.
- ("adwaita-icon-theme" ,adwaita-icon-theme)
- ("evolution-data-server" ,evolution-data-server)))
+ `(("libring" ,libring) ; Contains 'dring', the daemon, which is
+ ; automatically started by DBus.
+ ("adwaita-icon-theme" ,adwaita-icon-theme)))
(arguments
`(#:tests? #f ; There is no testsuite.
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'change-directory
(lambda _
- (chdir "client-gnome")
- #t)))))
- (synopsis "Distributed, privacy-respecting communication program")
- (description "Jami (formerly GNU Ring) is a secure and distributed voice,
-video and chat communication platform that requires no centralized server and
-leaves the power of privacy in the hands of the user. It supports the SIP and
-IAX protocols, as well as decentralized calling using P2P-DHT.
-
-This package provides the Jami client for the GNOME desktop.")
+ (chdir "client-gnome"))))))
+ (synopsis "Jami client for GNOME")
+ (description "This package provides a Jami client for the GNOME desktop.
+Jami is a secure and distributed voice, video and chat communication platform
+that requires no centralized server and leaves the power of privacy in the
+hands of the user. It supports the SIP and IAX protocols, as well as
+decentralized calling using P2P-DHT.")
(home-page "https://jami.net")
(license license:gpl3+)))
+
+;;; Keep this until the Qt client matures enough to become the
+;;; main 'jami' client.
+(define-public jami
+ (deprecated-package "jami" jami-gnome))
- 01/12: gnu: asio: Update to 1.18.1., (continued)
- 01/12: gnu: asio: Update to 1.18.1., guix-commits, 2021/04/02
- 03/12: gnu: restinio: Update to 0.6.13., guix-commits, 2021/04/02
- 05/12: gnu: opendht: Update to 2.2.0rc4., guix-commits, 2021/04/02
- 02/12: gnu: restbed: Update to 4.7., guix-commits, 2021/04/02
- 04/12: gnu: Add nettle-3.7., guix-commits, 2021/04/02
- 06/12: gnu: pjproject: Update to 2.11., guix-commits, 2021/04/02
- 08/12: ffmpeg-jami: Apply patches from Jami 20210326.1.cfba013., guix-commits, 2021/04/02
- 10/12: gnu: libringclient: Update to 20210326.1.cfba013., guix-commits, 2021/04/02
- 12/12: gnu: Add jami-qt., guix-commits, 2021/04/02
- 09/12: gnu: libring: Update to 20210326.1.cfba013., guix-commits, 2021/04/02
- 11/12: gnu: jami: Update to 20210326.1.cfba013 and rename to jami-gnome.,
guix-commits <=
- 07/12: gnu: pjproject-jami: Fix CVE-2020-15260 and CVE-2021-21375., guix-commits, 2021/04/02