From patchwork Wed Mar 31 17:22:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28232 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A0B2827BC67; Wed, 31 Mar 2021 18:24:42 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DB22627BC65 for ; Wed, 31 Mar 2021 18:24:41 +0100 (BST) Received: from localhost ([::1]:47678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRea9-0008Eu-1N for patchwork@mira.cbaines.net; Wed, 31 Mar 2021 13:24:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lReZc-0007Tu-LP for guix-patches@gnu.org; Wed, 31 Mar 2021 13:24:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43894) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lReZa-0006Fs-Ia for guix-patches@gnu.org; Wed, 31 Mar 2021 13:24:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lReZa-0002y5-Eq for guix-patches@gnu.org; Wed, 31 Mar 2021 13:24:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH v2 10/12] gnu: libringclient: Update to 20210326.1.cfba013. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Mar 2021 17:24:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47513 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47513@debbugs.gnu.org Cc: Jack Hill , Maxime Devos , Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161721139411256 (code B ref 47513); Wed, 31 Mar 2021 17:24:06 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 17:23:14 +0000 Received: from localhost ([127.0.0.1]:55424 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lReYk-0002vO-3f for submit@debbugs.gnu.org; Wed, 31 Mar 2021 13:23:14 -0400 Received: from mail-qk1-f179.google.com ([209.85.222.179]:38785) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lReYe-0002tL-0H for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 13:23:08 -0400 Received: by mail-qk1-f179.google.com with SMTP id c3so20109696qkc.5 for <47513@debbugs.gnu.org>; Wed, 31 Mar 2021 10:23:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dFPTWNQ0V1f5jWKp2QLMCO5e8lFAu8XzgN+IjskTL2k=; b=H783kTXVF1+7bOryHD/DHtTJ9CD6NTRhyWtaFA8/SAkx39mjlukYfIEC/oCJ7GZZG0 rD0NMyEHvvoKSOTf0KsEhcaeZf5SPv94MwhDxR4jqFr/Q9icvV8xkczHXvnTb7tmXOzX nO82CCfrNy18T9+Qb2ENCZNabA9U83cr+S67ApgQmFcT9y4jGlU/UPdg3z7GPr3JlUlM MfGnlWry1G8Wz7GeXWge+l/jDWZtN+titWNV2IMCuh6LmQ1gJoN7zXHyMq9jYwZtJgcP sqt7xZUfEh6rxSnyK5hfhwYN2LXaRNgNwbmP1x78V6vQChvS7Fk5sdfeKG2vAds/ZglX P6kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dFPTWNQ0V1f5jWKp2QLMCO5e8lFAu8XzgN+IjskTL2k=; b=NMs4VNV7nAEOt93RtfLUPPm/jgS8X97Vd2Pcxyv0eyEsoKRoi4jnSfCp/6InBeH2Yz Paqe5TzUSkiKLMrJSX7BDAEkAlVHZZIA5nlhf+VkebhkspF4Z4wEB/URza4nJVH4yoRj QaVFSkJhJ/PCVlkMTRt1xFAG9JTIWMvkqj4GUG+3FehAzwMlt3X25zV1RJGPLMmCrZ5X foLkY9r2ySX0/V9jZZKdQfT/VHtZbxdsdE7kVYMGe9DUfP+uB4dyDmkuUJ/9JNW0Q/ua 4maymYENmvOqjPJcSSbxbrgUNmG9fDLKuR7DL2LT2WT7qPxdHsWF3byzullVMpaUM3bu J/XQ== X-Gm-Message-State: AOAM532z99RJnRmVCpjwH9lh/Lr2/vNAhq1331aeFVUiTBSmrjEbLGq5 zjWKHECC0pVhUuQkvV6a+XEHLSYQOXzyag== X-Google-Smtp-Source: ABdhPJzvyF23yFDLpb7nmukzmIpY1EVSW2945O8pZDXk/VeoSDJ/v5CX9FaB0+OOCL4Nbu4rfCylKQ== X-Received: by 2002:a37:4185:: with SMTP id o127mr4225740qka.247.1617211382481; Wed, 31 Mar 2021 10:23:02 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id c5sm1891349qkg.105.2021.03.31.10.23.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Mar 2021 10:23:02 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 13:22:30 -0400 Message-Id: <20210331172232.22483-10-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210331172232.22483-1-maxim.cournoyer@gmail.com> References: <20210331172232.22483-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/jami.scm (libringclient): Update to 20210326.1.cfba013. Remove trailing #t. Do not inherit from libring. [version, source]: Specify fields. [propagated-inputs]: Remove qttools. Move libring to ... [inputs]: ... here. Add network-manager. [configure-flags] Define the RING_XML_INTERFACES_DIR variable. [phases]{fix-dbus-interfaces-path}: Delete. [synopsis]: More explicitly describe what this component is. [description]: Describe the specifics before the generalities. --- gnu/packages/jami.scm | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index ddb4b35349..41fa69dd48 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -477,37 +477,33 @@ protocols, as well as decentralized calling using P2P-DHT.") (define-public libringclient (package - (inherit libring) (name "libringclient") + (version %jami-version) + (source %jami-sources) (build-system cmake-build-system) + (inputs + `(("libring" ,libring) + ("network-manager" ,network-manager))) (propagated-inputs - `(("libring" ,libring) ; For 'dring'. - ("qtbase" ,qtbase) ; Qt is included in several installed headers. - ("qttools" ,qttools))) + `(("qtbase" ,qtbase))) ; Qt is included in several installed headers. (arguments `(#:tests? #f ; There is no testsuite. #:configure-flags - (list (string-append "-DRING_BUILD_DIR=" - (assoc-ref %build-inputs "libring") "/include")) + (let ((libring (assoc-ref %build-inputs "libring"))) + (list (string-append "-DRING_XML_INTERFACES_DIR=" + libring "/share/dbus-1/interfaces") + (string-append "-DRING_BUILD_DIR=" 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, -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.") + (chdir "lrc")))))) + (synopsis "Jami client library") + (description "This package provides a library common to all Jami clients. +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+)))