[bug#31056] [PATCH] gnu: emacs-org: fix byte compilation

[bug#31056] [PATCH] gnu: emacs-org: fix byte compilation

[Konrad Hinsen]

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

[bug#31056] [PATCH] gnu: emacs-org: fix byte compilation

[Ludovic Courtès]

Hello,

Konrad Hinsen <konrad.hinsen@fastmail.net> skribis:

> Fixes bug#30961

Nicolas, I’d rather let you comment on this patch.  :-)
WDYT?

Thanks,
Ludo’.

[bug#31056] [PATCH] gnu: emacs-org: fix byte compilation

[Nicolas Goaziou]

Hello,

ludo@gnu.org (Ludovic Courtès) writes:

> Konrad Hinsen <konrad.hinsen@fastmail.net> skribis:
>
>> Fixes bug#30961
>
> Nicolas, I’d rather let you comment on this patch.  :-)
> WDYT?

Thanks for the heads up.

IMO, compiling a dedicated Emacs only for Org seems a bit overkill. I'd
rather have it fixed upstream than papering over the problem.

Mind you, I don't have a Org-side solution for the problem. However, the
fact that `org-babel-header-args-safe-fn' is a macro doesn't help.
AFAICT, it could be a function. Would turning the macro into a function
help in this case?

Regards,

-- 
Nicolas Goaziou                                                0x80A93738

[bug#31056] [PATCH] gnu: emacs-org: fix byte compilation

[Konrad Hinsen]

Hi Nicolas,

Thanks for your comments!

> IMO, compiling a dedicated Emacs only for Org seems a bit overkill.

True, but then most users will get emacs-org as a substitute, so the
main impact is on the build farms.

> I'd rather have it fixed upstream than papering over the problem.

The problem has been around for years, so I have given up hope for an
upstream fix. Emacs 26 will include org-mode 9, so the problem will go
away when release 26 becomes official. I doubt anyone will work on a fix
in the meantime.

Concerning Guix, the question is if we care about fixing the bug before
switching to Emacs 26.  The number of users concerned may be small (it's
only org-babel that is affected, not the more widely used PIM
functionality of org-mode), but for those users it's a show-stopper.  If
I invested much time into this patch, it's because I cannot work without
it.

Konrad.

[bug#31056] [PATCH] gnu: emacs-org: fix byte compilation

[Nicolas Goaziou]

Hello,

Konrad Hinsen <konrad.hinsen@fastmail.net> writes:

> The problem has been around for years, so I have given up hope for an
> upstream fix.

I don't think it is true. The problem is that Emacs ships with a very
old Org. The problem is not exclusively on the Org side.

> Emacs 26 will include org-mode 9, so the problem will go
> away when release 26 becomes official.

Correct.

> I doubt anyone will work on a fix in the meantime.

I suggested a possible fix. Would that work?


Regards,

-- 
Nicolas Goaziou                                                0x80A93738

[bug#31056] [PATCH] gnu: emacs-org: fix byte compilation

[Konrad Hinsen]

Hi Nicolas,

>> The problem has been around for years, so I have given up hope for an
>> upstream fix.
>
> I don't think it is true. The problem is that Emacs ships with a very
> old Org. The problem is not exclusively on the Org side.

I'd even say not at all. Nothing in Emacs seems to be made for having
two versions of the same library on load-path, so this shouldn't
happen.

For me, the problem was integrating org-mode into Emacs without at the
same time synchronizing releases, though I am sure there were good
reasons for that as well.

>> I doubt anyone will work on a fix in the meantime.
>
> I suggested a possible fix. Would that work?

No idea. All I did is translate to Guix a well-known trick for fixing
the problem with ELPA-based installations.

My Emacs-Fu isn't advanced enough to even understand what really causes
the error. Much less to judge if the fix you propose would work, and if
it does, how many similar problems would need to be fixed after that
one.

Konrad.

[bug#31056] [PATCH] gnu: emacs-org: fix byte compilation

[Ludovic Courtès]

Hello,

Nicolas, what’s the status of this patch?  What should we do?

TIA,  :-)
Ludo’.

Konrad Hinsen <konrad.hinsen@fastmail.net> skribis:

> Hi Nicolas,
>
>>> The problem has been around for years, so I have given up hope for an
>>> upstream fix.
>>
>> I don't think it is true. The problem is that Emacs ships with a very
>> old Org. The problem is not exclusively on the Org side.
>
> I'd even say not at all. Nothing in Emacs seems to be made for having
> two versions of the same library on load-path, so this shouldn't
> happen.
>
> For me, the problem was integrating org-mode into Emacs without at the
> same time synchronizing releases, though I am sure there were good
> reasons for that as well.
>
>>> I doubt anyone will work on a fix in the meantime.
>>
>> I suggested a possible fix. Would that work?
>
> No idea. All I did is translate to Guix a well-known trick for fixing
> the problem with ELPA-based installations.
>
> My Emacs-Fu isn't advanced enough to even understand what really causes
> the error. Much less to judge if the fix you propose would work, and if
> it does, how many similar problems would need to be fixed after that
> one.
>
> Konrad.

[bug#31056] [PATCH] gnu: emacs-org: fix byte compilation

[Konrad Hinsen]

ludo@gnu.org (Ludovic Courtès) writes:

> Nicolas, what’s the status of this patch?  What should we do?

With the recent update to Emacs 26.1, this patch is no longer of any
use.

Konrad.

[bug#31056] [PATCH] gnu: emacs-org: fix byte compilation

[Nicolas Goaziou]

Hello,

Konrad Hinsen <konrad.hinsen@fastmail.net> writes:

> ludo@gnu.org (Ludovic Courtès) writes:
>
>> Nicolas, what’s the status of this patch?  What should we do?
>
> With the recent update to Emacs 26.1, this patch is no longer of any
> use.

Oops! I just realized the patch was stalled waiting for my output. Sorry
about that.

Regards,

-- 
Nicolas Goaziou                                                0x80A93738

bug#31056: [PATCH] gnu: emacs-org: fix byte compilation

[Ludovic Courtès]

Hello,

Nicolas Goaziou <mail@nicolasgoaziou.fr> skribis:

> Konrad Hinsen <konrad.hinsen@fastmail.net> writes:
>
>> ludo@gnu.org (Ludovic Courtès) writes:
>>
>>> Nicolas, what’s the status of this patch?  What should we do?
>>
>> With the recent update to Emacs 26.1, this patch is no longer of any
>> use.
>
> Oops! I just realized the patch was stalled waiting for my output. Sorry
> about that.

Heh, marking it as ‘done’ now.

Ludo’.