From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42607) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3fFz-0000l6-Ss for guix-patches@gnu.org; Wed, 04 Apr 2018 06:03:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3fFv-0001MO-03 for guix-patches@gnu.org; Wed, 04 Apr 2018 06:03:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:57987) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f3fFu-0001MB-Rl for guix-patches@gnu.org; Wed, 04 Apr 2018 06:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1f3fFu-0002Xg-JQ for guix-patches@gnu.org; Wed, 04 Apr 2018 06:03:02 -0400 Subject: [bug#31056] [PATCH] gnu: emacs-org: fix byte compilation Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3fFf-0000c0-Hg for guix-patches@gnu.org; Wed, 04 Apr 2018 06:02:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3fFa-00018z-Kl for guix-patches@gnu.org; Wed, 04 Apr 2018 06:02:47 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:48839) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f3fFa-00014w-Es for guix-patches@gnu.org; Wed, 04 Apr 2018 06:02:42 -0400 From: Konrad Hinsen Date: Mon, 26 Mar 2018 18:08:59 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 31056@debbugs.gnu.org Fixes bug#30961 --- gnu/packages/emacs.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 4b750b208..4e969cbe7 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4498,6 +4498,25 @@ passive voice.") (description "This Emacs package provides a folder tree view.") (license license:gpl3+))) +(define emacs-minimal-for-emacs-org + ;; This is the version that you should use for byte-compiling emacs-org + (package (inherit emacs-minimal) + (name "emacs-minimal-for-emacs-org") + (synopsis "The extensible text editor (used only for byte-compilation of emacs-org)") + (build-system gnu-build-system) + (arguments + (substitute-keyword-arguments (package-arguments emacs-minimal) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'delete-org + (lambda _ + (with-directory-excursion "lisp" + ;; Remove org to prevent it from messing up the + ;; byte compilation of package emacs-org, + (delete-file-recursively "org") + ;; gnus-icalendar depends on org, so remove it as well. + (delete-file "gnus/gnus-icalendar.el")))))))))) + (define-public emacs-org (package (name "emacs-org") @@ -4512,6 +4531,8 @@ passive voice.") (base32 "16yr0srfzsrzv2b1f2wjk8gb2pyhsgj2hxbscixirkxqz674c5cl")))) (build-system emacs-build-system) + (arguments + `(#:emacs ,emacs-minimal-for-emacs-org)) (home-page "https://orgmode.org/") (synopsis "Outline-based notes management and organizer") (description "Org is an Emacs mode for keeping notes, maintaining TODO -- 2.16.3