[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#42229] [PATCH 4/9] gnu: jami: Fetch from git, update to 20200702-gu
From: |
Jan Wielkiewicz |
Subject: |
[bug#42229] [PATCH 4/9] gnu: jami: Fetch from git, update to 20200702-guix. |
Date: |
Mon, 6 Jul 2020 17:50:25 +0200 |
* gnu/packages/jami.scm:
(jami)[revision, commit]: New variables.
[version]: Use [%jami-version, revision, commit].
[source]: Fetch from git.
[arguments]: Do not change the directory.
---
gnu/packages/jami.scm | 76 +++++++++++++++++++++++--------------------
1 file changed, 41 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 4531c68f5c..a6ce1aaa3f 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -558,46 +558,52 @@ This package provides a library common to all Jami
clients.")
(license license:gpl3+))))
(define-public jami
- (package
- (inherit libring)
- (name "jami")
- (build-system cmake-build-system)
- (inputs
- `(("libringclient" ,libringclient)
- ("gtk+" ,gtk+)
- ("qrencode" ,qrencode)
- ("libnotify" ,libnotify)
- ("clutter" ,clutter)
- ("clutter-gtk" ,clutter-gtk)
- ("libcanberra" ,libcanberra)
- ("webkitgtk" ,webkitgtk)
- ("sqlite" ,sqlite)))
- (native-inputs
- `(("pkg-config" ,pkg-config)
- ("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin")
- ("doxygen" ,doxygen)))
- (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)))
- (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,
+ (let ((commit "85cda2e1fde84230f6b9f5419f9ec1e23867c2a1")
+ (revision "0"))
+ (package
+ (name "jami")
+ (version (git-version %jami-version revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://review.jami.net/ring-client-gnome")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0xzcx8x04yc8m8b2vf7sxfgw79idbm0hifzaw4s2vh26hyy9sp2g"))))
+ (build-system cmake-build-system)
+ (inputs
+ `(("libringclient" ,libringclient)
+ ("gtk+" ,gtk+)
+ ("qtbase" ,qtbase)
+ ("qrencode" ,qrencode)
+ ("libnotify" ,libnotify)
+ ("clutter" ,clutter)
+ ("clutter-gtk" ,clutter-gtk)
+ ("libcanberra" ,libcanberra)
+ ("webkitgtk" ,webkitgtk)
+ ("sqlite" ,sqlite)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("gettext" ,gettext-minimal)
+ ("glib:bin" ,glib "bin")
+ ("doxygen" ,doxygen)))
+ (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)))
+ (arguments
+ `(#:tests? #f)) ; There is no testsuite.
+ (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.")
- (home-page "https://jami.net")
- (license license:gpl3+)))
+ (home-page "https://jami.net")
+ (license license:gpl3+))))
(define-public jami-client-gnome
(deprecated-package "jami-client-gnome" jami))
--
2.27.0
- [bug#42229] [PATCH 7/9] gnu: libringclient: Do not propagate qtbase in libringclient., (continued)
- [bug#42229] [PATCH 3/9] gnu: jami-apply-dependency-patches, ffmpeg-jami, pjproject-jami: Apply patches from the new libring source., Jan Wielkiewicz, 2020/07/06
- [bug#42229] [PATCH 2/9] gnu: libringclient: Fetch from git, update to 20200702-guix., Jan Wielkiewicz, 2020/07/06
- [bug#42229] [PATCH 9/9] gnu: pjproject-jami: Fix assertion by disabling debugging., Jan Wielkiewicz, 2020/07/06
- [bug#42229] [PATCH 5/9] gnu: pjproject-jami: Make sure phases are run in order., Jan Wielkiewicz, 2020/07/06
- [bug#42229] [PATCH 6/9] gnu: jami: Add libnm as input., Jan Wielkiewicz, 2020/07/06
[bug#42229] [PATCH 4/9] gnu: jami: Fetch from git, update to 20200702-guix.,
Jan Wielkiewicz <=
[bug#42229] [PATCH 8/9] gnu: jami: Fix compilation by providing necessary webchat files., Jan Wielkiewicz, 2020/07/06
[bug#42229] [PATCH 8/9] gnu: jami: Fix compilation by providing necessary webchat files., Jan Wielkiewicz, 2020/07/07
[bug#42229] [[PATCH V2] 01/10] gnu: libring: Fetch from git, update to 20200708-guix., Jan Wielkiewicz, 2020/07/10