From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id gOSsObJIA18fbAAA0tVLHw (envelope-from ) for ; Mon, 06 Jul 2020 15:52:18 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id cMqtNbJIA1/3CgAAB5/wlQ (envelope-from ) for ; Mon, 06 Jul 2020 15:52:18 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 85E659407C7 for ; Mon, 6 Jul 2020 15:52:18 +0000 (UTC) Received: from localhost ([::1]:40660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsTPl-00036J-IM for larch@yhetil.org; Mon, 06 Jul 2020 11:52:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsTOZ-0000oc-H2 for guix-patches@gnu.org; Mon, 06 Jul 2020 11:51:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51408) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jsTOZ-0000Eu-82 for guix-patches@gnu.org; Mon, 06 Jul 2020 11:51:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jsTOZ-0001fc-5h for guix-patches@gnu.org; Mon, 06 Jul 2020 11:51:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42229] [PATCH 2/9] gnu: libringclient: Fetch from git, update to 20200702-guix. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Jul 2020 15:51:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42229 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42229@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 42229-submit@debbugs.gnu.org id=B42229.15940506476338 (code B ref 42229); Mon, 06 Jul 2020 15:51:03 +0000 Received: (at 42229) by debbugs.gnu.org; 6 Jul 2020 15:50:47 +0000 Received: from localhost ([127.0.0.1]:34707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jsTOI-0001e0-Np for submit@debbugs.gnu.org; Mon, 06 Jul 2020 11:50:47 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.153]:49773) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jsTOF-0001cq-AB for 42229@debbugs.gnu.org; Mon, 06 Jul 2020 11:50:44 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.25 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-25.dynamic.chello.pl [89.64.43.25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Mon, 6 Jul 2020 17:50:36 +0200 (CEST) From: Jan Wielkiewicz Date: Mon, 6 Jul 2020 17:50:23 +0200 Message-Id: <20200706155030.1938-2-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200706155030.1938-1-tona_kosmicznego_smiecia@interia.pl> References: <20200706155030.1938-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1594050636; bh=jzTqAu08+EQIlFKYHBaOXhqUJF1RVjZe9drXV4rCk04=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Interia-Antivirus; b=G4PolecuyiOl6l+jvM5c7nLz2nQvTAypWGFA+wCK1by8SHIKa8JzentRV1CZER+kv /JEudhITG7BMku2wkpiMzAiB8IOOYZdIfHhd7/D+hQK6XNL0UqcUJpCUsuNmcwvoIY 6XcSvXrk0Wp8k+cPXA59K/Ytq4yP77nB6lrf6xk8= X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=interia.pl header.s=biztos header.b=G4Polecu; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 4.99 X-TUID: ewACPUzFtUSp * 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