GNU logs - #75268, boring messages

Message sent to andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, guix-patches@HIDDEN:

Subject: [bug#75268] [PATCH emacs-team 0/2] Apply native-comp grafts to emacs-next as well
Resent-From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, guix-patches@HIDDEN
Resent-Date: Wed, 01 Jan 2025 21:30:01 +0000
Resent-Message-ID: <handler.75268.B.173576696524647 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 75268 <at> debbugs.gnu.org
Cc: andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN
Message-ID: <cover.1735766271.git.liliana.prikler@HIDDEN>
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Date: Wed, 1 Jan 2025 22:17:51 +0100
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2a00:1450:4864:20::441;
 envelope-from=liliana.prikler@HIDDEN; helo=mail-wr1-x441.google.com
X-Spam_score_int: 1
X-Spam_score: 0.1
X-Spam_bar: /
X-Spam_report: (0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,
 DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001,
 MALFORMED_FREEMAIL=2.234, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=no autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 3.2 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview:  Hi Guix, having fixed various issues[1,
 2] that popped up since
 the first introduction of ahead-of-time compiled Emacs packages[3], I think
 it is safe to apply the same changes to emacs-next as well. Obviously, [...]
 Content analysis details:   (3.2 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 0.0 FREEMAIL_FROM          Sender email is commonly abused enduser mail
 provider (liliana.prikler[at]gmail.com)
 1.0 SPF_SOFTFAIL           SPF: sender does not match SPF record (softfail)
 -0.0 SPF_HELO_PASS          SPF: HELO matches SPF record
 -0.0 RCVD_IN_DNSWL_NONE     RBL: Sender listed at https://www.dnswl.org/,
 no trust [2001:470:142:0:0:0:0:17 listed in] [list.dnswl.org]
 2.2 MALFORMED_FREEMAIL     Bad headers on message from free email
 service
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.2 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  Hi Guix, having fixed various issues[1,2] that popped up since
    the first introduction of ahead-of-time compiled Emacs packages[3], I think
    it is safe to apply the same changes to emacs-next as well. Obviously, [...]
    
 
 Content analysis details:   (2.2 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -0.0 RCVD_IN_DNSWL_NONE     RBL: Sender listed at https://www.dnswl.org/,
                              no trust
                             [2001:470:142:0:0:0:0:17 listed in]
                             [list.dnswl.org]
  0.0 FREEMAIL_FROM          Sender email is commonly abused enduser mail
                             provider (liliana.prikler[at]gmail.com)
  1.0 SPF_SOFTFAIL           SPF: sender does not match SPF record (softfail)
 -0.0 SPF_HELO_PASS          SPF: HELO matches SPF record
  2.2 MALFORMED_FREEMAIL     Bad headers on message from free email
                             service
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

Hi Guix,

having fixed various issues[1,2] that popped up since the first
introduction of ahead-of-time compiled Emacs packages[3], I think it
is safe to apply the same changes to emacs-next as well.  Obviously,
we are preparing for a time when emacs-next will be emacs,
however far in the future that is :)

After applying these changes, I will rebase emacs-team on master,
so that it can hopefully be merged soon.

Cheers

[1] https://issues.guix.gnu.org/67292#18
[2] https://issues.guix.gnu.org/72045
[3] https://issues.guix.gnu.org/67260

Liliana Marie Prikler (2):
  gnu: emacs-next: Don't hash file names in native compilation.
  gnu: emacs-next: Pin natively compiled packages.

 gnu/local.mk                                  |   1 +
 gnu/packages/emacs.scm                        |   2 +
 ...emacs-next-native-comp-fix-filenames.patch | 334 ++++++++++++++++++
 3 files changed, 337 insertions(+)
 create mode 100644 gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch


base-commit: 5b28731e904eed2909946cccedb27d1a1bdd7558
-- 
2.47.1

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Subject: bug#75268: Acknowledgement ([PATCH emacs-team 0/2] Apply
 native-comp grafts to emacs-next as well)
Message-ID: <handler.75268.B.173576696524647.ack <at> debbugs.gnu.org>
References: <cover.1735766271.git.liliana.prikler@HIDDEN>
X-Gnu-PR-Message: ack 75268
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 75268 <at> debbugs.gnu.org
Date: Wed, 01 Jan 2025 21:30:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

As you requested using X-Debbugs-CC, your message was also forwarded to
  andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN
(after having been given a bug report number, if it did not have one).

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 75268 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
75268: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D75268
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, guix-patches@HIDDEN:

Subject: [bug#75268] [PATCH emacs-team 2/2] gnu: emacs-next: Pin natively compiled packages.
Resent-From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, guix-patches@HIDDEN
Resent-Date: Wed, 01 Jan 2025 21:34:01 +0000
Resent-Message-ID: <handler.75268.B75268.173576722325556 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 75268 <at> debbugs.gnu.org
Cc: andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN
Message-ID: <5b659b8ece40e2fe6e111190ed89029c84ac8dbb.1735766271.git.liliana.prikler@HIDDEN>
In-Reply-To: <cover.1735766271.git.liliana.prikler@HIDDEN>
References: <cover.1735766271.git.liliana.prikler@HIDDEN>
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Date: Wed, 1 Jan 2025 22:16:19 +0100
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
 
 Content preview:  * gnu/packages/emacs.scm (emacs)[patches]: Add =?UTF-8?Q?=E2=80=9Cemacs-native-comp-pin-packages.patch=E2=80=9D.?=
    --- gnu/packages/emacs.scm | 1 + 1 file changed, 1 insertion(+) diff --git
    a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 7ce70de5c0f..b5c76586f7c
    100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -578,6
    +578,7 @@ (define-public emacs-ne [...] 
 
 Content analysis details:   (2.2 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -0.0 RCVD_IN_DNSWL_NONE     RBL: Sender listed at https://www.dnswl.org/,
                              no trust
                             [2a00:1450:4864:20:0:0:0:443 listed in]
                             [list.dnswl.org]
  0.0 FREEMAIL_FROM          Sender email is commonly abused enduser mail
                             provider (liliana.prikler[at]gmail.com)
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
  2.2 MALFORMED_FREEMAIL     Bad headers on message from free email
                             service
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 1.2 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * gnu/packages/emacs.scm (emacs)[patches]: Add =?UTF-8?Q?=E2=80=9Cemacs-native-comp-pin-packages.patch=E2=80=9D.?=
    --- gnu/packages/emacs.scm | 1 + 1 file changed, 1 insertion(+) diff --git
    a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 7ce70de5c0f..b5c76586f7c
    100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -578,6
    +578,7 @@ (define-public emacs-ne [...] 
 
 Content analysis details:   (1.2 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -0.0 RCVD_IN_DNSWL_NONE     RBL: Sender listed at https://www.dnswl.org/,
                              no trust
                             [2a00:1450:4864:20:0:0:0:443 listed in]
                             [list.dnswl.org]
  0.0 FREEMAIL_FROM          Sender email is commonly abused enduser mail
                             provider (liliana.prikler[at]gmail.com)
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
  2.2 MALFORMED_FREEMAIL     Bad headers on message from free email
                             service
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* gnu/packages/emacs.scm (emacs)[patches]: Add
“emacs-native-comp-pin-packages.patch”.
---
 gnu/packages/emacs.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 7ce70de5c0f..b5c76586f7c 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -578,6 +578,7 @@ (define-public emacs-next-minimal
                         "emacs-fix-scheme-indent-function.patch"
                         "emacs-next-native-comp-driver-options.patch"
                         "emacs-next-native-comp-fix-filenames.patch"
+                        "emacs-native-comp-pin-packages.patch"
                         "emacs-pgtk-super-key-fix.patch")))))))
 
 (define* (emacs->emacs-next emacs #:optional name
-- 
2.47.1

Message sent to andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, guix-patches@HIDDEN:

Subject: [bug#75268] [PATCH emacs-team 1/2] gnu: emacs-next: Don't hash file names in native compilation.
Resent-From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, guix-patches@HIDDEN
Resent-Date: Wed, 01 Jan 2025 21:34:02 +0000
Resent-Message-ID: <handler.75268.B75268.173576722825574 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 75268 <at> debbugs.gnu.org
Cc: andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN
Message-ID: <0ba376503c3ef5c2ea1503ec82bed562b6a16493.1735766271.git.liliana.prikler@HIDDEN>
In-Reply-To: <cover.1735766271.git.liliana.prikler@HIDDEN>
References: <cover.1735766271.git.liliana.prikler@HIDDEN>
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Date: Wed, 1 Jan 2025 22:15:31 +0100
MIME-Version: 1.0
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
 
 Content preview:  * gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch:
    New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs.scm
    (emacs-minimal)[source]: Use it here. --- gnu/ [...] 
 
 Content analysis details:   (1.4 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -0.0 RCVD_IN_DNSWL_NONE     RBL: Sender listed at https://www.dnswl.org/,
                              no trust
                             [2a00:1450:4864:20:0:0:0:344 listed in]
                             [list.dnswl.org]
  0.0 FREEMAIL_FROM          Sender email is commonly abused enduser mail
                             provider (liliana.prikler[at]gmail.com)
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
  0.2 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII
                              but isn't
  2.2 MALFORMED_FREEMAIL     Bad headers on message from free email
                             service
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it here.
* gnu/packages/emacs.scm (emacs-minimal)[source]: Use it here.
---
 gnu/local.mk                                  |   1 +
 gnu/packages/emacs.scm                        |   1 +
 ...emacs-next-native-comp-fix-filenames.patch | 334 ++++++++++++++++++
 3 files changed, 336 insertions(+)
 create mode 100644 gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 652a6c1748e..8600569767b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1198,6 +1198,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/emacs-native-comp-pin-packages.patch   \
   %D%/packages/patches/emacs-next-exec-path.patch   \
   %D%/packages/patches/emacs-next-native-comp-driver-options.patch   \
+  %D%/packages/patches/emacs-next-native-comp-fix-filenames.patch   \
   %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch  \
   %D%/packages/patches/emacs-pgtk-super-key-fix.patch	\
   %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch  \
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index b0690fc4fb0..7ce70de5c0f 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -577,6 +577,7 @@ (define-public emacs-next-minimal
         (search-patches "emacs-next-exec-path.patch"
                         "emacs-fix-scheme-indent-function.patch"
                         "emacs-next-native-comp-driver-options.patch"
+                        "emacs-next-native-comp-fix-filenames.patch"
                         "emacs-pgtk-super-key-fix.patch")))))))
 
 (define* (emacs->emacs-next emacs #:optional name
diff --git a/gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch b/gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch
new file mode 100644
index 00000000000..9968dfc4848
--- /dev/null
+++ b/gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch
@@ -0,0 +1,334 @@
+Upstream hashes both the absolute file name and the content of a file
+to derive the name for the natively compiled files.  This breaks the
+staged install used in guix, as any $GUIX_PROFILE is distinct from
+the build directory.  It also breaks grafts, as hardcoded store file
+names get rewritten; thus changing the file hash.
+
+In addition, this patch changes how native-comp-eln-load-path is
+constructed.  Upstream, an entry of the directory “../lisp” is added
+supposedly for bootstrap only, but this directory appears to find its
+way into the actual variable despite attempts to remove it by calling
+‘startup--update-eln-cache’.
+The user-visible procedure ‘startup-redirect-eln-cache’ is kept, as
+packages may require it, but only pushes the new value now.
+
+Index: emacs-next/src/comp.c
+===================================================================
+--- emacs-next.orig/src/comp.c
++++ emacs-next/src/comp.c
+@@ -4403,26 +4403,17 @@ DEFUN ("comp-el-to-eln-rel-filename", Fc
+        Scomp_el_to_eln_rel_filename, 1, 1, 0,
+        doc: /* Return the relative name of the .eln file for FILENAME.
+ FILENAME must exist, and if it's a symlink, the target must exist.
+-If FILENAME is compressed, it must have the \".gz\" extension,
+-and Emacs must have been compiled with zlib; the file will be
+-uncompressed on the fly to hash its contents.
+-Value includes the original base name, followed by 2 hash values,
+-one for the file name and another for its contents, followed by .eln.  */)
++FILENAME is resolved relative to `load-path' and only the suffix of
++the first matching path is kept.  If FILENAME is not found to be relative
++to any directory `load-path', it is used as-is to construct the return
++value.  */)
+   (Lisp_Object filename)
+ {
+   CHECK_STRING (filename);
+ 
+-  /* Resolve possible symlinks in FILENAME, so that path_hash below
+-     always compares equal. (Bug#44701).  */
+-  filename = Fexpand_file_name (filename, Qnil);
+-  char *file_normalized = realpath (SSDATA (ENCODE_FILE (filename)), NULL);
+-  if (file_normalized)
+-    {
+-      filename = DECODE_FILE (make_unibyte_string (file_normalized,
+-						   strlen (file_normalized)));
+-      xfree (file_normalized);
+-    }
++  Lisp_Object rel_name = filename;
+ 
++  filename = Fexpand_file_name (filename, Qnil);
+   if (NILP (Ffile_exists_p (filename)))
+     xsignal1 (Qfile_missing, filename);
+ 
+@@ -4430,64 +4421,55 @@ one for the file name and another for it
+   filename = Fw32_long_file_name (filename);
+ #endif
+ 
+-  Lisp_Object content_hash = comp_hash_source_file (filename);
+-
+-  if (suffix_p (filename, ".gz"))
+-    filename = Fsubstring (filename, Qnil, make_fixnum (-3));
+-
+-  /* We create eln filenames with an hash in order to look-up these
+-     starting from the source filename, IOW have a relation
+-
+-     /absolute/path/filename.el + content ->
+-     eln-cache/filename-path_hash-content_hash.eln.
+-
+-     'dlopen' can return the same handle if two shared with the same
+-     filename are loaded in two different times (even if the first was
+-     deleted!).  To prevent this scenario the source file content is
+-     included in the hashing algorithm.
+-
+-     As at any point in time no more then one file can exist with the
+-     same filename, should be possible to clean up all
+-     filename-path_hash-* except the most recent one (or the new one
+-     being recompiled).
+-
+-     As installing .eln files compiled during the build changes their
+-     absolute path we need an hashing mechanism that is not sensitive
+-     to that.  For this we replace if match PATH_DUMPLOADSEARCH or
+-     *PATH_REL_LOADSEARCH with '//' before computing the hash.  */
+-
+-  if (NILP (loadsearch_re_list))
+-    {
+-      Lisp_Object sys_re =
+-	concat2 (build_string ("\\`[[:ascii:]]+"),
+-		 Fregexp_quote (build_string ("/" PATH_REL_LOADSEARCH "/")));
+-      Lisp_Object dump_load_search =
+-	Fexpand_file_name (build_string (PATH_DUMPLOADSEARCH "/"), Qnil);
+-#ifdef WINDOWSNT
+-      dump_load_search = Fw32_long_file_name (dump_load_search);
+-#endif
+-      loadsearch_re_list = list2 (sys_re, Fregexp_quote (dump_load_search));
+-    }
++  Lisp_Object tail = Vload_path;
++  Lisp_Object name_len = Flength (filename);
+ 
+-  Lisp_Object lds_re_tail = loadsearch_re_list;
+-  FOR_EACH_TAIL (lds_re_tail)
++  FOR_EACH_TAIL_SAFE (tail)
+     {
+-      Lisp_Object match_idx =
+-	Fstring_match (XCAR (lds_re_tail), filename, Qnil, Qnil);
+-      if (BASE_EQ (match_idx, make_fixnum (0)))
++      Lisp_Object directory = Ffile_name_as_directory (XCAR (tail));
++      Lisp_Object len = Flength (directory);
++      if (XFIXNUM (name_len) < XFIXNUM (len))
++	continue;
++      else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len,
++					 directory, make_fixnum (0), len,
++					 Qnil)))
+ 	{
+-	  filename =
+-	    Freplace_match (build_string ("//"), Qt, Qt, filename, Qnil);
++	  filename = Fsubstring (filename, len, Qnil);
+ 	  break;
+ 	}
+     }
+-  Lisp_Object separator = build_string ("-");
+-  Lisp_Object path_hash = comp_hash_string (filename);
+-  filename = concat2 (Ffile_name_nondirectory (Fsubstring (filename, Qnil,
+-							   make_fixnum (-3))),
+-		      separator);
+-  Lisp_Object hash = concat3 (path_hash, separator, content_hash);
+-  return concat3 (filename, hash, build_string (NATIVE_ELISP_SUFFIX));
++
++  if (file_name_absolute_p (filename)) /* no match in load-path */
++    filename = rel_name;
++
++  Lisp_Object bogus_dirs =
++    Fgetenv_internal (build_string ("NATIVE_COMP_BOGUS_DIRS"), Qnil);
++
++  if (!NILP (bogus_dirs))
++  {
++    tail = CALL2I (split-string, bogus_dirs, build_string (":"));
++
++    FOR_EACH_TAIL_SAFE (tail)
++      {
++	Lisp_Object directory = Ffile_name_as_directory (XCAR (tail));
++	Lisp_Object len = Flength (directory);
++	if (XFIXNUM (name_len) < XFIXNUM (len))
++	  continue;
++	else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len,
++					   directory, make_fixnum (0), len,
++					   Qnil)))
++	  {
++	    filename = Fsubstring (filename, len, Qnil);
++	    break;
++	  }
++      }
++  }
++
++  if (suffix_p (filename, ".gz"))
++    filename = Fsubstring (filename, Qnil, make_fixnum (-3));
++
++  return concat2(Fsubstring (filename, Qnil, make_fixnum (-3)),
++		 build_string (NATIVE_ELISP_SUFFIX));
+ }
+ 
+ DEFUN ("comp-el-to-eln-filename", Fcomp_el_to_eln_filename,
+@@ -4501,13 +4483,7 @@ If BASE-DIR is non-nil, use it as the di
+ non-absolute BASE-DIR is interpreted as relative to `invocation-directory'.
+ If BASE-DIR is omitted or nil, look for the first writable directory
+ in `native-comp-eln-load-path', and use as BASE-DIR its subdirectory
+-whose name is given by `comp-native-version-dir'.
+-If FILENAME specifies a preloaded file, the directory for the .eln
+-file is the \"preloaded/\" subdirectory of the directory determined
+-as described above.  FILENAME is considered to be a preloaded file if
+-the value of `comp-file-preloaded-p' is non-nil, or if FILENAME
+-appears in the value of the environment variable LISP_PRELOADED;
+-the latter is supposed to be used by the Emacs build procedure.  */)
++whose name is given by `comp-native-version-dir'. */)
+   (Lisp_Object filename, Lisp_Object base_dir)
+ {
+   Lisp_Object source_filename = filename;
+@@ -4555,10 +4531,11 @@ the latter is supposed to be used by the
+   Lisp_Object lisp_preloaded =
+     Fgetenv_internal (build_string ("LISP_PRELOADED"), Qnil);
+   base_dir = Fexpand_file_name (Vcomp_native_version_dir, base_dir);
++  bool preloaded = comp_file_preloaded_p;
+   if (comp_file_preloaded_p
+       || (!NILP (lisp_preloaded)
+-	  && !NILP (Fmember (CALL1I (file-name-base, source_filename),
+-			     Fmapcar (intern_c_string ("file-name-base"),
++	  && !NILP (Fmember (CALL1I (file-name-sans-extension, source_filename),
++			     Fmapcar (intern_c_string ("file-name-sans-extension"),
+ 				      CALL1I (split-string, lisp_preloaded))))))
+     base_dir = Fexpand_file_name (build_string ("preloaded"), base_dir);
+ 
+@@ -5875,10 +5852,7 @@ The last directory of this list is assum
+ the system *.eln files, which are the files produced when building
+ Emacs.  */);
+ 
+-  /* Temporary value in use for bootstrap.  We can't do better as
+-     `invocation-directory' is still unset, will be fixed up during
+-     dump reload.  */
+-  Vnative_comp_eln_load_path = Fcons (build_string ("../native-lisp/"), Qnil);
++  Vnative_comp_eln_load_path = Qnil;
+ 
+   DEFVAR_LISP ("native-comp-enable-subr-trampolines",
+ 	       Vnative_comp_enable_subr_trampolines,
+Index: emacs-next/lisp/startup.el
+===================================================================
+--- emacs-next.orig/lisp/startup.el
++++ emacs-next/lisp/startup.el
+@@ -527,9 +527,6 @@ DIRS are relative."
+ (defvar native-comp-jit-compilation)
+ (defvar native-comp-enable-subr-trampolines)
+ 
+-(defvar startup--original-eln-load-path nil
+-  "Original value of `native-comp-eln-load-path'.")
+-
+ (defun startup-redirect-eln-cache (cache-directory)
+   "Redirect the user's eln-cache directory to CACHE-DIRECTORY.
+ CACHE-DIRECTORY must be a single directory, a string.
+@@ -540,22 +537,10 @@ to `user-emacs-directory'.
+ For best results, call this function in your early-init file,
+ so that the rest of initialization and package loading uses
+ the updated value."
+-  ;; Remove the original eln-cache.
+-  (setq native-comp-eln-load-path (cdr native-comp-eln-load-path))
+-  ;; Add the new eln-cache.
+   (push (expand-file-name (file-name-as-directory cache-directory)
+                           user-emacs-directory)
+         native-comp-eln-load-path))
+ 
+-(defun startup--update-eln-cache ()
+-  "Update the user eln-cache directory due to user customizations."
+-  ;; Don't override user customizations!
+-  (when (equal native-comp-eln-load-path
+-               startup--original-eln-load-path)
+-    (startup-redirect-eln-cache "eln-cache")
+-    (setq startup--original-eln-load-path
+-          (copy-sequence native-comp-eln-load-path))))
+-
+ (defun startup--rescale-elt-match-p (font-pattern font-object)
+   "Test whether FONT-OBJECT matches an element of `face-font-rescale-alist'.
+ FONT-OBJECT is a font-object that specifies a font to test.
+@@ -1383,12 +1368,6 @@ please check its value")
+       startup-init-directory)))
+   (setq early-init-file user-init-file)
+ 
+-  ;; Amend `native-comp-eln-load-path', since the early-init file may
+-  ;; have altered `user-emacs-directory' and/or changed the eln-cache
+-  ;; directory.
+-  (when (featurep 'native-compile)
+-    (startup--update-eln-cache))
+-
+   ;; If any package directory exists, initialize the package system.
+   (and user-init-file
+        package-enable-at-startup
+@@ -1523,12 +1502,6 @@ please check its value")
+         startup-init-directory))
+      t)
+ 
+-    ;; Amend `native-comp-eln-load-path' again, since the early-init
+-    ;; file may have altered `user-emacs-directory' and/or changed the
+-    ;; eln-cache directory.
+-    (when (featurep 'native-compile)
+-      (startup--update-eln-cache))
+-
+     (when (and deactivate-mark transient-mark-mode)
+       (with-current-buffer (window-buffer)
+         (deactivate-mark)))
+Index: emacs-next/lisp/loadup.el
+===================================================================
+--- emacs-next.orig/lisp/loadup.el
++++ emacs-next/lisp/loadup.el
+@@ -53,6 +53,14 @@
+ (setq redisplay--inhibit-bidi t)
+ 
+ (message "Dump mode: %s" dump-mode)
++;; Compensate for native-comp-eln-load-path being empty by Guix' default.
++(and (featurep 'native-compile)
++     dump-mode
++     (setq
++      native-comp-eln-load-path
++      (cons (expand-file-name "../native-lisp" invocation-directory)
++            native-comp-eln-load-path)
++      comp-file-preloaded-p t))
+ 
+ ;; Add subdirectories to the load-path for files that might get
+ ;; autoloaded when bootstrapping or running Emacs normally.
+@@ -538,27 +546,25 @@ This to have it working when installed o
+ directory got moved.  This is set to be a pair in the form of:
+ \(rel-filename-from-install-bin . rel-filename-from-local-bin)."
+   (when (and load--bin-dest-dir load--eln-dest-dir)
+-      (setq eln-dest-dir
+-          (concat load--eln-dest-dir "native-lisp/" comp-native-version-dir "/"))
++      (setq load--eln-versioned-dest-dir
++            (concat load--eln-dest-dir "native-lisp/" comp-native-version-dir "/"))
+       (maphash (lambda (_ cu)
+                (when (stringp (native-comp-unit-file cu))
+                  (let* ((file (native-comp-unit-file cu))
+-                        (preloaded (equal (substring (file-name-directory file)
+-                                                     -10 -1)
+-                                          "preloaded"))
+-                        (eln-dest-dir-eff (if preloaded
+-                                              (expand-file-name "preloaded"
+-                                                                eln-dest-dir)
+-                                            eln-dest-dir)))
++                        (native-lisp-needle
++                         (regexp-quote (concat "native-lisp/"
++                                               comp-native-version-dir "/"))))
+                    (native-comp-unit-set-file
+                     cu
+ 	            (cons
+                      ;; Relative filename from the installed binary.
+-                     (file-relative-name (expand-file-name
+-                                          (file-name-nondirectory
+-                                           file)
+-                                          eln-dest-dir-eff)
+-                                         load--bin-dest-dir)
++                     (file-relative-name
++                      (expand-file-name
++                       (save-match-data
++                         (string-match native-lisp-needle file)
++                         (substring file (match-end 0)))
++                       load--eln-versioned-dest-dir)
++                      load--bin-dest-dir)
+                      ;; Relative filename from the built uninstalled binary.
+                      (file-relative-name file invocation-directory))))))
+ 	     comp-loaded-comp-units-h)))
+Index: emacs-next/src/Makefile.in
+===================================================================
+--- emacs-next.orig/src/Makefile.in
++++ emacs-next/src/Makefile.in
+@@ -591,6 +591,7 @@ shortlisp := $(filter-out ${shortlisp_fi
+ ## We don't really need to sort, but may as well use it to remove duplicates.
+ shortlisp := loaddefs.el loadup.el $(sort ${shortlisp})
+ export LISP_PRELOADED = ${shortlisp}
++export NATIVE_COMP_BOGUS_DIRS =
+ lisp = $(addprefix ${lispsource}/,${shortlisp})
+ 
+ ## Construct full set of libraries to be linked.
-- 
2.47.1

Message sent to andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, ian@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#75268] [PATCH emacs-team v2 2/3] gnu: emacs-next: Pin natively compiled packages.
Resent-From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, ian@HIDDEN, guix-patches@HIDDEN
Resent-Date: Mon, 06 Jan 2025 16:43:01 +0000
Resent-Message-ID: <handler.75268.B75268.173618172524335 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 75268
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 75268 <at> debbugs.gnu.org
Cc: andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, ian@HIDDEN
X-Debbugs-Original-Xcc: andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, ian@HIDDEN
Received: via spool by 75268-submit <at> debbugs.gnu.org id=B75268.173618172524335
          (code B ref 75268); Mon, 06 Jan 2025 16:43:01 +0000
Received: (at 75268) by debbugs.gnu.org; 6 Jan 2025 16:42:05 +0000
Received: from localhost ([127.0.0.1]:39804 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tUqB2-0006KN-TN
	for submit <at> debbugs.gnu.org; Mon, 06 Jan 2025 11:42:05 -0500
Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:53539)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.84_2) (envelope-from <liliana.prikler@HIDDEN>)
 id 1tUqB0-0006Jo-2u
 for 75268 <at> debbugs.gnu.org; Mon, 06 Jan 2025 11:42:03 -0500
Received: by mail-wm1-x343.google.com with SMTP id
 5b1f17b1804b1-4361f796586so150956145e9.3
 for <75268 <at> debbugs.gnu.org>; Mon, 06 Jan 2025 08:42:02 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1736181718; x=1736786518; darn=debbugs.gnu.org;
 h=to:content-transfer-encoding:mime-version:subject:date:from
 :references:in-reply-to:message-id:from:to:cc:subject:date
 :message-id:reply-to;
 bh=ilZwCuQIH5tOeZTcMjdC/JX6PhDIgh1pz4Ag23Vlrgw=;
 b=Sh5yngnvy+ne3xEeZpbfQSHETfX/Qyp9RqDe75qoYfbCejCfkf8ZhNEl51h3kDbhpy
 Bu8GGweY87s3xsB3iFLvoKdXUfH8Xqwhoapft1Xyni+jXy4LozPZKRUEBpPO+TxvFXC7
 7NDdE5DHxsehfP7C84RSwTV6KQLsO1/3o5gR68I15w42nNXobFa3THVvWcmh+inQjl0+
 3okUVhxxVqa2nPsXAaXqEzlsw/wadJbSl3S60jt9uxmepxsotnhL7l+s5FSJloxEsJN1
 N5GpbzysKrg14LlwiuQr/RMi49mYBQrAOJ9NSnDo3yK4nuQRD8Cwe7bdLaHyYXMh/Tet
 rYbg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1736181718; x=1736786518;
 h=to:content-transfer-encoding:mime-version:subject:date:from
 :references:in-reply-to:message-id:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=ilZwCuQIH5tOeZTcMjdC/JX6PhDIgh1pz4Ag23Vlrgw=;
 b=o75MxkapX/ZwbFiejJxxN+1E6GGLohJYAtpYFRNE8ewR2qVRwweP/3MhNgok69G4GC
 qtKDX8NdSjwnLZjrS7vJlJ7EqoiSsDNFX+6H1TuoiL+KGXW6K2U73Jkaa9rVCWL7vK2j
 T6REtap1nIX9vlLhYxlgn7aIkwzHrfg3nbJPrHRCLB6Wu4ZFrvSz/SqDeMkg7MDXYfv1
 sc4YOjJ5cvawznsdnB2Y4HrFGmMI9E1/7cCL0oDefU/QBK+gXy/xl4abKoeEGLlWRASh
 OvSkVu9s1tgYxSmTtEZ5+/pRQD+aIuBQLR69+Zxj1aOECjeo53pnch5xMpLkdzKZ8b7l
 722g==
X-Gm-Message-State: AOJu0Yxd58dW1WLOG5ygE9uU5wCokCIR5ZUFz82Edn6Q2UsVephU5JIS
 0oH8FDnXx8RgFsnXpe+5+Xu9yXrJsJHiNBPKnjWysc35L7QBZkhTEEiAXG1S
X-Gm-Gg: ASbGncuFcaF0bFAm1jYL6RIbiHf/AIS2GCC8KRQsPRkBPCQkVwk1Bd4jWBof1YMFmXL
 SSE1nTnCB3Gpg6+oyQqFdGZv6Wa7mJiBuLuKr4sh//7kH+rZ3qslGjfzVN0kR2XtDB/iOnoKb5Y
 BN5ZeaIkkTghj5w+flQ2o74CZcDycsl1N5/+VPN8e5dQTBw7bBvK4ncBkFpad6OQdM1zuGOMBug
 8X2X7Jd8x0fCA1Y5RrRkVJirF0rtIkDz9xiPYo1gD/utGS+uImOg4V3Uxau5R86BRzKkZi9pfpY
 Uv0zw3igjXv5NWmz9MZsV+s1ccfEAUMQ
X-Google-Smtp-Source: AGHT+IH8bWG+hRLowUEAt3GvBjOM/YRTQHn0EKLSkmAhQNsQ1VTvWA6+397hleXgMmXYvoWAEPfxmw==
X-Received: by 2002:a05:600c:4709:b0:436:1ac2:1acf with SMTP id
 5b1f17b1804b1-43668a3a35dmr445008855e9.20.1736181717672; 
 Mon, 06 Jan 2025 08:41:57 -0800 (PST)
Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at.
 [85.127.114.32]) by smtp.gmail.com with ESMTPSA id
 ffacd0b85a97d-38a1c8288b8sm47863365f8f.11.2025.01.06.08.41.57
 for <75268 <at> debbugs.gnu.org>
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Mon, 06 Jan 2025 08:41:57 -0800 (PST)
Message-ID: <f8c194de171e86d64f1afa4f877618205c9dde7c.1736181798.git.liliana.prikler@HIDDEN>
In-Reply-To: <161b5fd3c108eedbb469e237570af3727bda42e5.1736181798.git.liliana.prikler@HIDDEN>
References: <161b5fd3c108eedbb469e237570af3727bda42e5.1736181798.git.liliana.prikler@HIDDEN>
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Date: Wed, 1 Jan 2025 22:16:19 +0100
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 4.3 (++++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * gnu/packages/emacs.scm (emacs)[patches]: Add =?UTF-8?Q?=E2=80=9Cemacs-native-comp-pin-packages.patch=E2=80=9D.?=
    --- gnu/packages/emacs.scm | 1 + 1 file changed, 1 insertion(+) diff --git
    a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e1a9a9a51f..2169cc903a
    100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -578,6
    +578,7 @@ (define-public emacs-next [...] 
 
 Content analysis details:   (4.3 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -0.0 SPF_PASS               SPF: sender matches SPF record
  0.0 FREEMAIL_FROM          Sender email is commonly abused enduser mail
                             provider (liliana.prikler[at]gmail.com)
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
  2.1 DATE_IN_PAST_96_XX     Date: is 96 hours or more before Received:
                             date
 -0.0 RCVD_IN_DNSWL_NONE     RBL: Sender listed at https://www.dnswl.org/,
                              no trust
                             [2a00:1450:4864:20:0:0:0:343 listed in]
                             [list.dnswl.org]
  2.2 MALFORMED_FREEMAIL     Bad headers on message from free email
                             service
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 3.3 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * gnu/packages/emacs.scm (emacs)[patches]: Add =?UTF-8?Q?=E2=80=9Cemacs-native-comp-pin-packages.patch=E2=80=9D.?=
    --- gnu/packages/emacs.scm | 1 + 1 file changed, 1 insertion(+) diff --git
    a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e1a9a9a51f..2169cc903a
    100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -578,6
    +578,7 @@ (define-public emacs-next [...] 
 
 Content analysis details:   (3.3 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -0.0 RCVD_IN_DNSWL_NONE     RBL: Sender listed at https://www.dnswl.org/,
                              no trust
                             [2a00:1450:4864:20:0:0:0:343 listed in]
                             [list.dnswl.org]
 -0.0 SPF_PASS               SPF: sender matches SPF record
  0.0 FREEMAIL_FROM          Sender email is commonly abused enduser mail
                             provider (liliana.prikler[at]gmail.com)
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
  2.1 DATE_IN_PAST_96_XX     Date: is 96 hours or more before Received:
                             date
  2.2 MALFORMED_FREEMAIL     Bad headers on message from free email
                             service
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* gnu/packages/emacs.scm (emacs)[patches]: Add
“emacs-native-comp-pin-packages.patch”.
---
 gnu/packages/emacs.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index e1a9a9a51f..2169cc903a 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -578,6 +578,7 @@ (define-public emacs-next-minimal
                         "emacs-fix-scheme-indent-function.patch"
                         "emacs-next-native-comp-driver-options.patch"
                         "emacs-next-native-comp-fix-filenames.patch"
+                        "emacs-native-comp-pin-packages.patch"
                         "emacs-pgtk-super-key-fix.patch")))))))
 
 (define* (emacs->emacs-next emacs #:optional name
-- 
2.47.1

Message sent to andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, ian@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#75268] [PATCH emacs-team v2 3/3] gnu: emacs-next: Disable jit compilation.
Resent-From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, ian@HIDDEN, guix-patches@HIDDEN
Resent-Date: Mon, 06 Jan 2025 16:43:02 +0000
Resent-Message-ID: <handler.75268.B75268.173618173124369 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 75268
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 75268 <at> debbugs.gnu.org
Cc: andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, ian@HIDDEN
X-Debbugs-Original-Xcc: andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, ian@HIDDEN
Received: via spool by 75268-submit <at> debbugs.gnu.org id=B75268.173618173124369
          (code B ref 75268); Mon, 06 Jan 2025 16:43:02 +0000
Received: (at 75268) by debbugs.gnu.org; 6 Jan 2025 16:42:11 +0000
Received: from localhost ([127.0.0.1]:39810 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tUqB9-0006Kx-Cy
	for submit <at> debbugs.gnu.org; Mon, 06 Jan 2025 11:42:11 -0500
Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:59648)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.84_2) (envelope-from <liliana.prikler@HIDDEN>)
 id 1tUqB4-0006Jk-Oa
 for 75268 <at> debbugs.gnu.org; Mon, 06 Jan 2025 11:42:07 -0500
Received: by mail-wm1-x344.google.com with SMTP id
 5b1f17b1804b1-436281c8a38so104636815e9.3
 for <75268 <at> debbugs.gnu.org>; Mon, 06 Jan 2025 08:42:06 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1736181718; x=1736786518; darn=debbugs.gnu.org;
 h=to:content-transfer-encoding:mime-version:subject:date:from
 :references:in-reply-to:message-id:from:to:cc:subject:date
 :message-id:reply-to;
 bh=HAljNyq+QaAIrmyolWsiLWKDIFw6BYvPANBIzWkJ9YI=;
 b=dwvDIIC5f3jAxaJWu0Y5dPGlbdk7smFOLRL8aCmWQLJZgqGN+se3nI/hsjVeB6PrTm
 Xp230QCHqcmvP/h1W41fnS8dtFIxTR5FC8VmoHewfJSA7ihAwtQLBHDqWP0N/Lw+v6JW
 JxovOkMsElnjJsy7PFdtXQ/Mo7wmdXT5SeAM+uKWY3iov1NEc3f7XIby1aMo4tkaGaUT
 3OSCPTNvujD3+tZ0Dw3+7gBUlNEj7bU6MG5c29ptSzjj1XYTRv81fQ/cHNMCKMVMxGRu
 /VWLKT8vFJFE6iklcZUmeAWXvDD/lCVpDQ/3VJoGY19AXGcDfadCYIXZWc1b8hIavxox
 oOaQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1736181718; x=1736786518;
 h=to:content-transfer-encoding:mime-version:subject:date:from
 :references:in-reply-to:message-id:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=HAljNyq+QaAIrmyolWsiLWKDIFw6BYvPANBIzWkJ9YI=;
 b=e8n+6GJAvMsqeJygQ637aJIhWFOVBm/pbvW16mn9eRjrO4zs6dZpGXM7q70osagqbg
 b5ALAofK7yGYeU08IauteVZiqO4KT4ntHTJbVaPFVVmRRgXieqfp22oUBLKOp9WwCNeQ
 lw4qRBbFtBSPNM6aHuEHRr9RZusYyzPms9cfuwvQbKc2Laa1Vd9y566j18VnzfhtB6oC
 MpU5QX8kMfeLCrntbx4I8oH01gITOu9PLiqJbzfylMy0owIjliQmvLOPOYVcoHKPlAlz
 OxW94DxRfkjFyAQNll/FUrYZwvARXTiippSlvDbblzoEErbZn7/YBftyOBEPxZ8Bx8fV
 sMaQ==
X-Gm-Message-State: AOJu0YykKmkxC1cQRQpgCs67J72gJMmEQnRL95ZfjaDwmQRz+3B91Bu7
 +dHTKJvZHotn1RZnc0xDiF9HO+T1WvI9PdpNuzsesPBBVyxNvlYKQtZUX3cU
X-Gm-Gg: ASbGncss6t0i67QMKQFhPby8/oB3BLJcbbji4sOWqjeM0XfjXtK5UfXQ+qyO0gDsWly
 pAVPYBL2SKswRhpUFdqXNJ+L3858yyFt765cll5WfdkUKlOsZXs3e+Zfsa6pNeujpD6VFnDOMen
 o9d75+wlSd5vvFR8IH8bzkGB9ZItqSDXmLvQgsuOZNA5Z9Dy/+pEDx2dwzxaWy0w3JjKj0eM7Ih
 Wn0gNXMeP/IlNEqmfs2vpPNogL+IrKSarhy1lw9l0tNbkH8roYNrTc7Xec54ntfEcjH5FLOg7kQ
 kWvWwoVpKAYANNhNVOLyT3gGXI3PCZgD
X-Google-Smtp-Source: AGHT+IE1DxYPvTU+/B5TlqBLOeOYIszGynMDsprDPhFItJYCKzWWyFm4tYnqsyvbG3JkEbNrHkbbQQ==
X-Received: by 2002:a05:600c:470b:b0:434:f609:1afa with SMTP id
 5b1f17b1804b1-43668547314mr491395825e9.4.1736181718288; 
 Mon, 06 Jan 2025 08:41:58 -0800 (PST)
Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at.
 [85.127.114.32]) by smtp.gmail.com with ESMTPSA id
 ffacd0b85a97d-38a1c8288b8sm47863365f8f.11.2025.01.06.08.41.57
 for <75268 <at> debbugs.gnu.org>
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Mon, 06 Jan 2025 08:41:57 -0800 (PST)
Message-ID: <f7e0b4e3f9dd0c230ebdb4130542c0d7a6a3e65f.1736181798.git.liliana.prikler@HIDDEN>
In-Reply-To: <161b5fd3c108eedbb469e237570af3727bda42e5.1736181798.git.liliana.prikler@HIDDEN>
References: <161b5fd3c108eedbb469e237570af3727bda42e5.1736181798.git.liliana.prikler@HIDDEN>
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Date: Mon, 6 Jan 2025 17:31:59 +0100
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 2.2 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * gnu/packages/emacs.scm (emacs-minimal)[patches]: Add =?UTF-8?Q?=E2=80=9Cemacs-disable-jit-compilation.patch=E2=80=9D.?=
    --- gnu/packages/emacs.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
    diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 2169cc903a..a5f8802df4
    100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -574,7
    +574,8 @@ (define-public emacs-next [...] 
 
 Content analysis details:   (2.2 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -0.0 RCVD_IN_DNSWL_NONE     RBL: Sender listed at https://www.dnswl.org/,
                              no trust
                             [2a00:1450:4864:20:0:0:0:344 listed in]
                             [list.dnswl.org]
  0.0 FREEMAIL_FROM          Sender email is commonly abused enduser mail
                             provider (liliana.prikler[at]gmail.com)
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
  2.2 MALFORMED_FREEMAIL     Bad headers on message from free email
                             service
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 1.2 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * gnu/packages/emacs.scm (emacs-minimal)[patches]: Add =?UTF-8?Q?=E2=80=9Cemacs-disable-jit-compilation.patch=E2=80=9D.?=
    --- gnu/packages/emacs.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
    diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 2169cc903a..a5f8802df4
    100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -574,7
    +574,8 @@ (define-public emacs-next [...] 
 
 Content analysis details:   (1.2 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -0.0 RCVD_IN_DNSWL_NONE     RBL: Sender listed at https://www.dnswl.org/,
                              no trust
                             [2a00:1450:4864:20:0:0:0:344 listed in]
                             [list.dnswl.org]
 -0.0 SPF_PASS               SPF: sender matches SPF record
  0.0 FREEMAIL_FROM          Sender email is commonly abused enduser mail
                             provider (liliana.prikler[at]gmail.com)
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
  2.2 MALFORMED_FREEMAIL     Bad headers on message from free email
                             service
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* gnu/packages/emacs.scm (emacs-minimal)[patches]: Add
“emacs-disable-jit-compilation.patch”.
---
 gnu/packages/emacs.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 2169cc903a..a5f8802df4 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -574,7 +574,8 @@ (define-public emacs-next-minimal
        (sha256
         (base32 "0nj3a7wsl5piqf6a8wnmfyjbpxp2dwl0r48flv9q624jx4nxfr2p"))
        (patches
-        (search-patches "emacs-next-exec-path.patch"
+        (search-patches "emacs-disable-jit-compilation.patch"
+                        "emacs-next-exec-path.patch"
                         "emacs-fix-scheme-indent-function.patch"
                         "emacs-next-native-comp-driver-options.patch"
                         "emacs-next-native-comp-fix-filenames.patch"
-- 
2.47.1

Message sent to andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, ian@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#75268] [PATCH emacs-team v2 1/3] gnu: emacs-next: Don't hash file names in native compilation.
References: <cover.1735766271.git.liliana.prikler@HIDDEN>
In-Reply-To: <cover.1735766271.git.liliana.prikler@HIDDEN>
Resent-From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, ian@HIDDEN, guix-patches@HIDDEN
Resent-Date: Mon, 06 Jan 2025 16:43:02 +0000
Resent-Message-ID: <handler.75268.B75268.173618173324376 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 75268
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 75268 <at> debbugs.gnu.org
Cc: andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, ian@HIDDEN
X-Debbugs-Original-Xcc: andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, ian@HIDDEN
Received: via spool by 75268-submit <at> debbugs.gnu.org id=B75268.173618173324376
          (code B ref 75268); Mon, 06 Jan 2025 16:43:02 +0000
Received: (at 75268) by debbugs.gnu.org; 6 Jan 2025 16:42:13 +0000
Received: from localhost ([127.0.0.1]:39813 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tUqB9-0006L0-OC
	for submit <at> debbugs.gnu.org; Mon, 06 Jan 2025 11:42:12 -0500
Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:48253)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.84_2) (envelope-from <liliana.prikler@HIDDEN>)
 id 1tUqB4-0006Jj-Nq
 for 75268 <at> debbugs.gnu.org; Mon, 06 Jan 2025 11:42:08 -0500
Received: by mail-wr1-x441.google.com with SMTP id
 ffacd0b85a97d-3862b40a6e0so8026606f8f.0
 for <75268 <at> debbugs.gnu.org>; Mon, 06 Jan 2025 08:42:06 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1736181717; x=1736786517; darn=debbugs.gnu.org;
 h=mime-version:to:subject:date:from:message-id:from:to:cc:subject
 :date:message-id:reply-to;
 bh=+2qnc8ki+LOzVwOBk4n7nrDooFWLiVBX7dZ+hrkzsjs=;
 b=WfqkVsa+GSve3lOUEnQbPfJl2gP+9dNvdVN/nMzrKvnm9sdEfc9NKqiPdeBFeXLRqp
 4E9DZHwjF1k+2RaymUGiOrGabk93Xv97vuMwZOgzA+t6c8L9ITMuODCkVEOpshUSbfgQ
 oZiiGf0OR/HGGFOIhxiy4LufBHPvLI6dFWgdwl3SQMUGvcBFwdnzXS1opDRp6hsmf59k
 Z9i6gxS/SzBvi+BD2QlvdFg5d0gq93UudqDZPUgjSPiAxuP3PL1oa/BVLgsGXkI0JstH
 stOh7eQv2hzsYp604IOUtHtDzeErEW9/FbhAXV1S2Xd1JbFPEgg/dk3dlrt+L6/rDvlj
 5b9g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1736181717; x=1736786517;
 h=mime-version:to:subject:date:from:message-id:x-gm-message-state
 :from:to:cc:subject:date:message-id:reply-to;
 bh=+2qnc8ki+LOzVwOBk4n7nrDooFWLiVBX7dZ+hrkzsjs=;
 b=F/eHTaR+p2mIfmZGgBnx2av/RJOo7pWKG+fM0cBxMxiTcPrti88OXkxyvsn1KBxMJT
 BZHFOU/rH168h5OCuJIUDrWjaB0UX8SaI78l1aEFt0eEhFTUs+9ej+JClUCaVO29V5r5
 z+OHGpuS07TA3vt1wznOnsEEJbic+beq4usnKnqzZrjtBLUH30j5Vs20tAI1UJNh6fr4
 zsDyoyjX6wta+OxGEvCtWbL/7GQcRQpdheiOqox2JoR8uR6GfKmn572RyFw0IYFVMLnc
 kVuFOTqGpy2KLEwjqXIFrpXot2hs5M2G2kFvuU4PXI1KJrHjhc86CSyITksNoSAQVGHS
 m1SQ==
X-Gm-Message-State: AOJu0YyT0Z84XDFWzkHDwbqUKd7nPSl2Mi54X2Yn5ZKArVcRiXGvSc/U
 ntFf0Abbxieip/FFSp6ANzAHZ6L5r3UYSuOvrWliWYHBT9/xMOzr4Dgb666L
X-Gm-Gg: ASbGncu6YlDf/206T7a8dfYeisoEsStnfvrG/+jvh9qSxOArLo7Iffmgtb8fr0tdxI6
 Jf8AG5M3u0VLnFIKUiKP8V81gChT1+LM9jNtyYUeHPLpmD0WTmFN55QEJ5Gpo9hCSc0RlQJAhWR
 uPiGgumryrzO6dwUtLlGkb6yU5e/rBNUkTPuVXpBbGjzO+GxHtv9ushoB0JfY8o1S/Qgbuwf+xV
 PYyH1gURBC6rmeZPgB4uPM2sfeWNxE6Jgpu9c7XiRH7t0XZ59RGRdIaUr24NAo9Qek/wdxalJgH
 IrnAHLrpmugR67lFr5DbENt+/wOJ791D
X-Google-Smtp-Source: AGHT+IG4huv+JQnyCDUf/yY4f1sQMXcmCV2tKX+b8+AgeNqoAPVQkZ6+zr6F0kOuxjdSzRvu+pz60w==
X-Received: by 2002:a5d:47cf:0:b0:385:ee59:44eb with SMTP id
 ffacd0b85a97d-38a221fa9ffmr48141010f8f.33.1736181717018; 
 Mon, 06 Jan 2025 08:41:57 -0800 (PST)
Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at.
 [85.127.114.32]) by smtp.gmail.com with ESMTPSA id
 ffacd0b85a97d-38a1c8288b8sm47863365f8f.11.2025.01.06.08.41.56
 for <75268 <at> debbugs.gnu.org>
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Mon, 06 Jan 2025 08:41:56 -0800 (PST)
Message-ID: <161b5fd3c108eedbb469e237570af3727bda42e5.1736181798.git.liliana.prikler@HIDDEN>
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Date: Wed, 1 Jan 2025 22:15:31 +0100
MIME-Version: 1.0
X-Spam-Score: 4.5 (++++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details. Content preview: *
 gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch:
 New file. * gnu/local.mk (dist_patch_DATA): Register it here. *
 gnu/packages/emacs.scm
 (emacs-minimal)[source]: Use it here. --- gnu/ [...] 
 Content analysis details:   (4.5 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 FREEMAIL_FROM          Sender email is commonly abused enduser mail
 provider (liliana.prikler[at]gmail.com)
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 2.1 DATE_IN_PAST_96_XX     Date: is 96 hours or more before Received:
 date
 -0.0 RCVD_IN_DNSWL_NONE     RBL: Sender listed at https://www.dnswl.org/,
 no trust [2a00:1450:4864:20:0:0:0:441 listed in]
 [list.dnswl.org]
 0.2 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII
 but isn't
 2.2 MALFORMED_FREEMAIL     Bad headers on message from free email
 service
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 3.5 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch:
    New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs.scm
    (emacs-minimal)[source]: Use it here. --- gnu/ [...] 
 
 Content analysis details:   (3.5 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -0.0 RCVD_IN_DNSWL_NONE     RBL: Sender listed at https://www.dnswl.org/,
                              no trust
                             [2a00:1450:4864:20:0:0:0:441 listed in]
                             [list.dnswl.org]
 -0.0 SPF_PASS               SPF: sender matches SPF record
  0.0 FREEMAIL_FROM          Sender email is commonly abused enduser mail
                             provider (liliana.prikler[at]gmail.com)
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
  2.1 DATE_IN_PAST_96_XX     Date: is 96 hours or more before Received:
                             date
  0.2 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII
                              but isn't
  2.2 MALFORMED_FREEMAIL     Bad headers on message from free email
                             service
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it here.
* gnu/packages/emacs.scm (emacs-minimal)[source]: Use it here.
---
 gnu/local.mk                                  |   1 +
 gnu/packages/emacs.scm                        |   1 +
 ...emacs-next-native-comp-fix-filenames.patch | 345 ++++++++++++++++++
 3 files changed, 347 insertions(+)
 create mode 100644 gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 0adc7aa2d9..da756b33d5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1210,6 +1210,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/emacs-native-comp-pin-packages.patch   \
   %D%/packages/patches/emacs-next-exec-path.patch   \
   %D%/packages/patches/emacs-next-native-comp-driver-options.patch   \
+  %D%/packages/patches/emacs-next-native-comp-fix-filenames.patch   \
   %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch  \
   %D%/packages/patches/emacs-pgtk-super-key-fix.patch	\
   %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch  \
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index a24242d5d7..e1a9a9a51f 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -577,6 +577,7 @@ (define-public emacs-next-minimal
         (search-patches "emacs-next-exec-path.patch"
                         "emacs-fix-scheme-indent-function.patch"
                         "emacs-next-native-comp-driver-options.patch"
+                        "emacs-next-native-comp-fix-filenames.patch"
                         "emacs-pgtk-super-key-fix.patch")))))))
 
 (define* (emacs->emacs-next emacs #:optional name
diff --git a/gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch b/gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch
new file mode 100644
index 0000000000..7897fa9b04
--- /dev/null
+++ b/gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch
@@ -0,0 +1,345 @@
+Upstream hashes both the absolute file name and the content of a file
+to derive the name for the natively compiled files.  This breaks the
+staged install used in guix, as any $GUIX_PROFILE is distinct from
+the build directory.  It also breaks grafts, as hardcoded store file
+names get rewritten; thus changing the file hash.
+
+In addition, this patch changes how native-comp-eln-load-path is
+constructed.  Upstream, an entry of the directory “../lisp” is added
+supposedly for bootstrap only, but this directory appears to find its
+way into the actual variable despite attempts to remove it by calling
+‘startup--update-eln-cache’.
+The user-visible procedure ‘startup-redirect-eln-cache’ is kept, as
+packages may require it, but only pushes the new value now.
+
+Index: emacs-next/src/comp.c
+===================================================================
+--- emacs-next.orig/src/comp.c
++++ emacs-next/src/comp.c
+@@ -4403,26 +4403,17 @@ DEFUN ("comp-el-to-eln-rel-filename", Fc
+        Scomp_el_to_eln_rel_filename, 1, 1, 0,
+        doc: /* Return the relative name of the .eln file for FILENAME.
+ FILENAME must exist, and if it's a symlink, the target must exist.
+-If FILENAME is compressed, it must have the \".gz\" extension,
+-and Emacs must have been compiled with zlib; the file will be
+-uncompressed on the fly to hash its contents.
+-Value includes the original base name, followed by 2 hash values,
+-one for the file name and another for its contents, followed by .eln.  */)
++FILENAME is resolved relative to `load-path' and only the suffix of
++the first matching path is kept.  If FILENAME is not found to be relative
++to any directory `load-path', it is used as-is to construct the return
++value.  */)
+   (Lisp_Object filename)
+ {
+   CHECK_STRING (filename);
+ 
+-  /* Resolve possible symlinks in FILENAME, so that path_hash below
+-     always compares equal. (Bug#44701).  */
+-  filename = Fexpand_file_name (filename, Qnil);
+-  char *file_normalized = realpath (SSDATA (ENCODE_FILE (filename)), NULL);
+-  if (file_normalized)
+-    {
+-      filename = DECODE_FILE (make_unibyte_string (file_normalized,
+-						   strlen (file_normalized)));
+-      xfree (file_normalized);
+-    }
++  Lisp_Object rel_name = filename;
+ 
++  filename = Fexpand_file_name (filename, Qnil);
+   if (NILP (Ffile_exists_p (filename)))
+     xsignal1 (Qfile_missing, filename);
+ 
+@@ -4430,64 +4421,55 @@ one for the file name and another for it
+   filename = Fw32_long_file_name (filename);
+ #endif
+ 
+-  Lisp_Object content_hash = comp_hash_source_file (filename);
+-
+-  if (suffix_p (filename, ".gz"))
+-    filename = Fsubstring (filename, Qnil, make_fixnum (-3));
+-
+-  /* We create eln filenames with an hash in order to look-up these
+-     starting from the source filename, IOW have a relation
+-
+-     /absolute/path/filename.el + content ->
+-     eln-cache/filename-path_hash-content_hash.eln.
+-
+-     'dlopen' can return the same handle if two shared with the same
+-     filename are loaded in two different times (even if the first was
+-     deleted!).  To prevent this scenario the source file content is
+-     included in the hashing algorithm.
+-
+-     As at any point in time no more then one file can exist with the
+-     same filename, should be possible to clean up all
+-     filename-path_hash-* except the most recent one (or the new one
+-     being recompiled).
+-
+-     As installing .eln files compiled during the build changes their
+-     absolute path we need an hashing mechanism that is not sensitive
+-     to that.  For this we replace if match PATH_DUMPLOADSEARCH or
+-     *PATH_REL_LOADSEARCH with '//' before computing the hash.  */
+-
+-  if (NILP (loadsearch_re_list))
+-    {
+-      Lisp_Object sys_re =
+-	concat2 (build_string ("\\`[[:ascii:]]+"),
+-		 Fregexp_quote (build_string ("/" PATH_REL_LOADSEARCH "/")));
+-      Lisp_Object dump_load_search =
+-	Fexpand_file_name (build_string (PATH_DUMPLOADSEARCH "/"), Qnil);
+-#ifdef WINDOWSNT
+-      dump_load_search = Fw32_long_file_name (dump_load_search);
+-#endif
+-      loadsearch_re_list = list2 (sys_re, Fregexp_quote (dump_load_search));
+-    }
++  Lisp_Object tail = Vload_path;
++  Lisp_Object name_len = Flength (filename);
+ 
+-  Lisp_Object lds_re_tail = loadsearch_re_list;
+-  FOR_EACH_TAIL (lds_re_tail)
++  FOR_EACH_TAIL_SAFE (tail)
+     {
+-      Lisp_Object match_idx =
+-	Fstring_match (XCAR (lds_re_tail), filename, Qnil, Qnil);
+-      if (BASE_EQ (match_idx, make_fixnum (0)))
++      Lisp_Object directory = Ffile_name_as_directory (XCAR (tail));
++      Lisp_Object len = Flength (directory);
++      if (XFIXNUM (name_len) < XFIXNUM (len))
++	continue;
++      else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len,
++					 directory, make_fixnum (0), len,
++					 Qnil)))
+ 	{
+-	  filename =
+-	    Freplace_match (build_string ("//"), Qt, Qt, filename, Qnil);
++	  filename = Fsubstring (filename, len, Qnil);
+ 	  break;
+ 	}
+     }
+-  Lisp_Object separator = build_string ("-");
+-  Lisp_Object path_hash = comp_hash_string (filename);
+-  filename = concat2 (Ffile_name_nondirectory (Fsubstring (filename, Qnil,
+-							   make_fixnum (-3))),
+-		      separator);
+-  Lisp_Object hash = concat3 (path_hash, separator, content_hash);
+-  return concat3 (filename, hash, build_string (NATIVE_ELISP_SUFFIX));
++
++  if (file_name_absolute_p (filename)) /* no match in load-path */
++    filename = rel_name;
++
++  Lisp_Object bogus_dirs =
++    Fgetenv_internal (build_string ("NATIVE_COMP_BOGUS_DIRS"), Qnil);
++
++  if (!NILP (bogus_dirs))
++  {
++    tail = CALL2I (split-string, bogus_dirs, build_string (":"));
++
++    FOR_EACH_TAIL_SAFE (tail)
++      {
++	Lisp_Object directory = Ffile_name_as_directory (XCAR (tail));
++	Lisp_Object len = Flength (directory);
++	if (XFIXNUM (name_len) < XFIXNUM (len))
++	  continue;
++	else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len,
++					   directory, make_fixnum (0), len,
++					   Qnil)))
++	  {
++	    filename = Fsubstring (filename, len, Qnil);
++	    break;
++	  }
++      }
++  }
++
++  if (suffix_p (filename, ".gz"))
++    filename = Fsubstring (filename, Qnil, make_fixnum (-3));
++
++  return concat2(Fsubstring (filename, Qnil, make_fixnum (-3)),
++		 build_string (NATIVE_ELISP_SUFFIX));
+ }
+ 
+ DEFUN ("comp-el-to-eln-filename", Fcomp_el_to_eln_filename,
+@@ -4501,13 +4483,7 @@ If BASE-DIR is non-nil, use it as the di
+ non-absolute BASE-DIR is interpreted as relative to `invocation-directory'.
+ If BASE-DIR is omitted or nil, look for the first writable directory
+ in `native-comp-eln-load-path', and use as BASE-DIR its subdirectory
+-whose name is given by `comp-native-version-dir'.
+-If FILENAME specifies a preloaded file, the directory for the .eln
+-file is the \"preloaded/\" subdirectory of the directory determined
+-as described above.  FILENAME is considered to be a preloaded file if
+-the value of `comp-file-preloaded-p' is non-nil, or if FILENAME
+-appears in the value of the environment variable LISP_PRELOADED;
+-the latter is supposed to be used by the Emacs build procedure.  */)
++whose name is given by `comp-native-version-dir'. */)
+   (Lisp_Object filename, Lisp_Object base_dir)
+ {
+   Lisp_Object source_filename = filename;
+@@ -4555,10 +4531,11 @@ the latter is supposed to be used by the
+   Lisp_Object lisp_preloaded =
+     Fgetenv_internal (build_string ("LISP_PRELOADED"), Qnil);
+   base_dir = Fexpand_file_name (Vcomp_native_version_dir, base_dir);
++  bool preloaded = comp_file_preloaded_p;
+   if (comp_file_preloaded_p
+       || (!NILP (lisp_preloaded)
+-	  && !NILP (Fmember (CALL1I (file-name-base, source_filename),
+-			     Fmapcar (intern_c_string ("file-name-base"),
++	  && !NILP (Fmember (CALL1I (file-name-sans-extension, source_filename),
++			     Fmapcar (intern_c_string ("file-name-sans-extension"),
+ 				      CALL1I (split-string, lisp_preloaded))))))
+     base_dir = Fexpand_file_name (build_string ("preloaded"), base_dir);
+ 
+@@ -5875,10 +5852,7 @@ The last directory of this list is assum
+ the system *.eln files, which are the files produced when building
+ Emacs.  */);
+ 
+-  /* Temporary value in use for bootstrap.  We can't do better as
+-     `invocation-directory' is still unset, will be fixed up during
+-     dump reload.  */
+-  Vnative_comp_eln_load_path = Fcons (build_string ("../native-lisp/"), Qnil);
++  Vnative_comp_eln_load_path = Qnil;
+ 
+   DEFVAR_LISP ("native-comp-enable-subr-trampolines",
+ 	       Vnative_comp_enable_subr_trampolines,
+Index: emacs-next/lisp/startup.el
+===================================================================
+--- emacs-next.orig/lisp/startup.el
++++ emacs-next/lisp/startup.el
+@@ -527,9 +527,6 @@ DIRS are relative."
+ (defvar native-comp-jit-compilation)
+ (defvar native-comp-enable-subr-trampolines)
+ 
+-(defvar startup--original-eln-load-path nil
+-  "Original value of `native-comp-eln-load-path'.")
+-
+ (defun startup-redirect-eln-cache (cache-directory)
+   "Redirect the user's eln-cache directory to CACHE-DIRECTORY.
+ CACHE-DIRECTORY must be a single directory, a string.
+@@ -540,22 +537,10 @@ to `user-emacs-directory'.
+ For best results, call this function in your early-init file,
+ so that the rest of initialization and package loading uses
+ the updated value."
+-  ;; Remove the original eln-cache.
+-  (setq native-comp-eln-load-path (cdr native-comp-eln-load-path))
+-  ;; Add the new eln-cache.
+   (push (expand-file-name (file-name-as-directory cache-directory)
+                           user-emacs-directory)
+         native-comp-eln-load-path))
+ 
+-(defun startup--update-eln-cache ()
+-  "Update the user eln-cache directory due to user customizations."
+-  ;; Don't override user customizations!
+-  (when (equal native-comp-eln-load-path
+-               startup--original-eln-load-path)
+-    (startup-redirect-eln-cache "eln-cache")
+-    (setq startup--original-eln-load-path
+-          (copy-sequence native-comp-eln-load-path))))
+-
+ (defun startup--rescale-elt-match-p (font-pattern font-object)
+   "Test whether FONT-OBJECT matches an element of `face-font-rescale-alist'.
+ FONT-OBJECT is a font-object that specifies a font to test.
+@@ -1383,12 +1368,6 @@ please check its value")
+       startup-init-directory)))
+   (setq early-init-file user-init-file)
+ 
+-  ;; Amend `native-comp-eln-load-path', since the early-init file may
+-  ;; have altered `user-emacs-directory' and/or changed the eln-cache
+-  ;; directory.
+-  (when (featurep 'native-compile)
+-    (startup--update-eln-cache))
+-
+   ;; If any package directory exists, initialize the package system.
+   (and user-init-file
+        package-enable-at-startup
+@@ -1523,12 +1502,6 @@ please check its value")
+         startup-init-directory))
+      t)
+ 
+-    ;; Amend `native-comp-eln-load-path' again, since the early-init
+-    ;; file may have altered `user-emacs-directory' and/or changed the
+-    ;; eln-cache directory.
+-    (when (featurep 'native-compile)
+-      (startup--update-eln-cache))
+-
+     (when (and deactivate-mark transient-mark-mode)
+       (with-current-buffer (window-buffer)
+         (deactivate-mark)))
+Index: emacs-next/lisp/loadup.el
+===================================================================
+--- emacs-next.orig/lisp/loadup.el
++++ emacs-next/lisp/loadup.el
+@@ -53,6 +53,14 @@
+ (setq redisplay--inhibit-bidi t)
+ 
+ (message "Dump mode: %s" dump-mode)
++;; Compensate for native-comp-eln-load-path being empty by Guix' default.
++(and (featurep 'native-compile)
++     dump-mode
++     (setq
++      native-comp-eln-load-path
++      (cons (expand-file-name "../native-lisp" invocation-directory)
++            native-comp-eln-load-path)
++      comp-file-preloaded-p t))
+ 
+ ;; Add subdirectories to the load-path for files that might get
+ ;; autoloaded when bootstrapping or running Emacs normally.
+@@ -538,27 +546,25 @@ This to have it working when installed o
+ directory got moved.  This is set to be a pair in the form of:
+ \(rel-filename-from-install-bin . rel-filename-from-local-bin)."
+   (when (and load--bin-dest-dir load--eln-dest-dir)
+-      (setq eln-dest-dir
+-          (concat load--eln-dest-dir "native-lisp/" comp-native-version-dir "/"))
++      (setq load--eln-versioned-dest-dir
++            (concat load--eln-dest-dir "native-lisp/" comp-native-version-dir "/"))
+       (maphash (lambda (_ cu)
+                (when (stringp (native-comp-unit-file cu))
+                  (let* ((file (native-comp-unit-file cu))
+-                        (preloaded (equal (substring (file-name-directory file)
+-                                                     -10 -1)
+-                                          "preloaded"))
+-                        (eln-dest-dir-eff (if preloaded
+-                                              (expand-file-name "preloaded"
+-                                                                eln-dest-dir)
+-                                            eln-dest-dir)))
++                        (native-lisp-needle
++                         (regexp-quote (concat "native-lisp/"
++                                               comp-native-version-dir "/"))))
+                    (native-comp-unit-set-file
+                     cu
+ 	            (cons
+                      ;; Relative filename from the installed binary.
+-                     (file-relative-name (expand-file-name
+-                                          (file-name-nondirectory
+-                                           file)
+-                                          eln-dest-dir-eff)
+-                                         load--bin-dest-dir)
++                     (file-relative-name
++                      (expand-file-name
++                       (save-match-data
++                         (string-match native-lisp-needle file)
++                         (substring file (match-end 0)))
++                       load--eln-versioned-dest-dir)
++                      load--bin-dest-dir)
+                      ;; Relative filename from the built uninstalled binary.
+                      (file-relative-name file invocation-directory))))))
+ 	     comp-loaded-comp-units-h)))
+@@ -644,7 +650,9 @@ directory got moved.  This is set to be
+                    (equal dump-mode "pdump"))
+           ;; Don't enable this before bootstrap is completed, as the
+           ;; compiler infrastructure may not be usable yet.
+-          (setq native-comp-enable-subr-trampolines t))
++          (setq native-comp-enable-subr-trampolines t
++                ;; We loaded everything we could.
++                comp-file-preloaded-p nil))
+         (message "Dumping under the name %s" output)
+         (condition-case ()
+             (delete-file output)
+Index: emacs-next/src/Makefile.in
+===================================================================
+--- emacs-next.orig/src/Makefile.in
++++ emacs-next/src/Makefile.in
+@@ -591,6 +591,7 @@ shortlisp := $(filter-out ${shortlisp_fi
+ ## We don't really need to sort, but may as well use it to remove duplicates.
+ shortlisp := loaddefs.el loadup.el $(sort ${shortlisp})
+ export LISP_PRELOADED = ${shortlisp}
++export NATIVE_COMP_BOGUS_DIRS =
+ lisp = $(addprefix ${lispsource}/,${shortlisp})
+ 
+ ## Construct full set of libraries to be linked.

base-commit: f3af755d75677e9671e99fcb986c60474567ba54
-- 
2.47.1

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#75268] [PATCH emacs-team 0/2] Apply native-comp grafts to emacs-next as well
References: <cover.1735766271.git.liliana.prikler@HIDDEN>
In-Reply-To: <cover.1735766271.git.liliana.prikler@HIDDEN>
Resent-From: Ian Eure <ian@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 08 Jan 2025 04:49:02 +0000
Resent-Message-ID: <handler.75268.B75268.173631171115655 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 75268
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 75268 <at> debbugs.gnu.org
Cc: liliana.prikler@HIDDEN
Received: via spool by 75268-submit <at> debbugs.gnu.org id=B75268.173631171115655
          (code B ref 75268); Wed, 08 Jan 2025 04:49:02 +0000
Received: (at 75268) by debbugs.gnu.org; 8 Jan 2025 04:48:31 +0000
Received: from localhost ([127.0.0.1]:45560 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tVNza-00044Q-Kf
	for submit <at> debbugs.gnu.org; Tue, 07 Jan 2025 23:48:30 -0500
Received: from fhigh-a3-smtp.messagingengine.com ([103.168.172.154]:37063)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <ian@HIDDEN>) id 1tVNzX-00044B-Lx
 for 75268 <at> debbugs.gnu.org; Tue, 07 Jan 2025 23:48:28 -0500
Received: from phl-compute-01.internal (phl-compute-01.phl.internal
 [10.202.2.41])
 by mailfhigh.phl.internal (Postfix) with ESMTP id 09C8611401F6;
 Tue,  7 Jan 2025 23:48:22 -0500 (EST)
Received: from phl-mailfrontend-02 ([10.202.2.163])
 by phl-compute-01.internal (MEProxy); Tue, 07 Jan 2025 23:48:22 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h=
 cc:cc:content-transfer-encoding:content-type:content-type:date
 :date:from:from:in-reply-to:message-id:mime-version:reply-to
 :subject:subject:to:to; s=fm1; t=1736311702; x=1736398102; bh=7N
 pBaDImo8bAcOIav2wNNkYO5M9ZTfWCUJ+JtGMepLA=; b=v+8ki7K0JhqYqvvAiL
 gb3c+YPH+Louur3ew38tXMP70lKDVg6Cp3ETvDpUl4zpIm979RY+RFGCNcTf5tQo
 rgJjTxrcVHACd8jyXP6icsqA+bLn8TX6nLdQbrn/72OvMOHX40GsUWf6PElgyrB3
 NB0SKziMxIy+50AkAbHh7Ie/egdvkoBUKKj0sCjSvJO6Dz5xU0zrsNhIyi9p4ztB
 X1Iw2SOSal7nlHMdgK6qiDBUB5Wq7ww5lNRumVTuBleqh9le0OCytL92oTYQlEFL
 8PVyIS6zt5rEWmA6EFEFnZqYTw9mQ34hbF0QfX/C7nE/FF2tDOYtqXuyu6iE61nv
 5x7w==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 messagingengine.com; h=cc:cc:content-transfer-encoding
 :content-type:content-type:date:date:feedback-id:feedback-id
 :from:from:in-reply-to:message-id:mime-version:reply-to:subject
 :subject:to:to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=
 fm2; t=1736311702; x=1736398102; bh=7NpBaDImo8bAcOIav2wNNkYO5M9Z
 TfWCUJ+JtGMepLA=; b=Thz5zyV9s1pCkFpW1fT3lrl2CdHmu+/BeRuGoLqiPziG
 SPWXGMkZ7zs1azZk8Pp0aHJ4UVhD8C1q3gql6l3EuoyAv0/1HxgUlkShKapWmmbB
 y/uBAf61fcAHGzWf7TNxlGi79H+YMKtDcpzUQgUTJBQlQn/5Z7QHIKdjLLkhfwFX
 9t+dnh0qDAqyhRhxidxWyL32KCDQy+qo61mh0pa5YOoPL72aWWzHofjKTOYLrSSY
 UBfDtYiQPNoGvOLKpVCjXfaAJJP5KvA4b2QpfGNDWk5UZze75pNPML8axCJP/NVr
 BCQiW13LplBfBlvVsTs55LFfGl3mpamdS+5nJFDORA==
X-ME-Sender: <xms:lQN-Z8lqhroEE59Wsfn2AAKUl6k02gHb9mSU8AXFe8r22Nw1E3mbhw>
 <xme:lQN-Z70pbjZBzQ1QPJfEvvbwE-SNHHf41W_1AL2rOAvmC5sxuxf0exAPVhsdAmCz5
 BvUQfqnG_rJ-KUaJQ>
X-ME-Received: <xmr:lQN-Z6rrA36tR7UCeIG4glMNWmBp2sggLnK3okKRZFbSvVdKCA-1zv6kFQx1Nzui2YEe0EdlyRjNNC1JA9nBiqMTyC9gPN-9JR2g51I>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegfedgjeefucetufdoteggodetrfdotf
 fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu
 rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevuf
 gffffkgggtgfesthhqredttderjeenucfhrhhomhepkfgrnhcugfhurhgvuceoihgrnhes
 rhgvthhrohhsphgvtgdrthhvqeenucggtffrrghtthgvrhhnpedtteekfffffeeihfeuke
 dvieeugeeigefftdfhleevlefgtddvhfdtudehffeuvdenucevlhhushhtvghrufhiiigv
 pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehirghnsehrvghtrhhoshhpvggtrdhtvh
 dpnhgspghrtghpthhtohepvddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtoheplhhi
 lhhirghnrgdrphhrihhklhgvrhesghhmrghilhdrtghomhdprhgtphhtthhopeejhedvie
 ekseguvggssghughhsrdhgnhhurdhorhhg
X-ME-Proxy: <xmx:lQN-Z4l_AR_JVbUvhw7hbIMfUkPTN7_kcjEBu1Jo2zHPvYH47FN8Bg>
 <xmx:lQN-Z60nyCjBLbq9CcFY0bfv7NRkddMOtdvqLs00Hcqv8fEnp9Ys7w>
 <xmx:lQN-Z_vuQEtZJvEb2Xr2Qkc2H1Id_JxEOc7d0r7siLzH0mwGd7f1BA>
 <xmx:lQN-Z2XUXM3k5vHEalre1ovauGj09RTzsrJAKcpy-lg3fsw-QDCyVA>
 <xmx:lgN-Z4CdPX4CjW8ll_gVWoPOATFj7i4By6Vz1Lhno9miinCSArhYz2BL>
Feedback-ID: id9014242:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue,
 7 Jan 2025 23:48:21 -0500 (EST)
From: Ian Eure <ian@HIDDEN>
User-Agent: mu4e 1.12.7; emacs 29.4
Date: Tue, 07 Jan 2025 20:48:19 -0800
Message-ID: <87ldvlsygc.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

Hi Liliana,

(Sorry if this reply is weird, I=E2=80=99m still ironing out some issues=20
in my workflow)

This all looks good to me.  I compared the emacs and emacs-next=20
versions of -native-comp-fix-filenames.patch, and your changes=20
seem straightforward and minimal.

While I was reading your patches, I noticed this typo in=20
emacs-disable-jit-compilation.patch:

> +Notably, Guix removes the hashes that prevent inadvertent=20
> shadowing
> +frm the file names of compiled libraries in order to facilitate=20
> grafts.

If you think it=E2=80=99s worth including in you patch series, it=E2=80=99d=
 be=20
nice to fix, but if you=E2=80=99re rather not, that=E2=80=99s also fine.

Thanks,
  -- Ian

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#75268] [PATCH emacs-team 0/2] Apply native-comp grafts to emacs-next as well
Resent-From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 08 Jan 2025 05:17:02 +0000
Resent-Message-ID: <handler.75268.B75268.173631340820511 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 75268
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Ian Eure <ian@HIDDEN>, 75268 <at> debbugs.gnu.org
Received: via spool by 75268-submit <at> debbugs.gnu.org id=B75268.173631340820511
          (code B ref 75268); Wed, 08 Jan 2025 05:17:02 +0000
Received: (at 75268) by debbugs.gnu.org; 8 Jan 2025 05:16:48 +0000
Received: from localhost ([127.0.0.1]:45593 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tVOQx-0005Kl-ME
	for submit <at> debbugs.gnu.org; Wed, 08 Jan 2025 00:16:47 -0500
Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:51520)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.84_2) (envelope-from <liliana.prikler@HIDDEN>)
 id 1tVOQw-0005Kd-KM
 for 75268 <at> debbugs.gnu.org; Wed, 08 Jan 2025 00:16:47 -0500
Received: by mail-wr1-x444.google.com with SMTP id
 ffacd0b85a97d-388cae9eb9fso8569229f8f.3
 for <75268 <at> debbugs.gnu.org>; Tue, 07 Jan 2025 21:16:46 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1736313405; x=1736918205; darn=debbugs.gnu.org;
 h=mime-version:user-agent:content-transfer-encoding:references
 :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date
 :message-id:reply-to;
 bh=uMSYzbFWVsfunuFizOMnzTxxD8XS+m2WHRrW0YdpWs4=;
 b=PMCzpRl+zuub8AKhKISV1eVbiW8qkxCv+AJ2R/+E+H9U/nWlv694qJ73BcXlftNvXw
 CBgkJhuWfxq1ovl+N+mZxAqChTcQ0cA+ewuaVAK5QQ7st13GOlBHbdHdhstx3++d0l27
 ifiVtDKz5xXMSLcx6KahRLZnZkWuEKHPYlTzDNHPQlzy34Yn8ABcEgOLQlAWQNr6Oz+x
 QecPCr1neAluQOl1laH10k6g2oA92HNuOklsHKksihwWYjb5cGp8jtA2fsQlc5vDMLdo
 +9g2R9EF9QQ+BH6P1yCLVPfa1fO/zxzh5FnHbmokyS1GOJnro31PGsc3QmaX4VOMb7/X
 XB9g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1736313405; x=1736918205;
 h=mime-version:user-agent:content-transfer-encoding:references
 :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from
 :to:cc:subject:date:message-id:reply-to;
 bh=uMSYzbFWVsfunuFizOMnzTxxD8XS+m2WHRrW0YdpWs4=;
 b=t/7b4yk3zlERzvArMFqOYqoYUGs4TM/LwHLXseuQ12spDj+RMGMkT9d5OOFJmqjw3M
 C2VvxCvgs91QdKV39vHHLZOAMSq7Xr7OJNe0yca/dJFOau1u5v4Lbj0p5wq6gpZ9GOcW
 sHPZCdi+pxgph9auPzJmdgs1UPBaApzcnPwrxgQFftZrQ1WflLHzlLz6DA/6DvQCuLC9
 4UqfYkitewqTC1rW94ZkcODfFckWVByEY8R92uXCJKRG+nv53GvrQ9I0DIN/kAewKSaR
 f2Xx/mjth99tTySzND1FdZfxhHl49RX8Hjy6hm1fk1OB4LwKVU5CZb4KxccjlHak5N+T
 +KVw==
X-Forwarded-Encrypted: i=1;
 AJvYcCV7tXGWBqSM3+cT/finNfTOAAwDKc5ovqDso4Cl4SXUuAuLgYWWu2jRcdSYlmEacjQ4389W8g==@debbugs.gnu.org
X-Gm-Message-State: AOJu0YxrjeGwnX1X09+h2ufn9Am2Qk/tWDA70WHl6Iu7nkEntTD2ULqp
 e985e8tpRmY0YwC6ShT0p0sBPQRd2QC3JuSUWU3wZLhouqgqTQedotRX/r8f
X-Gm-Gg: ASbGncs5+Ecwj17NMMlG8GUdaZivnmELaIcIzsSVHlY39VUwtXRBftKjnkDaI4Pgek2
 qq1GwTEa2SZc3OFNvK0Ui7EfgMdKPi3BBcHfMEvEKpmjq+8I+6ibucYcuFv0Mdvt95LXYkc8kk/
 K5Aklzd+yXoTF3iiwew+CbExOy0PKEf9LVIsXAwGLlZ4PQa8MN9QbgHWfhHKkwJRCoHldMTvmkx
 EgZL0GSnFTCY3ZXg8y9Sj25nmc+x9ipmGEIvjbQaMzSDnqqexLK/oMP8gCPvJ5A4HREpJUXMvP0
 LOXvDahemo4Aj4wEIYssgiBmVyslH8x1
X-Google-Smtp-Source: AGHT+IHgVW3SBEWXDWHGeJJ0wrI0a1TeCWue705dUxlItFzOeSorhDlejh/jlnlAT9TohQ97G9DhDQ==
X-Received: by 2002:a5d:6482:0:b0:385:f195:26f with SMTP id
 ffacd0b85a97d-38a872daa31mr660763f8f.19.1736313405177; 
 Tue, 07 Jan 2025 21:16:45 -0800 (PST)
Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at.
 [85.127.114.32]) by smtp.gmail.com with ESMTPSA id
 ffacd0b85a97d-38a1c8289a0sm53393318f8f.7.2025.01.07.21.16.43
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Tue, 07 Jan 2025 21:16:44 -0800 (PST)
Message-ID: <9180635834bd982b0feceb172a7fb4241f7eadf4.camel@HIDDEN>
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Date: Wed, 08 Jan 2025 06:16:43 +0100
In-Reply-To: <87ldvlsygc.fsf@HIDDEN>
References: <87ldvlsygc.fsf@HIDDEN>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.48.4 
MIME-Version: 1.0
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Am Dienstag, dem 07.01.2025 um 20:48 -0800 schrieb Ian Eure:
> > +Notably, Guix removes the hashes that prevent inadvertent=20
> > shadowing
> > +frm the file names of compiled libraries in order to facilitate=20
> > grafts.
>=20
> If you think it=E2=80=99s worth including in you patch series, it=E2=80=
=99d be=20
> nice to fix, but if you=E2=80=99re rather not, that=E2=80=99s also fine.
Ah, yeah, that typo does exist in both versions.  I think we could fix
both in a separate commit, or just fix it in emacs-next and wait for it
to become applicable to regular emacs.  Rebuild-wise, it shouldn't
change anything (we need to rebuild both w.r.t. master anyway).  WDYT?

Cheers

Last modified: Sun, 12 Jan 2025 05:45:02 UTC

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