From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kesHGU6wZGCRCQAAgWs5BA (envelope-from ) for ; Wed, 31 Mar 2021 19:24:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id iM/IEU6wZGAQLgAA1q6Kng (envelope-from ) for ; Wed, 31 Mar 2021 17:24:30 +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 EC8461B78E for ; Wed, 31 Mar 2021 19:24:29 +0200 (CEST) Received: from localhost ([::1]:46882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lReZw-0007vS-WE for larch@yhetil.org; Wed, 31 Mar 2021 13:24:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lReZc-0007U0-Oc for guix-patches@gnu.org; Wed, 31 Mar 2021 13:24:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43895) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lReZb-0006GB-2P 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-0002yC-TU for guix-patches@gnu.org; Wed, 31 Mar 2021 13:24:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH v2 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 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.161721139511264 (code B ref 47513); Wed, 31 Mar 2021 17:24:06 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 17:23:15 +0000 Received: from localhost ([127.0.0.1]:55426 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lReYk-0002vV-HY for submit@debbugs.gnu.org; Wed, 31 Mar 2021 13:23:14 -0400 Received: from mail-qv1-f51.google.com ([209.85.219.51]:42642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lReYf-0002tg-Gw for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 13:23:09 -0400 Received: by mail-qv1-f51.google.com with SMTP id 30so10294119qva.9 for <47513@debbugs.gnu.org>; Wed, 31 Mar 2021 10:23:09 -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=7MxMJjWGHGMQkxAlLZOlm25WoNR10Il5pwZshOx7Bo4=; b=TjTuYCSghY+BwdhlunP5WxPXTQiXiduSB7IMx+CdMHRGpTSAvIg7KaEDs+TUDOv8hv f1U6H9yXyufrpI2XQfq+k3giqdhMqG+qsYjFLXMTJFbEAFe1g3h+l0AobAtxLuXzyvAO irVDfUL/2YVf+m/L0cGWYgq3nc4f3zl6KGbKG/XZwycDbtYuYt/3+bRXIoOhs6AuD+Og PFyr/ArEG8i0ZRmXwIAz3plZJD8rAaeNPeV7lMgJYfy7OqVExnCF6U5M90VEfaooRUtz 8gckXLbTWz78NFTYpZ4PuczSKwxkVTPrjiA+Ro1zdFZlsP5zjCjjxqE/4v7gPB0BhzTh Ip0Q== 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=7MxMJjWGHGMQkxAlLZOlm25WoNR10Il5pwZshOx7Bo4=; b=d4gDhkK5/7jk33aLONsBdAZFGuRLdRirTW/D1PynFUmBxnHmwmATVeiDz97i0ZCGHh kw8n64VK4XpotezP5ulzORt/zMmwSyPNgi8bn203ga5ElriRZXMj+dvo7DBV26j5IRrg Pd4Q32CGXKdjI96sfK3pRYtKuZHG50fhFIxKbFQm+/qCZQnIV6agAjIhaJ7M00pKGCIE Lb1T/N1EwelsqxzNA1VwnRwB6EbiO4yLWWmxrgbiLmSXfzqph4zTtXYtgxSppav6V/Yo Ui3A6WPctVQ3O7aKOlZEHyPghPXyqBTTiaBea49SC0xLIBPblBeN9vJfhl9yWQOJftaF FRfw== X-Gm-Message-State: AOAM533BtJEs4ed4PdP/kcAxilgPvEvLNWq6ZLBblIwLQtEdZsJXH2N3 XiZkYirmFc1kLzwzVVgaclUcz7sm2wK7NA== X-Google-Smtp-Source: ABdhPJwig5e1IQrK/chOqCIbmDx6AH6RLMnUK7jVKr43+x2CAZSsZs5qJELJM6U0ARdq3lJWW9f0XQ== X-Received: by 2002:ad4:584d:: with SMTP id de13mr4155921qvb.17.1617211384082; Wed, 31 Mar 2021 10:23:04 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id c5sm1891349qkg.105.2021.03.31.10.23.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Mar 2021 10:23:03 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 13:22:32 -0400 Message-Id: <20210331172232.22483-12-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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1617211470; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=7MxMJjWGHGMQkxAlLZOlm25WoNR10Il5pwZshOx7Bo4=; b=Pg4GZWRdmm7urxqgPaFR7DWumiSumE7EZn02NMuXC6fqas9zOjSKeNyCfYCy546tYH4QCG dANKob8xpWfNzl3iLWnDDF1KtzqnikBlsRZ14YqFUjYBMQOLDMDJrOB51sACfpXKjZHuQD a9u3QQIdMKvAkhxMa8UDLZu4r3NkmSX+UFpjnNk/5AWpjDVeoWKcW7gARMr4nmhb53Ezh3 8DH0L0QPztKQCNHrasGuUInlh6oZJXTW2SWE4pFYTIaV0nL74uX7riGTtUHthc5NQR6mjX ydBdv+d7O5huR9aSsneUtyhbcIza4oswSMcOgXIS9ppZtCrLf/dZnojzDwaOHw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617211470; a=rsa-sha256; cv=none; b=NC+bTCengjMxqvtwOsXGJLNwAsREVpJymtofqHV8TJvY6anQrvzNnDU234PT8x2iqwqLEk OzAMWsxCP9dykXKN8UuBAea9o9TNjadBmWrEH5Waiu2nj+8uBIpk8fVF3RCMvCGdVUeSBb te9cWZaBIIcVSFn540huRkvJjbKSQihzfyW0sMDbDIXS7gbvObrhy11saxWdbLGxsxFyYn Tfh1ZNgH73I1OE0cb0GbbH6mwp5uo1HfvVz+T8QesKr/nNUtpS6oiaePA1rIDWNZ1YGE17 gZkkeCXe5IXp07wbOxRADZtsuhpW/sPS+4LrlkEaOkkt4ym4peilvwxhe12i3g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=TjTuYCSg; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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-Migadu-Spam-Score: 4.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=TjTuYCSg; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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-Migadu-Queue-Id: EC8461B78E X-Spam-Score: 4.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: 8ZvPMKEC7+LP * 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 1b6a2a2ed5..ddfe6a2770 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) @@ -554,3 +556,67 @@ decentralized calling using P2P-DHT.") ;;; main 'jami' client. (define-public jami (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+))) -- 2.31.1