From patchwork Wed Mar 31 05:23:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28217 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 E0B7727BC67; Wed, 31 Mar 2021 06:26:13 +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 0D27527BC66 for ; Wed, 31 Mar 2021 06:26:13 +0100 (BST) Received: from localhost ([::1]:45066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRTMq-00012H-7C for patchwork@mira.cbaines.net; Wed, 31 Mar 2021 01:26:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRTLn-0000X8-Ip for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41726) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRTLn-0006QW-A7 for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRTLm-00037q-78 for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH 12/12] gnu: Add jami-qt. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Mar 2021 05:25: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: Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161716825311875 (code B ref 47513); Wed, 31 Mar 2021 05:25:06 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 05:24:13 +0000 Received: from localhost ([127.0.0.1]:53262 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKu-00035O-TT for submit@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:13 -0400 Received: from mail-qt1-f174.google.com ([209.85.160.174]:36426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKo-00032x-Mx for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:07 -0400 Received: by mail-qt1-f174.google.com with SMTP id h7so13685882qtx.3 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=w/Uk02L9qE2cG3qjJPbghvxqSxijRjr3Cu9OPZ3hGCg=; b=mwsh7DVmqd/WKlTfxU69ejgJlNU8DhKBoAzTD46vftLgYMpzhqHNdL1yS5WPy+p61z 3yWO/qrBtHYLS5x0FcDMd/ed65vKwy6UYM69rkeJyRYVR4dpWlruCnEBPc6hzfNrkpj5 YEn+xygifTHLPIz0miBQEfKw5aD52M1/Q7IMArIJGIRdTP6ODaIgxUpNqNuCUiFepAEg tZe3VSaZdk4CvlqwzfiAXRxbcOQ/35bYJDBAl2QzZ0PD/viav1oUp2osGIkChWngZeAx srV7TM2cnzU8MRTRLaNDitPZ+wc+bOb8brrc/fc05WqgxM7XqOw/sSSjCIk+56XdmDrE /a8w== 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=w/Uk02L9qE2cG3qjJPbghvxqSxijRjr3Cu9OPZ3hGCg=; b=NILY6UHYxr3Msb7bqJqWmmbFytSaJfEoY8yGC4/pzu5StPL4OysUSHAjR60l9rcc0K r9UVZW43jcdmWFjyBnPvQSYHdJ+LzULDcBfksQKNeFIPYICRFjHU3eXLBNNNZ3HHfOF8 OsfYCaY3Nmug8q19BBjyGy8XsWOaMoHYke3403DsXnhQW63Taz5hAXjay+P//yoFKcUX Ej4dTaiCvxeqXYN3zU2Fb/j4adFGOf2Kehs7KFJ/9q5l0IYEDNZff48/mo7iyfnmrw67 Saru+RfbG7jtqTIhMXTnsVCv3G6vVDU/CQrhdGg2o8QK8u9ZVzZ5z74EuoIx18rR3jB4 bdkA== X-Gm-Message-State: AOAM530gLsd9DOfOjY+9lT3WnA8MrSAu1nMkOOLnkzlSzUW8rGTBr4uY DaNE9GgoUh8VL4ENd2c/jR5X11a2Dzk= X-Google-Smtp-Source: ABdhPJwDs5IsXbO6Ym2bFioLOqf9HHxyKrMx4g0cVQ0qbUCUWMwwIleK+K02hxpnoldJRxHQHWY4ZA== X-Received: by 2002:ac8:7776:: with SMTP id h22mr1056330qtu.325.1617168241015; Tue, 30 Mar 2021 22:24:01 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id q64sm828662qtd.32.2021.03.30.22.24.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 22:24:00 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 01:23:48 -0400 Message-Id: <20210331052348.5164-12-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-qt): New variable. --- gnu/packages/jami.scm | 66 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 79dbb39f5a..67befe63a2 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -36,6 +36,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) @@ -59,6 +60,7 @@ #:use-module (gnu packages) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system qt) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) @@ -553,3 +555,67 @@ decentralized calling using P2P-DHT.") ;;; Keep this until the Qt client matures enough to become the ;;; main 'jami' client. (deprecated-package jami jami-gnome) + +(define-public jami-qt + (package + (name "jami-qt") ;to be renamed 'jami' at some point + (version %jami-version) + ;; The Qt client code is not yet part of the release tarball; fetch it + ;; from git for now. + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.jami.net/savoirfairelinux/jami-client-qt.git") + (commit "ae21c17da5e8f730ae3895ccbc4da8047e3be1eb"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rf3lpk8c4qc12pi6pn4rdp7i8b83xv64yqr0q47rzv9s518qyjp")))) + (build-system qt-build-system) + (arguments + `(#:tests? #f ;no test suite + #:phases + (modify-phases %standard-phases + ;; TODO: Uncomment after switching back to the tarball source. + ;; (add-after 'unpack 'change-directory + ;; (lambda _ + ;; (chdir "client-qt"))) + (add-after 'install 'wrap + ;; The program fails to find the QtWebEngineProcess program, so we + ;; set QTWEBENGINEPROCESS_PATH to help it. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin")) + (qtwebengineprocess (string-append + (assoc-ref inputs "qtwebengine") + "/lib/qt5/libexec/QtWebEngineProcess"))) + (for-each (lambda (program) + (wrap-program program + `("QTWEBENGINEPROCESS_PATH" = + (,qtwebengineprocess)))) + (find-files bin ".*")))))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools) + ("doxygen" ,doxygen) + ("graphviz" ,graphviz))) + (inputs + `(("network-manager" ,network-manager) + ("qrencode" ,qrencode) + ("qtsvg" ,qtsvg) + ("qtwebengine" ,qtwebengine) + ("qtwebchannel" ,qtwebchannel) + ("qtmultimedia" ,qtmultimedia) + ("qtdeclarative" ,qtdeclarative) + ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols2" ,qtquickcontrols2))) + (propagated-inputs + `(("libringclient" ,libringclient))) + (home-page "https://jami.net") + (synopsis "Qt Jami client") + (description "This package provides the Jami Qt client. 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.") + (license license:gpl3+)))