From patchwork Wed Dec 25 16:11:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brant Gardner X-Patchwork-Id: 19443 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 ABAF517986; Wed, 25 Dec 2019 17:11:33 +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 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 744E017983 for ; Wed, 25 Dec 2019 17:11:33 +0000 (GMT) Received: from localhost ([::1]:48106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ikAC5-000377-19 for patchwork@mira.cbaines.net; Wed, 25 Dec 2019 12:11:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58314) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ik9HS-0006E9-U1 for guix-patches@gnu.org; Wed, 25 Dec 2019 11:13:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ik9HR-00054V-TR for guix-patches@gnu.org; Wed, 25 Dec 2019 11:13:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48632) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ik9HR-00054O-QS for guix-patches@gnu.org; Wed, 25 Dec 2019 11:13:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ik9HR-0003YE-M8 for guix-patches@gnu.org; Wed, 25 Dec 2019 11:13:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38741] [PATCH] Fix emacs-ledger-mode failing to autoload Resent-From: "Brant Gardner" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Dec 2019 16:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38741 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38741@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.157729033113587 (code B ref -1); Wed, 25 Dec 2019 16:13:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Dec 2019 16:12:11 +0000 Received: from localhost ([127.0.0.1]:54605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ik9Gc-0003X5-Mq for submit@debbugs.gnu.org; Wed, 25 Dec 2019 11:12:10 -0500 Received: from lists.gnu.org ([209.51.188.17]:52020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ik9Gb-0003Wx-0W for submit@debbugs.gnu.org; Wed, 25 Dec 2019 11:12:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58230) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ik9GZ-0006Cm-Mh for guix-patches@gnu.org; Wed, 25 Dec 2019 11:12:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ik9GY-0004qA-Jr for guix-patches@gnu.org; Wed, 25 Dec 2019 11:12:07 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:51083) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ik9GY-0004pA-6O for guix-patches@gnu.org; Wed, 25 Dec 2019 11:12:06 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 84B9C390 for ; Wed, 25 Dec 2019 11:12:02 -0500 (EST) Received: from imap2 ([10.202.2.52]) by compute1.internal (MEProxy); Wed, 25 Dec 2019 11:12:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lnklnx.com; h= mime-version:message-id:date:from:to:subject:content-type; s= fm1; bh=bT/GW4IoixDzWMp2JzQgwad44OHpl2KlmAdgbTAxUbo=; b=TUKBtQUf AM8MutfreP4YpC+6jNbJj/RCjY99TfnVaZ8gR8pjYfbP2Z7LTaOd2ULqOxSf7zRQ CRGtkk+sZYjTqEektGhR3Ema3TqFkgjtyddhCdkLw4MU84FoIWUH0YJnrhd5BL5/ 7hIRfgE+4O0+m6jI8xWfRlJclvJFh8D+A8jKQTriXqpzuFPpx6OOm+a3M7EtFiZu J/ZNUXZroWfDYkp32DMA+hfq7Jyaz8y/CJdrR8Qe9h2g1pI/x7hwq+BiSd7Gu4/k 6gtiaT1zHY52dh23Pvh2w7RggN1NLXL95zzJ+rWhgZzBDNhd0YYBj4Ch1pnbvxZv X9Je1TkFpV/ilg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=bT/GW4IoixDzWMp2JzQgwad44OHpl 2KlmAdgbTAxUbo=; b=f90jwnpmkRn7/dPZOwskbk5f8JR4f/n62B5WZBcURTxFe 764srUOT6tsnCgke9Gh2wZUj3aBhayfOy0H+4cbDgXxT/t6ydAVAE3gdHDTOo04d WXRyI4GexySBTMgHl/RcOUJZuzdBp5zccnbkSUn8isOjg82aLjDNZKpyBEBZ9UkZ 1c9cCY9N9FJuFVOT/MbMW8wdHdFXoCDOMR3lS6Q8R0m8PrTAgvolDCXaTkr0ybor 56uUNgTBJTRRR69B12tg5oo9m8cdQRrG1J/TgW6Wl/Id2oiSl2d56pvEdZKtkedH H6Wd+xC+F2PfqVtt/R9U6sH2fX9gEz++0IT55xSqg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrvddvgedgkeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefofgggkfffhffvufgtsehttdertd erredtnecuhfhrohhmpedfuehrrghnthcuifgrrhgunhgvrhdfuceomhgrihhlsehlnhhk lhhngidrtghomheqnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrghilheslhhnkhhlnh igrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id D6BD0E00A2; Wed, 25 Dec 2019 11:12:01 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.1.7-694-gd5bab98-fmstable-20191218v1 Mime-Version: 1.0 Message-Id: Date: Wed, 25 Dec 2019 10:11:41 -0600 From: "Brant Gardner" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] 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-Mailman-Approved-At: Wed, 25 Dec 2019 12:11:28 -0500 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 * gnu/packages/finance.scm (emacs-ledger-mode): Fix emacs-ledger-mode failing to autoload --- gnu/packages/finance.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index ce3033c054..ced85c44c2 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -288,6 +288,12 @@ in ability, and easy to use.") #:tests? #f ; there are none #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-site-dir + (lambda _ + (substitute* "CMakeLists.txt" + (("DESTINATION share/emacs/site-lisp/ledger-mode") + "DESTINATION share/emacs/site-lisp")) + #t)) (add-before 'build 'patch-path (lambda* (#:key inputs #:allow-other-keys) (let ((ledger (assoc-ref inputs "ledger"))) @@ -303,17 +309,12 @@ in ability, and easy to use.") (invoke "makeinfo" "-o" target "../source/doc/ledger-mode.texi")) #t)) - (add-after 'install 'relocate-elisp + (add-after 'install 'generate-autoload (lambda* (#:key outputs #:allow-other-keys) (let* ((site-dir (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp")) - (guix-dir (string-append site-dir "/guix.d")) - (orig-dir (string-append site-dir "/ledger-mode")) - (dest-dir (string-append guix-dir "/ledger-mode"))) - (mkdir-p guix-dir) - (rename-file orig-dir dest-dir) - (emacs-generate-autoloads ,name dest-dir) - #t)))))) + "/share/emacs/site-lisp"))) + (emacs-generate-autoloads ,name site-dir)) + #t))))) (inputs `(("ledger" ,ledger))) (native-inputs