From patchwork Wed Mar 31 05:23:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28219 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 B209E27BC66; Wed, 31 Mar 2021 06:26:27 +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 2D0FF27BC65 for ; Wed, 31 Mar 2021 06:26:27 +0100 (BST) Received: from localhost ([::1]:45546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRTN4-0001HJ-D2 for patchwork@mira.cbaines.net; Wed, 31 Mar 2021 01:26:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRTLm-0000VJ-5o for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41725) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRTLl-0006Pm-Sg for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRTLl-00037i-PO for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH 11/12] gnu: jami: Update to 20210326.1.cfba013 and rename to jami-gnome. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Mar 2021 05:25:05 +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: Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161716825311869 (code B ref 47513); Wed, 31 Mar 2021 05:25:05 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 05:24:13 +0000 Received: from localhost ([127.0.0.1]:53260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKu-00035H-Fm for submit@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:12 -0400 Received: from mail-qt1-f169.google.com ([209.85.160.169]:46993) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKo-00032l-46 for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:06 -0400 Received: by mail-qt1-f169.google.com with SMTP id y2so13637829qtw.13 for <47513@debbugs.gnu.org>; Tue, 30 Mar 2021 22:24:06 -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=64NZXJcNWJYncSbMBO+/mY3Jp1zzgi4CQAl8YbvYHtM=; b=kFBDZqmfdJ4BXl4xDYjNcfZUHi6112DOw9WnT9Ofim/Y+vUWynkEkoNUHX3vmWQNXu 560U7xHHkb05lrLJJeLnZG/5yqeG0sinychXxU0vExYWrfvIj9HW1yD/m7p9ADdqUGfl T+HPmCIKGjUNNik97LpZdgj/S9Vw3y4ea4V+J2d1pGlgqfuAa6SawaAWhVd1SaOj7LFs xdHL1DKVbXlA84TE/GsPdgYbhqIrWIab5OTLoxcTPXVGvMfIPFPPlPlD2qtF2s1nILLa fuRox29W0V1VwLoH86dI7dyDZtEwxsGrawBDmKKVFHnaCj2oyiEor0ynqX7qwgf924yI bqTA== 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=64NZXJcNWJYncSbMBO+/mY3Jp1zzgi4CQAl8YbvYHtM=; b=twjJhgz0oeTCX/K5AH23+6InKpoVFfUVFOiHZC0ZW+hQ6kbB5f8dYCMZnjpqkarpnP zEzdmch+xW8v0XWilAx1oAl3NioIIE0Xw/yBmdWOv4BPbY81yUtUJD2QTbOStWk+vIAB gZ4gxb1pqKasl/BYx7oLcFoVh1yPXsh+4o4ZJFMctqN9oC0Y3RwRdCaaAFOYziofoDKd kP+MYU2jfgcSO4WTVHZuDDCCx0hKhr0rf17ovjn0nQHQKk0Lmw8kZc9tnE4bXUayKHmW T/EPI3ABxQHwwVnAtv0zMM8z3ZgioU4l9YojmVXAKLOxA9SMJwU8YwQV9KI8LXt87poh 2Gkw== X-Gm-Message-State: AOAM530S4We9tOXisw+t7CBQJGg46LfFTthFaW9dm7EAroBNzAePn3xC 8CujF4ckv0HBfJxwKnkmZ2+bZtHrUvM= X-Google-Smtp-Source: ABdhPJxWToJSUmAm05mt9L47GXB2YbsieHpHvVQPwSklafqWsHpgONLMBtlJIOoXw4VJtPbSVKQH5w== X-Received: by 2002:ac8:588e:: with SMTP id t14mr986699qta.123.1617168240331; Tue, 30 Mar 2021 22:24:00 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id q64sm828662qtd.32.2021.03.30.22.23.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 22:23:59 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 01:23:47 -0400 Message-Id: <20210331052348.5164-11-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210331052348.5164-1-maxim.cournoyer@gmail.com> References: <20210331052348.5164-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 (jami): Update to 20210326.1.cfba013. Rename to ... (jami-gnome): In prevision of the soon released Jami Qt client. (jami): Define as obsoleted by jami-gnome. [inputs]: Sort lexico-graphically. Add libappindicator and network-manager. [native-inputs]: Add a comment and fix a typo. Remove doxygen. [propagated-inputs]: Remove evolution-data-server. [synopsis]: More explicitly describe what this package is. [description]: Describe the specifics before the generalities. --- gnu/packages/jami.scm | 53 +++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 41fa69dd48..79dbb39f5a 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages documentation) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -507,44 +508,48 @@ decentralized calling using P2P-DHT.") (home-page "https://jami.net") (license license:gpl3+))) -(define-public jami +(define-public jami-gnome (package - (inherit libring) - (name "jami") + (name "jami-gnome") + (version %jami-version) + (source %jami-sources) (build-system cmake-build-system) (inputs - `(("libringclient" ,libringclient) - ("gtk+" ,gtk+) - ("qrencode" ,qrencode) - ("libnotify" ,libnotify) - ("clutter" ,clutter) + `(("clutter" ,clutter) ("clutter-gtk" ,clutter-gtk) + ("gtk+" ,gtk+) ("libcanberra" ,libcanberra) - ("webkitgtk" ,webkitgtk) - ("sqlite" ,sqlite))) + ("libappindicator" ,libappindicator) + ("libnotify" ,libnotify) + ("libringclient" ,libringclient) + ("network-manager" ,network-manager) + ("qrencode" ,qrencode) + ("sqlite" ,sqlite) + ("webkitgtk" ,webkitgtk))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("doxygen" ,doxygen))) + ("glib:bin" ,glib "bin"))) ;for glib-compile-resources (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))) + `(("libring" ,libring) ; Contains 'dring', the daemon, which is + ; automatically started by DBus. + ("adwaita-icon-theme" ,adwaita-icon-theme))) (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, -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.") + (chdir "client-gnome")))))) + (synopsis "Jami client for GNOME") + (description "This package provides a Jami client for the GNOME desktop. +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+))) + +;;; Keep this until the Qt client matures enough to become the +;;; main 'jami' client. +(deprecated-package jami jami-gnome)