GNU bug report logs - #69510
[PATCH emacs-team 0/2] Update emacs-next

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 69510 in the body.
You can then email your comments to 69510 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH emacs-team 0/2] Update emacs-next
Date: Sat, 2 Mar 2024 18:08:37 +0100

Liliana Marie Prikler (2):
  guix: emacs-utils: Make emacs-compile-directory forwards-compatible.
  gnu: emacs-next-minimal: Update to 30.0.50-2.170c655.

 gnu/packages/aux-files/emacs/comp-integrity.el |  5 ++++-
 gnu/packages/emacs.scm                         |  6 +++---
 guix/build/emacs-utils.scm                     | 11 +++++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)


base-commit: 3d4fc910f73220f47e5f2459853333a7c83c5d1d
-- 
2.41.0

Message #8 received at 69510 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 69510 <at> debbugs.gnu.org
Cc: Mekeor Melire <mekeor <at> posteo.de>
Subject: [PATCH emacs-team 1/2] guix: emacs-utils: Make
 emacs-compile-directory forwards-compatible.
Date: Sat, 2 Mar 2024 16:56:13 +0100

Newer (development) builds of Emacs 30 mark a number of functions related to
native compilation as ‘internal’.  Since we rely on such functions and there
does not appear to be a high-level replacement at the moment, let's work
around this case.

* guix/build/emacs-utils.scm (emacs-compile-directory): Require comp early
and check if ‘comp-write-bytecode-file’ is available.

Fixes: Upstream renamed comp-write-bytecode-file <https://bugs.gnu.org/69201>
---
 guix/build/emacs-utils.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm
