[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#42229] [PATCH 2/9] gnu: libringclient: Fetch from git, update to 20
From: |
Jan Wielkiewicz |
Subject: |
[bug#42229] [PATCH 2/9] gnu: libringclient: Fetch from git, update to 20200702-guix. |
Date: |
Mon, 6 Jul 2020 17:50:23 +0200 |
* gnu/packages/jami.scm
(libringclient):
[revision, commit]: New variables.
Do not inherit from (libring).
[version]: Use (%jami-version, revision, commit).
[source]: Fetch from git.
---
gnu/packages/jami.scm | 65 ++++++++++++++++++++++++-------------------
1 file changed, 36 insertions(+), 29 deletions(-)
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index d94a162772..ef2a74abb3 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -516,40 +516,47 @@ functionality.")
(license license:gpl3+)))
(define-public libringclient
- (package
- (inherit libring)
- (name "libringclient")
- (build-system cmake-build-system)
- (propagated-inputs
- `(("libring" ,libring) ; For 'dring'.
- ("qtbase" ,qtbase) ; Qt is included in several installed headers.
- ("qttools" ,qttools)))
- (arguments
- `(#:tests? #f ; There is no testsuite.
- #:configure-flags
- (list (string-append "-DRING_BUILD_DIR="
- (assoc-ref %build-inputs "libring") "/include"))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'change-directory
- (lambda _
- (chdir "lrc")
- #t))
- (add-before 'configure 'fix-dbus-interfaces-path
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "CMakeLists.txt"
- (("\\$\\{CMAKE_INSTALL_PREFIX\\}(/share/dbus-1/interfaces)" _
dbus-interfaces-path-suffix)
- (string-append (assoc-ref inputs "libring")
- dbus-interfaces-path-suffix))))))))
- (synopsis "Distributed multimedia communications platform")
- (description "Jami (formerly GNU Ring) is a secure and distributed voice,
+ (let ((commit "db943766917eba7be3a6f89d41794c2d26363ab7")
+ (revision "0"))
+ (package
+ (name "libringclient")
+ (version (git-version %jami-version revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://review.jami.net/ring-lrc")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1s1wi80drabfjhvxbiyl8k9c2jsafvmx5v84s3wldsmmdg4f6xdf"))))
+ (build-system cmake-build-system)
+ (propagated-inputs
+ `(("libring" ,libring) ; For 'dring'.
+ ("qtbase" ,qtbase) ; Qt is included in several installed
headers.
+ ("qttools" ,qttools)))
+ (arguments
+ `(#:tests? #f ; There is no testsuite.
+ #:configure-flags
+ (list (string-append "-DRING_BUILD_DIR="
+ (assoc-ref %build-inputs "libring") "/include"))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'fix-dbus-interfaces-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "CMakeLists.txt"
+ (("\\$\\{CMAKE_INSTALL_PREFIX\\}(/share/dbus-1/interfaces)" _
dbus-interfaces-path-suffix)
+ (string-append (assoc-ref inputs "libring")
+ dbus-interfaces-path-suffix))))))))
+ (synopsis "Distributed multimedia communications platform")
+ (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 a library common to all Jami clients.")
- (home-page "https://jami.net")
- (license license:gpl3+)))
+ (home-page "https://jami.net")
+ (license license:gpl3+))))
(define-public jami
(package
--
2.27.0
- [bug#42229] [PATCH 0/9] Jami update and refactor, Jan Wielkiewicz, 2020/07/06
- [bug#42229] [PATCH 1/9] gnu: libring: Fetch from git, update to 20200702-guix., Jan Wielkiewicz, 2020/07/06
- [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 <=
- [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, 2020/07/06
- [bug#42229] [PATCH 8/9] gnu: jami: Fix compilation by providing necessary webchat files., Jan Wielkiewicz, 2020/07/06