From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 4Aw1BqhIA1+zXAAA0tVLHw (envelope-from ) for ; Mon, 06 Jul 2020 15:52:08 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id IHUsAqhIA1+zCwAAB5/wlQ (envelope-from ) for ; Mon, 06 Jul 2020 15:52:08 +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 7D5819409D6 for ; Mon, 6 Jul 2020 15:52:07 +0000 (UTC) Received: from localhost ([::1]:39908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsTPa-0002mu-Fi for larch@yhetil.org; Mon, 06 Jul 2020 11:52:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42576) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsTOb-0000pr-J7 for guix-patches@gnu.org; Mon, 06 Jul 2020 11:51:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51413) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jsTOb-0000FP-8b for guix-patches@gnu.org; Mon, 06 Jul 2020 11:51:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jsTOb-0001gE-7X for guix-patches@gnu.org; Mon, 06 Jul 2020 11:51:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42229] [PATCH 8/9] gnu: jami: Fix compilation by providing necessary webchat files. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Jul 2020 15:51:05 +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.15940506516379 (code B ref 42229); Mon, 06 Jul 2020 15:51:05 +0000 Received: (at 42229) by debbugs.gnu.org; 6 Jul 2020 15:50:51 +0000 Received: from localhost ([127.0.0.1]:34717 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jsTOM-0001ei-Nk for submit@debbugs.gnu.org; Mon, 06 Jul 2020 11:50:51 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.153]:48308) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jsTOG-0001cy-Km 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:38 +0200 (CEST) From: Jan Wielkiewicz Date: Mon, 6 Jul 2020 17:50:29 +0200 Message-Id: <20200706155030.1938-8-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 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1594050639; bh=bfW89B5vNM1UuIAM9MT8tAX6I1NGwgx7IyeqOeujIo8=; 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=sIoFo1sGFHc4hANlWkoprN0mcgoPeMk+g3j2MQfavsHT8ASwmI6h5iBkg7cj3cLRp EFIDX7H0skVIhgKyWg5pHiBcsEEEFHMmgCpoX5eA0WWo0MFvPHTGamTwHgcYWeLaOp 7NbldJd7JXDBR65wET9oQ5n2NxErP1QS6ryGFpHA= X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) 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=interia.pl header.s=biztos header.b=sIoFo1sG; dmarc=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: 4.99 X-TUID: fEd/7owUOp42 * 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))) + (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 -- 2.27.0