From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id ePtSEezmKF+ZPAAA0tVLHw (envelope-from ) for ; Tue, 04 Aug 2020 04:41:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id CDYKDezmKF9rCAAAbx9fmQ (envelope-from ) for ; Tue, 04 Aug 2020 04:41:16 +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 719AF9404D3 for ; Tue, 4 Aug 2020 04:41:15 +0000 (UTC) Received: from localhost ([::1]:53014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k2olE-0000JD-S7 for larch@yhetil.org; Tue, 04 Aug 2020 00:41:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2ol4-0000Iw-ME for guix-patches@gnu.org; Tue, 04 Aug 2020 00:41:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34985) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k2ol4-0007Pu-D9 for guix-patches@gnu.org; Tue, 04 Aug 2020 00:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k2ol4-0000hc-9q for guix-patches@gnu.org; Tue, 04 Aug 2020 00:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42229] [PATCH 8/9] gnu: jami: Fix compilation by providing necessary webchat files. Resent-From: maxim.cournoyer@gmail.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Aug 2020 04:41:02 +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: Jan Wielkiewicz Cc: 42229@debbugs.gnu.org Received: via spool by 42229-submit@debbugs.gnu.org id=B42229.15965160372655 (code B ref 42229); Tue, 04 Aug 2020 04:41:02 +0000 Received: (at 42229) by debbugs.gnu.org; 4 Aug 2020 04:40:37 +0000 Received: from localhost ([127.0.0.1]:46531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k2oke-0000gl-HP for submit@debbugs.gnu.org; Tue, 04 Aug 2020 00:40:36 -0400 Received: from mail-qt1-f193.google.com ([209.85.160.193]:38735) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k2okb-0000gU-Ar for 42229@debbugs.gnu.org; Tue, 04 Aug 2020 00:40:35 -0400 Received: by mail-qt1-f193.google.com with SMTP id e5so15984032qth.5 for <42229@debbugs.gnu.org>; Mon, 03 Aug 2020 21:40:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=95bFNze9woB/p2M4AHc2pzS5FDo1h0ht2MwZOT07gns=; b=KDkfKV3y8HqGPqAPI/5/zGmw1+z/nFC0/tTLc4LjpXnIta1ll9Ej+Yr2pJCpabz8JN oCv/CstEIqbXTOU2PMFbxx8WW9Oy925upjejbEAW+dlhjUCDeXlU7q71WvMbXlyGhm0z LqLBbmoJvrOuawy1Fet+Bq0CFu0NRgMjmX6ZtBn/qJ1yp0u0uQJsT/7FvA+qFuXU5vfu B0ekeW1II1JqZApW0ILC29x0EnBWiZOJwsmijk28mBNdGijpw6RVUXohaAPAmCazJdXa kaW2SSCUC1KVBphUAZflVVAdWA5YO2HI4kOsWLqPSfyh0RKZ/IMarOmu0xCSrb8qrs6x aBqw== 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:references:date:in-reply-to :message-id:user-agent:mime-version; bh=95bFNze9woB/p2M4AHc2pzS5FDo1h0ht2MwZOT07gns=; b=tL0Us7AyGl+DmH9BZkMbApbsO/0VZ/jdubS7x2BDji95rUNtuVzEwGYaB9JPYaxZlt DMPsWsmQfoTQ6lB/gPtP9Hik2RMl4RgfVOXeEjKm2CfexFnbnqJR4Xb64AVwXF9xip1j uivm6JhqvZSAdFrGHRyLy7bXDbDanl++kPJbox8XnWV4o2Qw/JoQeapRVNYlybXqGpnn dblgnsubEsiBfgMltH4es5uEhDevZ0EUErd6XVhjrQT6ZFE2V/rcGGe0huDLMe3Ju7ID mSZy4tN6coG9RhUdJC07GttTZLb3uQuwJldV0LCYiQvLYckekdON2OKPGfXsyqmlmjsx o8tw== X-Gm-Message-State: AOAM532uF/TkT1QZF3oVU6ZZChtizxePxe+Ofcaup0DzbhjaGU9YMN1w JV0ZCdWEHyGPvo1IRS1E5xm6W2u+ X-Google-Smtp-Source: ABdhPJxaEWvq6YlnhfPg57dV1qziE0TNrE2zs7+VHVpu4O6tikLvh8rttclPiVQ+7DM8xmjiVLz4pQ== X-Received: by 2002:ac8:4719:: with SMTP id f25mr20385706qtp.291.1596516027439; Mon, 03 Aug 2020 21:40:27 -0700 (PDT) Received: from hurd (dsl-154-211.b2b2c.ca. [66.158.154.211]) by smtp.gmail.com with ESMTPSA id q16sm21953234qkn.115.2020.08.03.21.40.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2020 21:40:26 -0700 (PDT) From: maxim.cournoyer@gmail.com X-Google-Original-From: maxim@hurd.i-did-not-set--mail-host-address--so-tickle-me References: <20200706155030.1938-1-tona_kosmicznego_smiecia@interia.pl> <20200706155030.1938-8-tona_kosmicznego_smiecia@interia.pl> Date: Tue, 04 Aug 2020 00:40:25 -0400 In-Reply-To: <20200706155030.1938-8-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Mon, 6 Jul 2020 17:50:29 +0200") Message-ID: <87zh7bdnwm.fsf@hurd.i-did-not-set--mail-host-address--so-tickle-me> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=KDkfKV3y; 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-Spam-Score: 0.09 X-TUID: 0Aeqi9zGNgvZ Hello Jan! Jan Wielkiewicz writes: > * gnu/packages/jami.scm (define-module): Add copy-build-system. > (libringclient)[source]: Delete chatview files. > [arguments]: Remove chatview files from CMakeLists.txt. > (jami-chatview): New variable. > (jami)[source]: Delete chatview directory. > [inputs]: Add jami-chatview. > [arguments]: Copu chatview files to destination. > --- > gnu/packages/jami.scm | 80 ++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 79 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm > index ea94efb2f9..58e10ae6d8 100644 > --- a/gnu/packages/jami.scm > +++ b/gnu/packages/jami.scm > @@ -56,6 +56,7 @@ > #:use-module (gnu packages xorg) > #:use-module (gnu packages) > #:use-module (guix build-system cmake) > + #:use-module (guix build-system copy) > #:use-module (guix build-system gnu) > #:use-module (guix download) > #:use-module (guix git-download) > @@ -526,6 +527,16 @@ functionality.") > (url "https://review.jami.net/ring-lrc") > (commit commit))) > (file-name (git-file-name name version)) > + (modules '((guix build utils))) > + ;; The chatview is a common code among Jami clients. > + ;; Since Guix likes functional design, I'm removing > + ;; the directory containing it and making it a new > + ;; package. The other reason is that there is no > + ;; any rule in the build system to check if it is > + ;; included. > + (snippet > + '(begin > + (delete-file-recursively "src/web-chatview"))) > (sha256 > (base32 > "1s1wi80drabfjhvxbiyl8k9c2jsafvmx5v84s3wldsmmdg4f6xdf")))) > @@ -542,6 +553,21 @@ functionality.") > (assoc-ref %build-inputs "libring") "/include")) > #:phases > (modify-phases %standard-phases > + (add-after 'unpack 'do-not-install-chatview > + (lambda _ > + (substitute* "CMakeLists.txt" > + (("src/web-chatview/.eslintrc.json") "") > + (("src/web-chatview/chatview-gnome.css") "") > + (("src/web-chatview/chatview.css") "") > + (("src/web-chatview/chatview.html") "") > + (("src/web-chatview/chatview.js") "") > + (("src/web-chatview/jed.js") "") > + (("src/web-chatview/linkify-html.js") "") > + (("src/web-chatview/linkify-string.js") "") > + (("src/web-chatview/linkify.js") "") > + (("src/web-chatview/qwebchannel.js") "") > + (("src/web-chatview/web.gresource.xml") "")) > + #t)) > (add-before 'configure 'fix-dbus-interfaces-path > (lambda* (#:key inputs #:allow-other-keys) > (substitute* "CMakeLists.txt" > @@ -558,6 +584,40 @@ This package provides a library common to all Jami clients.") > (home-page "https://jami.net") > (license license:gpl3+)))) > > +(define-public jami-chatview > + (let ((commit "0a790d86a20ae80e5d2ee0d35452fa77cfb8cc40") > + (revision "0")) > + (package > + (name "jami-chatview") > + (version (git-version %jami-version revision commit)) > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://review.jami.net/jami-chatview") > + (commit commit))) This doesn't seem to be the canonical place to get the latest chatview. Rather, it lives in the LRC repo [0]. It was copied there sometime in 2019, and no new commit were made to the repo you used above since. [0] https://git.jami.net/savoirfairelinux/ring-lrc/commits/master/src/web-chatview > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "1zb3qa1x37kclbgk4wdg6qp4ivr6513ypj8s4k0qjps7h2clgna8")))) > + (build-system copy-build-system) > + (arguments > + '(#:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'allow-copying > + (lambda* (#:key inputs #:allow-other-keys) > + ;; Permissions of this file are not right. > + ;; Let's change this to allow installing it properly. > + (chmod ".eslintrc.json" #o644) > + #t))) > + #:install-plan '(("." "include/libringclient/web-chatview") > + (".eslintrc.json" > + "include/libringclient/web-chatview/.eslintrc.json")))) > + (synopsis "Chatview for Jami") > + (description "Web chatview for Jami - html, css, js files. > +It provides some common code for Jami clients.") > + (home-page "https://jami.net") > + (license license:gpl3+)))) > + > (define-public jami > (let ((commit "85cda2e1fde84230f6b9f5419f9ec1e23867c2a1") > (revision "0")) > @@ -570,6 +630,11 @@ This package provides a library common to all Jami clients.") > (url "https://review.jami.net/ring-client-gnome") > (commit commit))) > (file-name (git-file-name name version)) > + (modules '((guix build utils))) > + ;; The web directory contains links to nowhere > + (snippet > + '(begin > + (delete-file-recursively "web"))) > (sha256 > (base32 > "0xzcx8x04yc8m8b2vf7sxfgw79idbm0hifzaw4s2vh26hyy9sp2g")))) > @@ -584,6 +649,8 @@ This package provides a library common to all Jami clients.") > ("clutter-gtk" ,clutter-gtk) > ("libcanberra" ,libcanberra) > ("libnm" ,network-manager) > + ("jami-chatview" ,jami-chatview) > + ("qtbase" ,qtbase) > ("webkitgtk" ,webkitgtk) > ("sqlite" ,sqlite))) > (native-inputs > @@ -596,7 +663,18 @@ This package provides a library common to all Jami clients.") > ("adwaita-icon-theme" ,adwaita-icon-theme) > ("evolution-data-server" ,evolution-data-server))) > (arguments > - `(#:tests? #f)) ; There is no testsuite. > + `(#:tests? #f ; There is no testsuite. > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'copy-chatview-files > + (lambda* (#:key inputs #:allow-other-keys) > + (let ((chatview > + (string-append > + (assoc-ref inputs "jami-chatview") > + "/include/libringclient/web-chatview")) > + (destination-dir "web")) > + (copy-recursively chatview destination-dir)) > + #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 As I understand it, jami-chatview is *not* maintained as a distinct component upstream, hence it makes little sense to maintain it as one in Guix: it'd burden us with maintaining it, with little to no gain. IIUC, all we need is to symlink the web-chatview from the lrc package, which every Jami clients will already depend on. The suggestion I'd make to upstream is to *install* those files as part of a LRC installation (somewhere under share/), and then have the build system check for their presence at configure time and use them directly. Does that make sense? Maxim