index eca42bf305..aeb364133a 100644
--- a/guix/build/emacs-utils.scm
+++ b/guix/build/emacs-utils.scm
@@ -136,7 +136,14 @@ (define* (emacs-compile-directory dir)
   (emacs-batch-eval
     `(let ((byte-compile-debug t)       ; for proper exit status
            (byte+native-compile (native-comp-available-p))
-           (files (directory-files-recursively ,dir "\\.el$")))
+           (files (directory-files-recursively ,dir "\\.el$"))
+           (write-bytecode
+            (and (native-comp-available-p)
+                 (progn
+                  (require 'comp)
+                  (if (fboundp 'comp-write-bytecode-file)
+                      'comp-write-bytecode-file
+                      'comp--write-bytecode-file)))))
        (mapc
         (lambda (file)
           (let (byte-to-native-output-buffer-file
@@ -152,7 +159,7 @@ (define* (emacs-compile-directory dir)
                 (byte-compile-file file))
             ;; After native compilation, write the bytecode file.
             (unless (null byte-to-native-output-buffer-file)
-              (comp-write-bytecode-file nil))))
+              (funcall write-bytecode nil))))
        files))
     #:dynamic? #t))
 

base-commit: 3d4fc910f73220f47e5f2459853333a7c83c5d1d
-- 
2.41.0

Message #11 received at 69510 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 69510 <at> debbugs.gnu.org
Cc: Mekeor Melire <mekeor <at> posteo.de>
Subject: [PATCH emacs-team 2/2] gnu: emacs-next-minimal: Update to
 30.0.50-2.170c655.
Date: Sat, 2 Mar 2024 17:13:32 +0100

* gnu/packages/emacs.scm (emacs-next-minimal): Update to 30.0.50-2.170c655.
* gnu/packages/aux-files/emacs/comp-integrity.el: Adjust accordingly.
---
 gnu/packages/aux-files/emacs/comp-integrity.el | 5 ++++-
 gnu/packages/emacs.scm                         | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/aux-files/emacs/comp-integrity.el b/gnu/packages/aux-files/emacs/comp-integrity.el
index ed6a348fed..9692d9bf97 100644
--- a/gnu/packages/aux-files/emacs/comp-integrity.el
+++ b/gnu/packages/aux-files/emacs/comp-integrity.el
@@ -89,7 +89,10 @@
 (expect-native mouse-wheel-change-button)
 (expect-native advice-function-mapc)
 (expect-native comment-string-strip)
-(expect-native obarray-make)
+(if (>= emacs-major-version 30)
+    (expect-builtin obarray-make)
+    (expect-native obarray-make))
+(expect-native obarray-map)
 (expect-native oclosure-type)
 (expect-native forward-page)
 (expect-native sentence-end)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index e6f2b699ac..e89c6cff16 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -549,8 +549,8 @@ (define-public emacs-wide-int
         #~(cons "--with-wide-int" #$flags))))))
 
 (define-public emacs-next-minimal
-  (let ((commit "9d27b95b263473fb41a30e3f6ea5607c99e93a61")
-        (revision "1"))
+  (let ((commit "170c6557922dad7e6e9bc0d6dadf6c080108fd42")
+        (revision "2"))
    (package
     (inherit emacs-minimal)
     (name "emacs-next-minimal")
@@ -563,7 +563,7 @@ (define-public emacs-next-minimal
              (commit commit)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "00mwpq1msr3jij281w5piqmbwq968xr8dn9hqbf4r947ck754kn9"))
+        (base32 "04carva3b6h9fnlzazrsxsj41hcnjc26kxjij07l159azi40l6sk"))
        (patches
         (search-patches "emacs-next-exec-path.patch"
                         "emacs-fix-scheme-indent-function.patch"
-- 
2.41.0

Message #14 received at 69510 <at> debbugs.gnu.org (full text, mbox):

From: Andrew Tropin <andrew <at> trop.in>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 69510 <at> debbugs.gnu.org
Cc: Mekeor Melire <mekeor <at> posteo.de>, cox.katherine.e+guix <at> gmail.com,
 liliana.prikler <at> gmail.com
Subject: Re: [bug#69510] [PATCH emacs-team 1/2] guix: emacs-utils: Make
 emacs-compile-directory forwards-compatible.
Date: Mon, 04 Mar 2024 17:45:10 +0300

[Message part 1 (text/plain, inline)]

On 2024-03-02 16:56, Liliana Marie Prikler wrote:

> Newer (development) builds of Emacs 30 mark a number of functions related to
> native compilation as ‘internal’.  Since we rely on such functions and there
> does not appear to be a high-level replacement at the moment, let's work
> around this case.
>
> * guix/build/emacs-utils.scm (emacs-compile-directory): Require comp early
> and check if ‘comp-write-bytecode-file’ is available.
>
> Fixes: Upstream renamed comp-write-bytecode-file <https://bugs.gnu.org/69201>
> ---
>  guix/build/emacs-utils.scm | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm
> index eca42bf305..aeb364133a 100644
> --- a/guix/build/emacs-utils.scm
> +++ b/guix/build/emacs-utils.scm
> @@ -136,7 +136,14 @@ (define* (emacs-compile-directory dir)
>    (emacs-batch-eval
>      `(let ((byte-compile-debug t)       ; for proper exit status
>             (byte+native-compile (native-comp-available-p))
> -           (files (directory-files-recursively ,dir "\\.el$")))
> +           (files (directory-files-recursively ,dir "\\.el$"))
> +           (write-bytecode
> +            (and (native-comp-available-p)
> +                 (progn
> +                  (require 'comp)
> +                  (if (fboundp 'comp-write-bytecode-file)
> +                      'comp-write-bytecode-file
> +                      'comp--write-bytecode-file)))))
>         (mapc
>          (lambda (file)
>            (let (byte-to-native-output-buffer-file
> @@ -152,7 +159,7 @@ (define* (emacs-compile-directory dir)
>                  (byte-compile-file file))
>              ;; After native compilation, write the bytecode file.
>              (unless (null byte-to-native-output-buffer-file)
> -              (comp-write-bytecode-file nil))))
> +              (funcall write-bytecode nil))))
>         files))
>      #:dynamic? #t))
>  
>
> base-commit: 3d4fc910f73220f47e5f2459853333a7c83c5d1d

Hi Liliana!

Looks reasonable to me.

-- 
Best regards,
Andrew Tropin

[signature.asc (application/pgp-signature, inline)]

Message #17 received at 69510 <at> debbugs.gnu.org (full text, mbox):

From: Gabriel Santos <gabrielsantosdesouza <at> disroot.org>
To: 69510 <at> debbugs.gnu.org
Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com>,
 Andrew Tropin <andrew <at> trop.in>
Subject: Re: [PATCH emacs-team 0/2] Update emacs-next
Date: Wed, 30 Apr 2025 13:08:27 -0300

Hi Liliana (and Andrew),

It seems the changes made in this issue have already been merged. I'm
not sure if I have the authority (I'm not a member of any team yet) to
close the issue, so this is just a reminder that it's still open.

Regards,

-- 
Gabriel Santos

Message #22 received at 69510-done <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Gabriel Santos <gabrielsantosdesouza <at> disroot.org>, 
 69510-done <at> debbugs.gnu.org
Cc: Andrew Tropin <andrew <at> trop.in>
Subject: Re: [PATCH emacs-team 0/2] Update emacs-next
Date: Mon, 05 May 2025 11:26:51 +0200

Am Mittwoch, dem 30.04.2025 um 13:08 -0300 schrieb Gabriel Santos:
> 
> Hi Liliana (and Andrew),
> 
> It seems the changes made in this issue have already been merged. I'm
> not sure if I have the authority (I'm not a member of any team yet)
> to close the issue, so this is just a reminder that it's still open.
Hi,

anyone can close a bug by messaging NNNNN-done.  This will probably get
harder when we switch to Codeberg ._.

Anyway, I'm closing it now.

Cheers

Message #25 received at 69510-done <at> debbugs.gnu.org (full text, mbox):

From: Gabriel Santos <gabrielsantosdesouza <at> disroot.org>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>,
 69510-done <at> debbugs.gnu.org
Cc: Andrew Tropin <andrew <at> trop.in>
Subject: Re: [PATCH emacs-team 0/2] Update emacs-next
Date: Mon, 05 May 2025 08:28:12 -0300

>anyone can close a bug by messaging NNNNN-done.

Thanks, I only closed bugs that were mine so I thought some sort of
permission was needed to close issues opened by others.

-- 
Gabriel Santos

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.