From patchwork Thu Dec 5 22:55:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 16396 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 7455217854; Thu, 5 Dec 2019 22:56:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 16F9717852 for ; Thu, 5 Dec 2019 22:56:13 +0000 (GMT) Received: from localhost ([::1]:33508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1id02e-0005Z1-FB for patchwork@mira.cbaines.net; Thu, 05 Dec 2019 17:56:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44620) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1id02W-0005Vn-7c for guix-patches@gnu.org; Thu, 05 Dec 2019 17:56:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1id02U-00007P-HB for guix-patches@gnu.org; Thu, 05 Dec 2019 17:56:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39416) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1id02T-0008Vh-Oe for guix-patches@gnu.org; Thu, 05 Dec 2019 17:56:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1id02T-000341-M6 for guix-patches@gnu.org; Thu, 05 Dec 2019 17:56:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38463] [PATCH 3/3] gnu: emacs-telega: Properly install alists. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Dec 2019 22:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38463 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brett Gilio Cc: 38463@debbugs.gnu.org Received: via spool by 38463-submit@debbugs.gnu.org id=B38463.157558652311728 (code B ref 38463); Thu, 05 Dec 2019 22:56:01 +0000 Received: (at 38463) by debbugs.gnu.org; 5 Dec 2019 22:55:23 +0000 Received: from localhost ([127.0.0.1]:45389 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1id01q-000335-M2 for submit@debbugs.gnu.org; Thu, 05 Dec 2019 17:55:23 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:55515) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1id01n-00032u-Vj for 38463@debbugs.gnu.org; Thu, 05 Dec 2019 17:55:21 -0500 Received: from nijino.local (213-240-64-42.hdsl.highway.telekom.at [213.240.64.42]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 47TWJg3RmMz3wV3; Thu, 5 Dec 2019 23:55:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1575586515; bh=CjiHpGY6b9cAbL/qBvd57N/xDGtXU1mW5tAzRSXMJu4=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=hbXf5uJW2zDyUQpK9seeWtn7uR/4llVTdWoMIZHTSHbbPPUA32h9ZaCNC8AMjGQyX rk8/YVCTELg9d61T4ImIhJyfoGWiHiw05YTldnLrNYlTyIvw/w1SBH3x2LR2ilOKGP fPIBYYv3MLPCKQhZw+soaRsJWstvQlnrb4pQJFyw= Message-ID: <24b5011d36a76fbb4a64e16d8eeaf540b4ba92df.camel@student.tugraz.at> From: Leo Prikler Date: Thu, 05 Dec 2019 23:55:09 +0100 In-Reply-To: <877e3ad2zk.fsf@posteo.net> References: <3566e38523f0ff4badf50ade8c1498006f1cb872.camel@student.tugraz.at> <87fthyd54z.fsf@posteo.net> <3a8ad02f296ee82a82149e949ba7d5c367950df8.camel@student.tugraz.at> <877e3ad2zk.fsf@posteo.net> User-Agent: Evolution 3.30.5 MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 Am Donnerstag, den 05.12.2019, 12:46 -0600 schrieb Brett Gilio: > That is why I made the note about eventually replacing the > installation of that directory to use the system usually used by > `emacs-build-system` because I figure this would cause less issues in > the future if for some reason the emacs site-lisp directory structure > were to change again. > > --8<---------------cut here---------------start------------->8--- > ;; TODO: Replace with `#:include' method used by > ;; emacs-build-system. > --8<---------------cut here---------------end--------------->8--- > > But I don't think it is a pressing issue to do it so cleanly. > Or maybe it is. Idk. Perhaps you're right, but as far as I can see the Emacs build system does not yet tell us how to proceed with data. It also has a unique way of handling documentation, first putting it into site-lisp before moving it to share/info where it should belong. > > I still don't feel comfortable with data being at the top of site- > > lisp, > > though. Perhaps something similar to emacs-yasnippet-snippets, > > where > > you store the data in share/emacs/telega-data would be more > > appropriate. > > I was ACTUALLY going to do it this way originally, but I was really > uncertain of it so I just sent the patch as is. I like the idea more, > so > I am going to revise the patch. Otherwise, once I get this revision > in > everything should be good to go. I'll also substitute the functions > to > reflect that changed path. > > [...] > > Alright, carry on! Patch will be available soon. Looking at your revised patch, I still feel a bit uneasy about putting data into the load-path. I therefore proprose a revised revised (R^2, if you will) patch, which I've attached to this message. Regards, Leo From 59918d4a486c453463e6c59487047177f3b54205 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Thu, 5 Dec 2019 13:51:14 -0600 Subject: [PATCH 3/3] gnu: emacs-telega: Install telega-data to site-lisp. * gnu/packages/emacs-xyz.scm (emacs-telega)[arguments]: This commit revises a previous patch and gives the source etc/ directory a unique installation pth in the site-lisp directory stucture. Co-authored-by: Leo Prikler --- gnu/packages/emacs-xyz.scm | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f8f65f0e7e..c4aa44d8d0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19989,6 +19989,16 @@ fish-completion. It can be used in both Eshell and M-x shell.") (("python3 run_tests.py") "")) #t)) + ;; Modify telega-util to reflect unique dir name in + ;; `telega-install-data' phase. + (add-after 'unpack 'telega-data-patch + (lambda _ + (substitute* "telega-util.el" + (("\\(concat \"etc/\" filename\\) telega--lib-directory") + "(concat \"telega-data/\" filename) + (locate-dominating-file telega--lib-directory + \"telega-data\")")) + #t)) ;; The telega test suite checks for a version of Emacs ;; compiled with imagemagick and svg support. Since we ;; are using `emacs-minimal`, this step will fail. @@ -20019,11 +20029,20 @@ fish-completion. It can be used in both Eshell and M-x shell.") ;; Build emacs-side using `emacs-build-system' (add-after 'compress-documentation 'emacs-add-source-to-load-path (assoc-ref emacs:%standard-phases 'add-source-to-load-path)) - (add-after 'emacs-set-emacs-load-path 'emacs-install + (add-after 'emacs-add-source-to-load-path 'emacs-install (assoc-ref emacs:%standard-phases 'install)) - (add-after 'emacs-install 'emacs-build + ;; This step installs subdir /etc, which contains images, sounds and + ;; various other data, next to the site-lisp dir. + (add-after 'emacs-install 'telega-install-data + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively + "etc" + (string-append (assoc-ref outputs "out") + "/share/emacs/telega-data/")) + #t)) + (add-after 'telega-install-data 'emacs-build (assoc-ref emacs:%standard-phases 'build)) - (add-after 'emacs-install 'emacs-make-autoloads + (add-after 'emacs-build 'emacs-make-autoloads (assoc-ref emacs:%standard-phases 'make-autoloads))))) (propagated-inputs `(("emacs-visual-fill-column" ,emacs-visual-fill-column))) -- 2.24.0