unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
To: 42229@debbugs.gnu.org
Cc: Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
Subject: [bug#42229] [PATCH 2/9] gnu: libringclient: Fetch from git, update to 20200702-guix.
Date: Mon,  6 Jul 2020 17:50:23 +0200	[thread overview]
Message-ID: <20200706155030.1938-2-tona_kosmicznego_smiecia@interia.pl> (raw)
In-Reply-To: <20200706155030.1938-1-tona_kosmicznego_smiecia@interia.pl>

* 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





  reply	other threads:[~2020-07-06 15:52 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-06 15:34 [bug#42229] [PATCH 0/9] Jami update and refactor Jan Wielkiewicz
2020-07-06 15:50 ` [bug#42229] [PATCH 1/9] gnu: libring: Fetch from git, update to 20200702-guix Jan Wielkiewicz
2020-07-06 15:50   ` Jan Wielkiewicz [this message]
2020-07-06 15:50   ` [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 15:50   ` [bug#42229] [PATCH 4/9] gnu: jami: Fetch from git, update to 20200702-guix Jan Wielkiewicz
2020-07-06 15:50   ` [bug#42229] [PATCH 5/9] gnu: pjproject-jami: Make sure phases are run in order Jan Wielkiewicz
2020-08-04  4:20     ` maxim.cournoyer
2020-08-04 13:05       ` Jan Wielkiewicz
2020-07-06 15:50   ` [bug#42229] [PATCH 6/9] gnu: jami: Add libnm as input Jan Wielkiewicz
2020-07-06 21:24     ` Christopher Baines
2020-07-10 18:03       ` Jan Wielkiewicz
2020-07-06 15:50   ` [bug#42229] [PATCH 7/9] gnu: libringclient: Do not propagate qtbase in libringclient Jan Wielkiewicz
2020-07-06 20:56     ` Christopher Baines
2020-07-07 23:13       ` Jan Wielkiewicz
2020-07-06 15:50   ` [bug#42229] [PATCH 8/9] gnu: jami: Fix compilation by providing necessary webchat files Jan Wielkiewicz
2020-07-06 21:19     ` Christopher Baines
2020-07-07 21:22       ` Jan Wielkiewicz
2020-07-08 19:14         ` Christopher Baines
2020-07-07 23:07       ` Jan Wielkiewicz
2020-08-04  4:40     ` maxim.cournoyer
2020-08-04 13:02       ` Jan Wielkiewicz
2020-07-06 15:50   ` [bug#42229] [PATCH 9/9] gnu: pjproject-jami: Fix assertion by disabling debugging Jan Wielkiewicz
2020-07-10 18:32 ` [bug#42229] [[PATCH V2] 01/10] gnu: libring: Fetch from git, update to 20200708-guix Jan Wielkiewicz
2020-07-10 18:32   ` [bug#42229] [[PATCH V2] 02/10] gnu: libringclient: Fetch from git, update to 20200702-guix Jan Wielkiewicz
2020-07-10 18:32   ` [bug#42229] [[PATCH V2] 03/10] gnu: jami-apply-dependency-patches, ffmpeg-jami, pjproject-jami: Apply patches from the new libring source Jan Wielkiewicz
2020-07-11 19:52     ` Christopher Baines
2020-07-10 18:32   ` [bug#42229] [[PATCH V2] 04/10] gnu: jami: Fetch from git, update to 20200702-guix Jan Wielkiewicz
2020-07-10 18:32   ` [bug#42229] [[PATCH V2] 05/10] gnu: pjproject-jami: Make sure phases are run in order Jan Wielkiewicz
2020-07-11 19:57     ` Christopher Baines
2020-07-10 18:32   ` [bug#42229] [[PATCH V2] 06/10] gnu: jami: Add libnm as input Jan Wielkiewicz
2020-07-10 18:32   ` [bug#42229] [[PATCH V2] 07/10] gnu: jami: Fix compilation by providing necessary webchat files Jan Wielkiewicz
2020-07-10 18:32   ` [bug#42229] [[PATCH V2] 08/10] gnu: pjproject-jami: Fix assertion by disabling debugging Jan Wielkiewicz
2020-07-10 18:32   ` [bug#42229] [[PATCH V2] 09/10] gnu: opendht: Fix libring compilation Jan Wielkiewicz
2020-07-11 20:12     ` Christopher Baines
2020-07-10 18:32   ` [bug#42229] [[PATCH V2] 10/10] gnu: jami-client-gnome: Remove deprecated package Jan Wielkiewicz
2020-07-11 19:51   ` [bug#42229] [[PATCH V2] 01/10] gnu: libring: Fetch from git, update to 20200708-guix Christopher Baines
2020-07-12 16:00 ` [bug#42229] [[PATCH v3] 1/4] gnu: jami-client-gnome: Remove deprecated package Jan Wielkiewicz
2020-07-12 16:00   ` [bug#42229] [[PATCH v3] 2/4] gnu: opendht: Fix compilation of software using this package Jan Wielkiewicz
2020-07-12 16:00   ` [bug#42229] [[PATCH v3] 3/4] gnu: jami: Bump to 20200710.1.6bd18d2 Jan Wielkiewicz
2020-07-12 16:00   ` [bug#42229] [[PATCH v3] 4/4] gnu: pjproject-jami: Fix assertion bug Jan Wielkiewicz
2020-07-12 19:36   ` [bug#42229] [[PATCH v3] 1/4] gnu: jami-client-gnome: Remove deprecated package Christopher Baines
2021-03-31  5:27 ` bug#42229: [PATCH 0/9] Jami update and refactor Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200706155030.1938-2-tona_kosmicznego_smiecia@interia.pl \
    --to=tona_kosmicznego_smiecia@interia.pl \
    --cc=42229@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).