3 files changed, 4 insertions(+), 40 deletions(-)

M gnu/local.mk
M gnu/packages/emacs.scm
D gnu/packages/patches/emacs-30-fix-compilation-errors.patch

@@ 1217,7 1217,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/elm-ghc9.2.patch	\
   %D%/packages/patches/elm-offline-package-registry.patch	\
   %D%/packages/patches/elm-reactor-static-files.patch		\
-  %D%/packages/patches/emacs-30-fix-compilation-errors.patch	\
   %D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch	\
   %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch	\
   %D%/packages/patches/emacs-elpy-dup-test-name.patch		\

@@ 139,7 139,7 @@
 (define-public emacs-minimal
   (package
     (name "emacs-minimal")
-    (version "30.1")
+    (version "30.2")
     ;; Note: When using (replacement …), ensure that comp-native-version-dir
     ;; stays the same across grafts.
     ;; Run `make check-system TESTS=emacs-native-comp' to ensure that grafts


@@ 150,15 150,14 @@
                                   version ".tar.xz"))
               (sha256
                (base32
-                "13qkdx515qv7m8b2mpd37p16frs0xgl7bw8xvv397bz6fspc3jkc"))
+                "1nggbgnns7lvxn68gzlcsgwh3bigvrbn45kh6dqia9yxlqc6zwxk"))
               (patches (search-patches "emacs-disable-jit-compilation.patch"
                                        "emacs-exec-path.patch"
                                        "emacs-fix-scheme-indent-function.patch"
                                        "emacs-native-comp-driver-options.patch"
                                        "emacs-native-comp-fix-filenames.patch"
                                        "emacs-native-comp-pin-packages.patch"
-                                       "emacs-pgtk-super-key-fix.patch"
-                                       "emacs-30-fix-compilation-errors.patch"))
+                                       "emacs-pgtk-super-key-fix.patch"))
               (modules '((guix build utils)))
               (snippet
                '(with-directory-excursion "lisp"


@@ 205,7 204,7 @@
                            "--disable-build-details")
       #:make-flags
       #~(list (string-append "SELECTOR=" #$%selector)
-              (let ((release-date "2025-02-23 17:41:38"))
+              (let ((release-date "2025-08-14 05:04:03"))
                 (string-append "RUN_TEMACS= "
                                #$(this-package-native-input "libfaketime")
                                "/bin/faketime -m -f '" release-date "'"

@@ 1,34 0,0 @@
-From 53a5dada413662389a17c551a00d215e51f5049f Mon Sep 17 00:00:00 2001
-From: Pip Cet <pipcet@protonmail.com>
-Date: Mon, 17 Feb 2025 15:21:16 +0000
-Subject: Fix compilation errors due to insufficient compiler safety
- (bug#63288)
-
-The default safety level is 1.  Restoring the default safety level to
-1 after it was temporarily 0 should reset byte-compile-delete-errors
-to nil, its default level.  Failing to do that resulted in
-miscompilation of code in highly-parallel builds.
-
-* lisp/emacs-lisp/cl-macs.el (cl--do-proclaim): Change
-'byte-compile-delete-errors' to become t only at 'safety' level 0, not
-levels 1 or 2.
----
- lisp/emacs-lisp/cl-macs.el | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
-index eef69e6899e..e73edbadaf2 100644
---- a/lisp/emacs-lisp/cl-macs.el
-+++ b/lisp/emacs-lisp/cl-macs.el
-@@ -2701,7 +2701,7 @@ Example:
- 	 (let ((speed (assq (nth 1 (assq 'speed (cdr spec)))
- 			    '((0 nil) (1 t) (2 t) (3 t))))
- 	       (safety (assq (nth 1 (assq 'safety (cdr spec)))
--			     '((0 t) (1 t) (2 t) (3 nil)))))
-+			     '((0 t) (1 nil) (2 nil) (3 nil)))))
- 	   (if speed (setq cl--optimize-speed (car speed)
- 			   byte-optimize (nth 1 speed)))
- 	   (if safety (setq cl--optimize-safety (car safety)
--- 
-cgit v1.2.3
-