From patchwork Thu Dec 5 20:01:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brett Gilio X-Patchwork-Id: 16386 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 E918C17851; Thu, 5 Dec 2019 20:02:48 +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=unavailable 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 871181784F for ; Thu, 5 Dec 2019 20:02:48 +0000 (GMT) Received: from localhost ([::1]:60436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icxKp-0001gp-O0 for patchwork@mira.cbaines.net; Thu, 05 Dec 2019 15:02:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35779) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icxKD-0001Oh-2Q for guix-patches@gnu.org; Thu, 05 Dec 2019 15:02:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icxKA-0004U2-Ia for guix-patches@gnu.org; Thu, 05 Dec 2019 15:02:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39271) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1icxK6-0004RW-UC for guix-patches@gnu.org; Thu, 05 Dec 2019 15:02:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1icxK6-0002dS-ST for guix-patches@gnu.org; Thu, 05 Dec 2019 15:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38463] [PATCH 3/3] gnu: emacs-telega: Install telega-data to site-lisp. References: <87r21mh0pt.fsf@posteo.net> In-Reply-To: <87r21mh0pt.fsf@posteo.net> Resent-From: Brett Gilio Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Dec 2019 20:02:02 +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: 38463@debbugs.gnu.org Received: via spool by 38463-submit@debbugs.gnu.org id=B38463.157557609510074 (code B ref 38463); Thu, 05 Dec 2019 20:02:02 +0000 Received: (at 38463) by debbugs.gnu.org; 5 Dec 2019 20:01:35 +0000 Received: from localhost ([127.0.0.1]:45242 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1icxJe-0002cQ-VQ for submit@debbugs.gnu.org; Thu, 05 Dec 2019 15:01:35 -0500 Received: from mout02.posteo.de ([185.67.36.66]:49525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1icxJc-0002c3-Se for 38463@debbugs.gnu.org; Thu, 05 Dec 2019 15:01:34 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id DC04A240110 for <38463@debbugs.gnu.org>; Thu, 5 Dec 2019 21:01:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1575576085; bh=JlpCC0OBM9r0i7ANrhiGyrdGHapbRY6DwskRACpn1IU=; h=From:To:Subject:Date:From; b=mmsrxq5BXyVoPF0gLL7jfoGuUaJme5mtfIv/fSYJHYAZzUD9onRXqIuHHbzdICXWq bNmyA9K09wc0tDWJW3PTC+Zjbe9hygR45N5nqKH3Otfr92hDbz8Hms5JZ2TAs8QlYi FQo8lKTsR7hAmq7Aix+eaWybDeE4qK80aE2Sdxhwrne65aBxuPoAq2OTAJXxzYbG2+ B8FF02uTAqpt3e9KIFsSjFZn9ACWQG17uAMFq+yo/quflx0AQG8stXzaWDwFjySE8r A3VLYwk///l2wF/b3maGlHhqL6gWDF0B3ZgOG7wCohRPnOFvn//2MwtylCbsDQc2ln ECjyk+4MDpsvA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 47TRS41vJZz9rxp for <38463@debbugs.gnu.org>; Thu, 5 Dec 2019 21:01:24 +0100 (CET) From: Brett Gilio Date: Thu, 05 Dec 2019 14:01:13 -0600 Message-ID: <87fthyzgmu.fsf@posteo.net> MIME-Version: 1.0 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 This patch is a reworked version of [PATCH 3/3] sent earlier in the list. Thanks to Leo Prikler who I have marked as a co-author for their help. Everything should be good to merge now! From 62ad3f8a8a62fddc4e83cdbc43d2701dcd476224 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 | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 60d27ca3de..1c0a5acc38 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19989,6 +19989,13 @@ 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" + (("etc/") "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 +20026,24 @@ 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 adds subdir /etc to the site-lisp dir and + ;; gives it a unique name which is needed for images, + ;; notification sounds, and various alists. + ;; TODO: Replace with `#:include' method used by + ;; emacs-build-system. + (add-after 'emacs-install 'telega-install-data + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion "." + (invoke "cp" "-r" "etc/" + (string-append (assoc-ref outputs "out") + "/share/emacs/site-lisp/" + "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