From patchwork Mon Jul 6 15:50:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 23085 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 7FCD927BBE3; Mon, 6 Jul 2020 16:51:31 +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_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, 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 ESMTP id A98FA27BBE1 for ; Mon, 6 Jul 2020 16:51:30 +0100 (BST) Received: from localhost ([::1]:37262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsTP0-0001Ve-6w for patchwork@mira.cbaines.net; Mon, 06 Jul 2020 11:51:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsTOa-0000pO-9y for guix-patches@gnu.org; Mon, 06 Jul 2020 11:51:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51410) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jsTOa-0000F8-0n for guix-patches@gnu.org; Mon, 06 Jul 2020 11:51:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jsTOZ-0001fr-W7 for guix-patches@gnu.org; Mon, 06 Jul 2020 11:51:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42229] [PATCH 4/9] gnu: jami: 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.15940506506356 (code B ref 42229); Mon, 06 Jul 2020 15:51:03 +0000 Received: (at 42229) by debbugs.gnu.org; 6 Jul 2020 15:50:50 +0000 Received: from localhost ([127.0.0.1]:34711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jsTOL-0001eL-Fc for submit@debbugs.gnu.org; Mon, 06 Jul 2020 11:50:49 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.153]:39741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jsTOF-0001ct-A6 for 42229@debbugs.gnu.org; Mon, 06 Jul 2020 11:50:45 -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:25 +0200 Message-Id: <20200706155030.1938-4-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 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1594050637; bh=G2N/QBRXjJKUd49nAeyHyf4f6SSHAYJ3X2Xqlw989Q4=; 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=ZRWD0yeaKU/5P7s8mUcGgTjbjRS115wEOh5MJLt/IW0k7djJ+jQziruOtMZHuANzA F6sE0jkYo30ZfgpwMlOP6Qe2tZ/jkMffg+Hiysnp6lDjVCI5AO+CmVD4CD4tuemq0h yAmAIe6UtCmGOkTGoB+iFyJp+FlhhF7F5FMZts3s= 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: (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))