Sync from SUSE:SLFO:1.1 emacs revision bcade0da79f723b49fe4cc166001a470

dot.gnu-emacs

@@ -176,14 +176,13 @@
   ;;
   ;; mouse as arrow
   ;; --------------
-  (if (eq window-system 'x)
-    (setq x-pointer-shape x-pointer-left-ptr))
-  (if (display-color-p)
+  (setq x-pointer-shape x-pointer-left-ptr)
+  (if (x-display-color-p)
       (set-mouse-color "RoyalBlue")
     (set-mouse-color (cdr (assq 'mouse-color (frame-parameters)))))
   ;;
   ;;   Automatically replacing of fore- and background.
-  (if (not (display-color-p))
+  (if (not (x-display-color-p))
     (progn
       (set-face-background 'region
 	       (cdr (assq 'foreground-color (frame-parameters ))))
@@ -359,6 +358,12 @@
     (if (or (> major 11) (and (eq major 11) (>= minor 86)))
 	(custom-set-default 'TeX-master nil)
       (setq-default TeX-master nil)))
+; ; Users private libaries 
+; (if (boundp 'AUCTeX-version)
+;   (progn
+;     (setq TeX-macro-private '("~/lib/tex-lib/"))
+;     (setq TeX-style-private   "~/lib/site-lisp/auctex/style/")   ; AUC-TeX-Macros
+;     (setq TeX-auto-private    "~/lib/site-lisp/auctex/auto/")))  ; Autom. Auc-TeX-Macros
   (if (and window-system (featurep 'font-lock))
       (progn
 	(add-hook 'latex-mode-hook 'turn-on-font-lock)
@@ -366,7 +371,7 @@
 	  (progn
 	    (add-hook 'LaTeX-mode-hook 'turn-on-font-lock)
 	    (add-hook 'LaTeX-mode-hook 'LaTeX-math-mode)
-	    (add-hook 'after-init-hook #'(lambda () (load "font-latex" nil t)))))))
+	    (add-hook 'after-init-hook #'(lambda () (load "auctex/font-latex" nil t)))))))
 ))
 
 ;;
@@ -539,12 +544,5 @@
 ;;(setq epa-pinentry-mode 'loopback)
 ;;(pinentry-start)
 ;;
-;; New native compilation support
-;; avoid useless warning, clear old eln files
-(if (featurep 'native-compile)
-   (progn
-    (require 'comp)
-    (setq native-comp-async-report-warnings-errors 'silent)
-    (native-compile-prune-cache)))
 ;;;;;;;;;;
 ;; the end

emacs-24.1-ps-mule.patch

@@ -1,5 +1,3 @@
-Support also older none UTF-8 encodings
-
 ---
  lisp/ps-mule.el          |    2 ++
  lisp/textmodes/ispell.el |   14 +++++++++++---
@@ -18,7 +16,7 @@ Support also older none UTF-8 encodings
  
 --- lisp/textmodes/ispell.el
 +++ lisp/textmodes/ispell.el	2016-09-19 09:01:56.930605125 +0000
-@@ -1541,11 +1541,19 @@ Protects against bogus binding of `enabl
+@@ -1533,10 +1533,18 @@ Protects against bogus binding of `enabl
        nil                        ;; in pipe mode. Disable extended-char-mode
      (nth 6 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
  	       (assoc ispell-current-dictionary ispell-dictionary-alist)))))
@@ -28,7 +26,6 @@ Support also older none UTF-8 encodings
 +;  (nth 7 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
 +;	     (assoc ispell-current-dictionary ispell-dictionary-alist))))
  (defun ispell-get-coding-system ()
-   "Return encoding of a dictionary."
 -  (nth 7 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
 -	     (assoc ispell-current-dictionary ispell-dictionary-alist))))
 -

emacs-24.3-asian-print.patch

@@ -1,5 +1,3 @@
-Change hanglm24.bdf to gulim24.bdf as this is the one we have.
-
 ---
  lisp/ps-mule.el |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

emacs-24.3-iconic.patch

@@ -4,7 +4,7 @@
 
 --- lisp/startup.el
 +++ lisp/startup.el	2016-09-19 09:15:26.871345783 +0000
-@@ -2657,6 +2657,9 @@ nil default-directory" name)
+@@ -2629,6 +2629,9 @@ nil default-directory" name)
                      ((equal argi "-no-splash")
                       (setq inhibit-startup-screen t))
  

emacs-24.4-flyspell.patch

@@ -4,9 +4,9 @@
 
 --- lisp/textmodes/flyspell.el
 +++ lisp/textmodes/flyspell.el	2021-10-08 09:31:55.632323098 +0000
-@@ -297,6 +297,12 @@ If this variable is nil, all regions are
-   :type 'boolean
-   :version "30.1")
+@@ -289,6 +289,12 @@ If this variable is nil, all regions are
+   "The key binding for flyspell auto correction."
+   :type 'key-sequence)
  
 +(defvar flyspell-signature-separator
 +  (if (boundp 'message-signature-separator)
@@ -17,7 +17,7 @@
  ;;*---------------------------------------------------------------------*/
  ;;*    Mode specific options                                            */
  ;;*    -------------------------------------------------------------    */
-@@ -321,7 +327,6 @@ property of the major mode name.")
+@@ -313,7 +319,6 @@ property of the major mode name.")
  ;;*--- mail mode -------------------------------------------------------*/
  (put 'mail-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
  (put 'message-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
@@ -25,7 +25,7 @@
  (defun mail-mode-flyspell-verify ()
    "Function used for `flyspell-generic-check-word-predicate' in Mail mode."
    (let* ((header-end (save-excursion
-@@ -333,11 +338,11 @@ property of the major mode name.")
+@@ -325,11 +330,11 @@ property of the major mode name.")
                          nil t)
                         (point)))
           (signature-begin

emacs-24.4-nonvoid.patch

@@ -1,12 +1,10 @@
-Avoid compiler warnings
-
 ---
  src/xmenu.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 --- src/xmenu.c
 +++ src/xmenu.c	2023-08-01 06:50:00.914537084 +0000
-@@ -2440,8 +2440,8 @@ Lisp_Object
+@@ -2424,8 +2424,8 @@ Lisp_Object
  xw_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents)
  {
    Lisp_Object title;

emacs-24.4-ps-bdf.patch

@@ -1,5 +1,3 @@
-Out bdf fonts are in /usr/share/fonts/bdf/
-
 ---
  lisp/ldefs-boot.el |    4 ++--
  lisp/ps-bdf.el     |    4 ++--
@@ -7,7 +5,7 @@ Out bdf fonts are in /usr/share/fonts/bdf/
 
 --- lisp/ldefs-boot.el
 +++ lisp/ldefs-boot.el	2023-08-01 06:47:17.809528438 +0000
-@@ -26209,9 +26209,9 @@ With prefix argument ARG, restart the Pr
+@@ -25512,9 +25512,9 @@ With prefix argument ARG, restart the Pr
  
  ;;; Generated autoloads from ps-bdf.el
  

emacs-25.2-ImageMagick7.patch

@@ -0,0 +1,56 @@
+Index: emacs-25.2/configure.ac
+===================================================================
+---
+ emacs-29.1/configure.ac |    2 +-
+ emacs-29.1/src/image.c  |   12 ++++++++++++
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+--- emacs-29.1/configure.ac
++++ emacs-29.1/configure.ac	2023-08-01 07:15:12.274827913 +0000
+@@ -2883,7 +2883,7 @@ if test "${HAVE_X11}" = "yes" || test "$
+     else
+        ## 6.3.5 is the earliest version known to work; see Bug#17339.
+        ## 6.8.2 makes Emacs crash; see Bug#13867.
+-       EMACS_CHECK_MODULES([IMAGEMAGICK], [Wand >= 6.3.5 Wand != 6.8.2])
++       EMACS_CHECK_MODULES([IMAGEMAGICK], [MagickWand >= 6.3.5 MagickWand != 6.8.2])
+     fi
+ 
+     if test $HAVE_IMAGEMAGICK = yes; then
+--- emacs-29.1/src/image.c
++++ emacs-29.1/src/image.c	2023-08-01 07:20:54.484555078 +0000
+@@ -10207,7 +10207,11 @@ imagemagick_compute_animated_image (Magi
+       PixelWand **source, **dest;
+       size_t source_width, source_height;
+       ssize_t source_left, source_top;
++#if MagickLibVersion >= 0x700
++      PixelInfo pixel;  
++#else
+       MagickPixelPacket pixel;
++#endif
+       DisposeType dispose;
+       ptrdiff_t lines = 0;
+ 
+@@ -10272,7 +10276,11 @@ imagemagick_compute_animated_image (Magi
+ 	      if (dispose == BackgroundDispose || PixelGetAlpha (source[x]))
+ 		{
+ 		  PixelGetMagickColor (source[x], &pixel);
++#if MagickLibVersion >= 0x700
++		  PixelSetPixelColor (dest[x + source_left], &pixel);
++#else
+ 		  PixelSetMagickColor (dest[x + source_left], &pixel);
++#endif
+ 		}
+ 	    }
+ 	  PixelSyncIterator (dest_iterator);
+@@ -10317,7 +10325,11 @@ imagemagick_load_image (struct frame *f,
+   MagickWand *image_wand;
+   PixelIterator *iterator;
+   PixelWand **pixels, *bg_wand = NULL;
++#if MagickLibVersion >= 0x700
++  PixelInfo pixel;
++#else
+   MagickPixelPacket  pixel;
++#endif
+   Lisp_Object image;
+ #ifndef DONT_CREATE_TRANSFORMED_IMAGEMAGICK_IMAGE
+   Lisp_Object value;

emacs-27.1-Xauthority4server.patch

@@ -0,0 +1,128 @@
+From werner@suse.de
+Date: Mon, 08 Mar 2021 13:35:41 +0000
+Subject: Allow GNU Emacs server to open X Display
+
+even if the Xauthority file is not the default expected by XCloseDisplay()
+
+---
+ etc/emacs.service |    2 ++
+ lisp/server.el    |   45 +++++++++++++++++++++++++++++++++++++++++++--
+ 2 files changed, 45 insertions(+), 2 deletions(-)
+
+--- etc/emacs.service
++++ etc/emacs.service	2024-04-11 06:46:29.320172754 +0000
+@@ -5,9 +5,11 @@
+ [Unit]
+ Description=Emacs text editor
+ Documentation=info:emacs man:emacs(1) https://gnu.org/software/emacs/
++After=graphical-session.target
+ 
+ [Service]
+ Type=notify
++Environment=XAUTHORITY=%t/emacs/xauth
+ ExecStart=emacs --fg-daemon
+ 
+ # Emacs will exit with status 15 after having received SIGTERM, which
+--- lisp/server.el
++++ lisp/server.el	2024-04-11 06:17:17.692578500 +0000
+@@ -289,6 +289,11 @@ If nil, no instructions are displayed."
+   "The directory in which to place the server socket.
+ If local sockets are not supported, this is nil.")
+ 
++;; Hold the Xauthority if an X Display is used
++(defvar server-xauth-file nil
++  "The Xauthority file to hold the Xauthority cookies.
++If no Xauthority is used, this is nil.")
++
+ (define-error 'server-running-external "External server running")
+ 
+ (defun server-clients-with (property value)
+@@ -619,6 +624,11 @@ If the key is not valid, signal an error
+   (let ((server-dir (if server-use-tcp server-auth-dir server-socket-dir)))
+     (expand-file-name server-name server-dir)))
+ 
++(defsubst server--xauth ()
++  "Return the xauth file name to hold the X Authority."
++  (let ((server-dir (if server-use-tcp server-auth-dir server-socket-dir)))
++    (expand-file-name "xauth" server-dir)))
++
+ (defun server-stop (&optional noframe)
+   "If this Emacs process has a server communication subprocess, stop it.
+ If this actually stopped the server, return non-nil.  If the
+@@ -720,7 +730,8 @@ the `server-process' variable."
+        (setq leave-dead t)))
+       ;; Now any previous server is properly stopped.
+     (unless leave-dead
+-      (let ((server-file (server--file-name)))
++      (let ((server-file (server--file-name))
++	    (xauth-file (server--xauth)))
+ 	;; Make sure there is a safe directory in which to place the socket.
+ 	(server-ensure-safe-dir (file-name-directory server-file))
+         (with-file-modes ?\700
+@@ -762,6 +773,14 @@ the `server-process' variable."
+ 	  (unless server-process (error "Could not start server process"))
+           (server-log "Started server")
+ 	  (process-put server-process :server-file server-file)
++	  ;; File to hold X Authority cookies
++	  (unless (file-exists-p xauth-file)
++	    (make-empty-file xauth-file))
++	  (when (file-exists-p xauth-file)
++	    (let ((var (concat "XAUTHORITY=" xauth-file)))
++		(dolist (proc (process-list))
++		  (process-put proc 'env (cons var (process-get proc 'env)))))
++	    (setq server-xauth-file xauth-file))
+           (setq server-mode t)
+           (push 'server-mode global-minor-modes)
+ 	  (when server-use-tcp
+@@ -898,7 +917,7 @@ This handles splitting the command if it
+   (let ((frame
+          (server-with-environment
+              (process-get proc 'env)
+-             '("LANG" "LC_CTYPE" "LC_ALL"
++             '("LANG" "LC_CTYPE" "LC_ALL" "LC_PAPER" "LC_MEASUREMENT"
+                ;; For tgetent(3); list according to ncurses(3).
+                "BAUDRATE" "COLUMNS" "ESCDELAY" "HOME" "LINES"
+                "NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING"
+@@ -1171,6 +1190,8 @@ The following commands are accepted by t
+ 		nowait     ; t if emacsclient does not want to wait for us.
+ 		frame      ; Frame opened for the client (if any).
+ 		display    ; Open frame on this display.
++		(xauth-file (expand-file-name "~/.Xauthority"))
++		xauth-cmd
+ 		parent-id  ; Window ID for XEmbed
+ 		dontkill   ; t if client should not be killed.
+ 		commands
+@@ -1314,6 +1335,16 @@ The following commands are accepted by t
+                 ;; -env NAME=VALUE:  An environment variable.
+                 ("-env"
+                  (let ((var (pop args-left)))
++		   (if (and (stringp var)
++		         (string-match "^\\([^=]+\\)=\\(.*\\)" var))
++			 (if (cond ((string-equal (match-string 1 var) "LANG") t)
++			       ((string-equal (match-string 1 var) "LC_CTYPE") t)
++			       ((string-equal (match-string 1 var) "LC_ALL") t)
++			       ((string-equal (match-string 1 var) "LC_PAPER") t)
++			       ((string-equal (match-string 1 var) "LC_MEASUREMENT") t)
++			       ((string-equal (match-string 1 var) "DISPLAY") t)
++			       ((string-equal (match-string 1 var) "XAUTHORITY") (setq xauth-file (match-string 2 var))))
++			     (setenv (match-string 1 var) (match-string 2 var) t)))
+                    ;; XXX Variables should be encoded as in getenv/setenv.
+                    (process-put proc 'env
+                                 (cons var (process-get proc 'env)))))
+@@ -1329,6 +1360,16 @@ The following commands are accepted by t
+                 ;; Unknown command.
+                 (arg (error "Unknown command: %s" arg))))
+ 
++	    (if (and display server-xauth-file)
++		(progn
++		    (if (not xauth-file)
++			(setq xauth-file (expand-file-name "~/.Xauthority")))
++		    (if (and (file-exists-p xauth-file) (not (file-equal-p xauth-file server-xauth-file)))
++			(progn
++			    (setq xauth-cmd (concat "xauth -f " xauth-file " extract - " display
++				"| xauth -f " server-xauth-file " merge -"))
++			    (shell-command xauth-cmd)))))
++
+ 	    ;; If both -no-wait and -tty are given with file or sexp
+ 	    ;; arguments, use an existing frame.
+ 	    (and nowait

emacs-27.1-pdftex.patch

@@ -11,7 +11,7 @@
  9 files changed, 15 insertions(+), 10 deletions(-)
 
 --- etc/refcards/Makefile
-+++ etc/refcards/Makefile	2025-03-03 13:47:02.384844658 +0000
++++ etc/refcards/Makefile	2024-02-02 07:47:53.132617523 +0000
 @@ -231,12 +231,12 @@ pl-refcard.pdf: $(pl_refcard_deps)
  	  ! pdfmex --version > /dev/null 2> /dev/null; then \
  	  echo "No mex format found."; false; \
@@ -29,7 +29,7 @@
  pl-refcard.ps: pl-refcard.dvi
  	dvips -t a4 -o $@ pl-refcard.dvi
 --- etc/refcards/cs-dired-ref.tex
-+++ etc/refcards/cs-dired-ref.tex	2025-03-03 13:47:02.384844658 +0000
++++ etc/refcards/cs-dired-ref.tex	2024-02-02 07:47:53.132617523 +0000
 @@ -108,7 +108,8 @@ see the Emacs distribution, or {\tt http
    \font\eightbf=csbx8
    \font\eightit=csti8
@@ -41,7 +41,7 @@
    \textfont0=\eightrm
    \textfont1=\eightmi
 --- etc/refcards/cs-survival.tex
-+++ etc/refcards/cs-survival.tex	2025-03-03 13:47:02.384844658 +0000
++++ etc/refcards/cs-survival.tex	2024-02-02 07:47:53.132617523 +0000
 @@ -84,7 +84,8 @@
  \font\eightbf=csbx8
  \font\eightit=csti8
@@ -53,23 +53,23 @@
  \font\eightss=cmss8
  \textfont0=\eightrm
 --- etc/refcards/fr-survival.tex
-+++ etc/refcards/fr-survival.tex	2025-03-03 13:59:16.051351215 +0000
++++ etc/refcards/fr-survival.tex	2024-02-02 07:48:34.823838922 +0000
 @@ -1,4 +1,4 @@
 -%&tex
 +%
  % Title:  GNU Emacs Survival Card
  
- % Copyright (C) 2000--2025 Free Software Foundation, Inc.
+ % Copyright (C) 2000--2024 Free Software Foundation, Inc.
 --- etc/refcards/pl-refcard.tex
-+++ etc/refcards/pl-refcard.tex	2025-03-03 13:59:45.474809928 +0000
++++ etc/refcards/pl-refcard.tex	2024-02-02 07:48:49.943556553 +0000
 @@ -1,4 +1,4 @@
 -%&mex
 +%
  % Reference Card for GNU Emacs
  
- % Copyright (C) 1999, 2001--2025 Free Software Foundation, Inc.
+ % Copyright (C) 1999, 2001--2024 Free Software Foundation, Inc.
 --- etc/refcards/ru-refcard.tex
-+++ etc/refcards/ru-refcard.tex	2025-03-03 13:47:02.384844658 +0000
++++ etc/refcards/ru-refcard.tex	2024-02-02 07:47:53.132617523 +0000
 @@ -25,6 +25,7 @@
  \documentclass[10pt]{article}
  \usepackage{multicol,tabularx}
@@ -79,7 +79,7 @@
  \usepackage[utf8]{inputenc}
  \usepackage[english,russian]{babel}
 --- etc/refcards/sk-dired-ref.tex
-+++ etc/refcards/sk-dired-ref.tex	2025-03-03 13:47:02.384844658 +0000
++++ etc/refcards/sk-dired-ref.tex	2024-02-02 07:47:53.132617523 +0000
 @@ -109,7 +109,8 @@ see the Emacs distribution, or {\tt http
    \font\eightbf=csbx8
    \font\eightit=csti8
@@ -91,7 +91,7 @@
    \textfont0=\eightrm
    \textfont1=\eightmi
 --- etc/refcards/sk-survival.tex
-+++ etc/refcards/sk-survival.tex	2025-03-03 13:47:02.384844658 +0000
++++ etc/refcards/sk-survival.tex	2024-02-02 07:47:53.132617523 +0000
 @@ -86,7 +86,8 @@
  \font\eightbf=csbx8
  \font\eightit=csti8
@@ -103,10 +103,10 @@
  \font\eightss=cmss8
  \textfont0=\eightrm
 --- etc/refcards/survival.tex
-+++ etc/refcards/survival.tex	2025-03-03 14:00:07.370407132 +0000
++++ etc/refcards/survival.tex	2024-02-02 07:49:06.719243261 +0000
 @@ -1,4 +1,4 @@
 -%&tex
 +%
  % Title:  GNU Emacs Survival Card
  
- % Copyright (C) 2000--2025 Free Software Foundation, Inc.
+ % Copyright (C) 2000--2024 Free Software Foundation, Inc.

emacs-29.1.dif

@@ -18,8 +18,8 @@
  16 files changed, 472 insertions(+), 31 deletions(-)
 
 --- Makefile.in
-+++ Makefile.in	2025-03-03 14:13:31.011626405 +0000
-@@ -627,7 +627,7 @@ install-arch-dep: src install-arch-indep
++++ Makefile.in	2023-08-01 08:29:04.813378495 +0000
+@@ -614,7 +614,7 @@ install-arch-dep: src install-arch-indep
  	umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}"
  	$(MAKE) -C lib-src install
  ifeq (${ns_self_contained},no)
@@ -28,7 +28,7 @@
  ifeq (${HAVE_BE_APP},yes)
  	${INSTALL_PROGRAM} $(INSTALL_STRIP) src/Emacs "$(DESTDIR)${prefix}/apps/Emacs"
  endif
-@@ -637,7 +637,7 @@ ifeq (${HAVE_BE_APP},yes)
+@@ -624,7 +624,7 @@ ifeq (${HAVE_BE_APP},yes)
  endif
  	${INSTALL_DATA} src/emacs.pdmp "$(DESTDIR)${libexecdir}/emacs/${version}/${configuration}"/emacs-${EMACS_PDMP}
  endif
@@ -37,7 +37,7 @@
  ifndef NO_BIN_LINK
  	rm -f "$(DESTDIR)${bindir}/$(EMACS)"
  	cd "$(DESTDIR)${bindir}" && $(LN_S_FILEONLY) "$(EMACSFULL)" "$(EMACS)"
-@@ -826,6 +826,7 @@ install-man:
+@@ -811,6 +811,7 @@ install-man:
  	umask 022; ${MKDIR_P} "$(DESTDIR)${man1dir}"
  	thisdir=`pwd -P`; \
  	cd ${mansrcdir}; \
@@ -45,7 +45,7 @@
  	for page in *.1; do \
  	  test "$$page" = ChangeLog.1 && continue; \
  	  dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \
-@@ -963,7 +964,7 @@ uninstall: uninstall-$(NTDIR) uninstall-
+@@ -947,7 +948,7 @@ uninstall: uninstall-$(NTDIR) uninstall-
  	   for page in *.1; do \
  	     rm -f "$(DESTDIR)${man1dir}"/`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1$$ext; done; \
  	 fi)
@@ -55,8 +55,8 @@
  	   rm -f hicolor/*x*/apps/"${EMACS_NAME}.png" \
  	     "hicolor/scalable/apps/${EMACS_NAME}.svg" \
 --- configure.ac
-+++ configure.ac	2025-03-03 14:13:31.011626405 +0000
-@@ -2796,10 +2796,8 @@ fi
++++ configure.ac	2023-08-01 08:20:12.115169895 +0000
+@@ -1958,10 +1958,8 @@ fi
  LD_SWITCH_X_SITE_RPATH=
  if test "${x_libraries}" != NONE; then
    if test -n "${x_libraries}"; then
@@ -64,13 +64,13 @@
 -    LD_SWITCH_X_SITE_RPATH=-Wl,-rpath,`
 -      AS_ECHO(["$x_libraries"]) | sed -e 's/:/ -Wl,-rpath,/g'
 -    `
-+    LD_SWITCH_X_SITE=""
-+    LD_SWITCH_X_SITE_RPATH=""
++    LD_SWITCH_X_SITE="-L ${x_libraries%%:*}"
++    LD_SWITCH_X_SITE_RPATH="-Wl,-rpath-link,${x_libraries%%:*}"
    fi
    x_default_search_path=""
    x_search_path=${x_libraries}
 --- doc/man/etags.1
-+++ doc/man/etags.1	2025-03-03 14:14:59.905989458 +0000
++++ doc/man/etags.1	2023-08-01 08:20:12.115169895 +0000
 @@ -7,7 +7,7 @@
  ..
  
@@ -132,9 +132,9 @@
 -add a \fInameregexp\fP, to narrow down the tag scope.  \fBctags\fP
 +add a \fInameregexp\fP, to narrow down the tag scope.  \fBgnuctags\fP
  ignores regexps without a \fInameregexp\fP.  The syntax of regexps is
- the same as in Emacs, except that backslash escapes are the same
- as GNU grep (which means, for example, that shy groups are not supported),
-@@ -265,15 +265,15 @@ tag entries for other files in place.  C
+ the same as in emacs.  The following character escape sequences are
+ supported: \\a, \\b, \\d, \\e, \\f, \\n, \\r, \\t, \\v, which
+@@ -262,15 +262,15 @@ tag entries for other files in place.  C
  by deleting the existing entries for the given files and then
  rewriting the new entries at the end of the tags file.  It is often
  faster to simply rebuild the entire tag file than to use this.
@@ -154,8 +154,8 @@
  .B \-h, \-H, \-\-help
  Print usage information.  Followed by one or more \-\-language=LANG
 --- lib-src/Makefile.in
-+++ lib-src/Makefile.in	2025-03-03 14:15:24.737532187 +0000
-@@ -155,7 +155,7 @@ ANDROID=@ANDROID@
++++ lib-src/Makefile.in	2023-08-01 08:20:12.115169895 +0000
+@@ -144,7 +144,7 @@ HAIKU_CFLAGS=@HAIKU_CFLAGS@
  CLIENTW = @CLIENTW@
  
  # Things that a user might actually run, which should be installed in bindir.
@@ -164,7 +164,7 @@
                 ebrowse${EXEEXT}
  
  # Things that Emacs runs internally, or during the build process,
-@@ -419,7 +419,7 @@ etags${EXEEXT}: ${etags_deps}
+@@ -403,7 +403,7 @@ etags${EXEEXT}: ${etags_deps}
  ## etags.o files on top of each other.
  ## FIXME?
  ## Can't we use a wrapper that calls 'etags --ctags'?
@@ -172,9 +172,9 @@
 +gnuctags${EXEEXT}: ${srcdir}/ctags.c ${etags_deps}
  	$(AM_V_CCLD)$(CC) ${ALL_CFLAGS} -o $@ $< $(etags_libs)
  
- asset-directory-tool${EXEEXT}: ${srcdir}/asset-directory-tool.c $(config_h)
+ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \
 --- lib-src/pop.c
-+++ lib-src/pop.c	2025-03-03 14:13:31.011626405 +0000
++++ lib-src/pop.c	2023-08-01 08:20:12.115169895 +0000
 @@ -26,6 +26,7 @@ along with GNU Emacs.  If not, see <http
  #ifdef MAIL_USE_POP
  
@@ -184,7 +184,7 @@
  #include "ntlib.h"
  #undef _WIN32_WINNT
 --- lisp/cmuscheme.el
-+++ lisp/cmuscheme.el	2025-03-03 14:13:31.011626405 +0000
++++ lisp/cmuscheme.el	2023-08-01 08:20:12.115169895 +0000
 @@ -232,7 +232,8 @@ is run).
  			 (read-string "Run Scheme: " scheme-program-name)
  			 scheme-program-name)))
@@ -196,7 +196,7 @@
  			   (scheme-start-file (car cmdlist)) (cdr cmdlist)))
  	(inferior-scheme-mode)))
 --- lisp/international/mule-cmds.el
-+++ lisp/international/mule-cmds.el	2025-03-03 14:13:31.011626405 +0000
++++ lisp/international/mule-cmds.el	2023-08-01 08:20:12.115169895 +0000
 @@ -39,6 +39,7 @@
  
  (defvar mule-keymap
@@ -206,8 +206,8 @@
      (define-key map "r" 'revert-buffer-with-coding-system)
      (define-key map "F" 'set-file-name-coding-system)
 --- lisp/net/ange-ftp.el
-+++ lisp/net/ange-ftp.el	2025-03-03 14:13:31.015626331 +0000
-@@ -5077,7 +5077,7 @@ NEWNAME should be the name to give the n
++++ lisp/net/ange-ftp.el	2023-08-01 08:20:12.119169821 +0000
+@@ -5076,7 +5076,7 @@ NEWNAME should be the name to give the n
  ;  "If a host matches this regexp then it is assumed to be running VOS.")
  ;
  ;(defun ange-ftp-vos-host (host)
@@ -216,7 +216,7 @@
  ;       (save-match-data
  ;	 (string-match ange-ftp-vos-host-regexp host))))
  ;
-@@ -5192,7 +5192,7 @@ NEWNAME should be the name to give the n
+@@ -5191,7 +5191,7 @@ NEWNAME should be the name to give the n
  
  ;; Return non-nil if HOST is running VMS.
  (defun ange-ftp-vms-host (host)
@@ -225,7 +225,7 @@
         (string-match-p ange-ftp-vms-host-regexp host)))
  
  ;; Because some VMS ftp servers convert filenames to lower case
-@@ -5700,7 +5700,7 @@ Other orders of $ and _ seem to all work
+@@ -5699,7 +5699,7 @@ Other orders of $ and _ seem to all work
  
  ;; Return non-nil if HOST is running MTS.
  (defun ange-ftp-mts-host (host)
@@ -234,7 +234,7 @@
         (string-match-p ange-ftp-mts-host-regexp host)))
  
  ;; Parse the current buffer which is assumed to be in mts ftp dir format.
-@@ -5898,7 +5898,7 @@ Other orders of $ and _ seem to all work
+@@ -5897,7 +5897,7 @@ Other orders of $ and _ seem to all work
  
  ;; Return non-nil if HOST is running CMS.
  (defun ange-ftp-cms-host (host)
@@ -244,7 +244,7 @@
  
  (defun ange-ftp-add-cms-host (host)
 --- lisp/site-load.el
-+++ lisp/site-load.el	2025-03-03 14:13:31.015626331 +0000
++++ lisp/site-load.el	2023-08-01 08:20:12.119169821 +0000
 @@ -0,0 +1,45 @@
 +;;;;
 +;;; emacs-27.1/lisp/site-load.el
@@ -292,8 +292,8 @@
 +
 +;;; site-load.el ends here
 --- lisp/speedbar.el
-+++ lisp/speedbar.el	2025-03-03 14:13:31.015626331 +0000
-@@ -728,6 +728,7 @@ If you want to change this while speedba
++++ lisp/speedbar.el	2023-08-01 08:20:12.119169821 +0000
+@@ -727,6 +727,7 @@ If you want to change this while speedba
  
      ;; Navigation.
      (define-key map "n" 'speedbar-next)
@@ -302,7 +302,7 @@
      (define-key map "\M-n" 'speedbar-restricted-next)
      (define-key map "\M-p" 'speedbar-restricted-prev)
 --- lisp/textmodes/ispell.el
-+++ lisp/textmodes/ispell.el	2025-03-03 14:13:31.015626331 +0000
++++ lisp/textmodes/ispell.el	2023-08-01 08:20:12.119169821 +0000
 @@ -191,13 +191,15 @@ Must be greater than 1."
    :type 'integer)
  
@@ -326,7 +326,7 @@
    "Program invoked by \\[ispell-word] and \\[ispell-region] commands."
    :type 'string
    :set (lambda (symbol value)
-@@ -1429,6 +1431,78 @@ The variable `ispell-library-directory'
+@@ -1427,6 +1429,78 @@ The variable `ispell-library-directory'
  
    ;; Define commands in menu in opposite order you want them to appear.
    (let ((map (make-sparse-keymap "Spell")))
@@ -406,7 +406,7 @@
        `(menu-item ,(purecopy "Change Dictionary...") ispell-change-dictionary
  		  :help ,(purecopy "Supply explicit dictionary file name")))
 --- site-lisp/term/func-keys.el
-+++ site-lisp/term/func-keys.el	2025-03-03 14:13:31.015626331 +0000
++++ site-lisp/term/func-keys.el	2023-08-01 08:20:12.119169821 +0000
 @@ -0,0 +1,33 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/func-keys.el for site-lisp path
@@ -442,7 +442,7 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von func-keys.el
 --- site-lisp/term/gnome.el
-+++ site-lisp/term/gnome.el	2025-03-03 14:13:31.015626331 +0000
++++ site-lisp/term/gnome.el	2023-08-01 08:20:12.119169821 +0000
 @@ -0,0 +1,97 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/gnomw.el for site-lisp path
@@ -542,7 +542,7 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von gnomw.el
 --- site-lisp/term/kvt.el
-+++ site-lisp/term/kvt.el	2025-03-03 14:13:31.015626331 +0000
++++ site-lisp/term/kvt.el	2023-08-01 08:20:12.119169821 +0000
 @@ -0,0 +1,97 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/kvt.el for site-lisp path
@@ -642,7 +642,7 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von kvt.el
 --- site-lisp/term/linux.el
-+++ site-lisp/term/linux.el	2025-03-03 14:13:31.015626331 +0000
++++ site-lisp/term/linux.el	2023-08-01 08:20:12.119169821 +0000
 @@ -0,0 +1,79 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/linux.el for site-lisp path
@@ -724,7 +724,7 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von linux.el
 --- site-lisp/term/locale.el
-+++ site-lisp/term/locale.el	2025-03-03 14:13:31.015626331 +0000
++++ site-lisp/term/locale.el	2023-08-01 08:20:12.119169821 +0000
 @@ -0,0 +1,13 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/locale.el for site-lisp path

emacs-29.4.tar.xz.sig

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQFLBAABCgA1FiEEuwLkB66eqofJ5yodLU4f6VlXE10FAmZ26AAXHHN0ZWZhbmth
+bmdhc0BnbWFpbC5jb20ACgkQLU4f6VlXE12pAwf8C+BIyBYVe3q7ErFAL7O1zK/k
+fuL/Nh1g9pKY6JDiNx4INLi4DoFaoj4HzLj356N/m/8xZl0+J1TYOp5gR3TNiYSo
+hf8Dxt9V3zEminMzXeQnrH0IMESkktpXmlhCcb5GtapO86KzYrFeZXU95fk8C3+H
+7MVDo3QznLnQTUb+OythZ5d5ClN1XVNKrkcu/hdHR51lPYP4NW/zbWdCYvKsSNTD
+pkr+484KAT/R2FzoyhUtbiGkJacG0AxHA7uwPqjCFcoaet/6GjkJ9UJTJo7A1VwF
+9qBwS2UCLofsZpoutly+43Id+OJBmA6PbGyQayvDCPuxfX9Ok/TjWWLSY0z5wA==
+=E1hc
+-----END PGP SIGNATURE-----

emacs-30.1-seccomp.patch

@@ -1,57 +0,0 @@
-Allow also to get attributes of the terminal line as
-well as support mmap(2) flag MAP_DROPPABLE to allow
-zero memory under memory pressure.
-
----
- lib-src/seccomp-filter.c |   19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
---- lib-src/seccomp-filter.c
-+++ lib-src/seccomp-filter.c	2025-03-19 12:29:10.689765873 +0000
-@@ -42,6 +42,13 @@ variants of those files that can be used
- #include <stdlib.h>
- #include <stdint.h>
- #include <stdio.h>
-+#ifdef __powerpc64__
-+/* glibc uses internal an other TCGETS ioctl for its
-+   tcgetattr(3) call with its internal struct termios */
-+# include <asm/termbits.h>
-+#else
-+# include <termios.h>
-+#endif
- #include <time.h>
- 
- #include <asm/prctl.h>
-@@ -64,6 +71,11 @@ variants of those files that can be used
- #define ARCH_CET_STATUS 0x3001
- #endif
- 
-+/* https://github.com/torvalds/linux/commit/9651fcedf7b92d3f7f1ab179e8ab55b85ee10fc1 */
-+#ifndef MAP_DROPPABLE
-+#define MAP_DROPPABLE 0x0
-+#endif
-+
- static ATTRIBUTE_FORMAT_PRINTF (2, 3) _Noreturn void
- fail (int error, const char *format, ...)
- {
-@@ -187,7 +199,7 @@ main (int argc, char **argv)
-            some versions of the dynamic loader still use it.  Also
-            allow allocating thread stacks.  */
-         SCMP_A3_32 (SCMP_CMP_MASKED_EQ,
--                    ~(MAP_SHARED | MAP_PRIVATE | MAP_FILE
-+                    ~(MAP_SHARED | MAP_PRIVATE | MAP_FILE | MAP_DROPPABLE
-                       | MAP_ANONYMOUS | MAP_FIXED | MAP_DENYWRITE
-                       | MAP_STACK | MAP_NORESERVE),
-                     0));
-@@ -274,6 +286,11 @@ main (int argc, char **argv)
-         SCMP_A0_32 (SCMP_CMP_EQ, STDIN_FILENO),
-         SCMP_A1_32 (SCMP_CMP_EQ, TIOCGPGRP));
- 
-+  /* Allow `tcgetattr' call of glibc on physical terminal devices. */
-+  RULE (SCMP_ACT_ALLOW, SCMP_SYS (ioctl),
-+        SCMP_A0_32 (SCMP_CMP_EQ, STDERR_FILENO),
-+        SCMP_A1_32 (SCMP_CMP_EQ, TCGETS));
-+
-   /* Allow reading (but not setting) file flags.  */
-   RULE (SCMP_ACT_ALLOW, SCMP_SYS (fcntl),
-         SCMP_A1_32 (SCMP_CMP_EQ, F_GETFL));

emacs-30.1.tar.xz.sig

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQFLBAABCgA1FiEEuwLkB66eqofJ5yodLU4f6VlXE10FAme7VFgXHHN0ZWZhbmth
-bmdhc0BnbWFpbC5jb20ACgkQLU4f6VlXE10RGQf/VB2GZJLNnpcC80QRsH2EyPzR
-A5i3GGxG/7oAyHZKyJXV1iQDzPNDOrVymH6/L9U/DmCJTSWg9NRq7EtdydgU3K6h
-13rF+g+EJAJdso4fFkKrXOuLr82yEgB50BiMT6j6dXQEBihB1eQu62ajuUCaHkYI
-il7gyar7vCurdCIetxlYtZ056IRooJFq+haCcXCBTgbWj7ZrF345610gwetaUsuv
-Bv4nZTcVFOzwxghP31FDYUukUJ7nob70t/Tw7XMf3alpCjQ5ESQci/+UrQGBACU6
-IfTfGWFT1hmMJz3BN+7bl0sMroiPBqwg5QOGGSOtzm2BtMMBRRx7pRPQIHwCjg==
-=VMP8
------END PGP SIGNATURE-----

emacs-parallel-compilation-53a5dada.patch

@@ -1,29 +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(-)
-
---- lisp/emacs-lisp/cl-macs.el
-+++ lisp/emacs-lisp/cl-macs.el	2025-03-12 08:11:02.848630106 +0000
-@@ -2667,7 +2667,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)

emacs.changes

@@ -1,154 +1,3 @@
--------------------------------------------------------------------
-Thu Mar 20 11:27:14 UTC 2025 - Dr. Werner Fink <werner@suse.de>
-
-- Enhance patch emacs-30.1-seccomp.patch
-  * Support seccomp ioctl TCGETS also on ppc64le
-- Use zlib-ng-compat only on opensuse
-
--------------------------------------------------------------------
-Wed Mar 12 09:43:04 UTC 2025 - Dr. Werner Fink <werner@suse.de>
-
-- Add patch emacs-parallel-compilation-53a5dada.patch
-  * Based on upstream commit 53a5dada
-  * Fix compilation errors due to insufficient compiler safety
-
--------------------------------------------------------------------
-Thu Mar  6 08:32:49 UTC 2025 - Dr. Werner Fink <werner@suse.de>
-
-- Add patch emacs-30.1-seccomp.patch
-  * Allow also to get attributes of the terminal line as well as
-    support mmap(2) flag MAP_DROPPABLE to allow zero memory under
-    memory pressure.
-- Disable xwidgets of GTK port for now as webkit2gtk has a regression
-  https://bugs.webkit.org/show_bug.cgi?id=289081
-
--------------------------------------------------------------------
-Tue Mar  4 11:13:23 UTC 2025 - Dr. Werner Fink <werner@suse.de>
-
-- Update to GNU Emacs version 30.1 (boo#1237518)
-  * On GNU/Linux, Emacs is now the default application for 'org-protocol'.
-    Org mode provides a way to quickly capture bookmarks, notes, and links
-    using 'emacsclient':
-     emacsclient "org-protocol://store-link?url=URL&title=TITLE"
-  * New variable lets Lisp code read emacsclient arguments.
-    When '--eval' is passed to emacsclient and Emacs is evaluating each
-    argument, the new variable 'server-eval-args-left' is set to those
-    arguments not yet evaluated
-  * Tree-Sitter modes are now declared as submodes of the non-TS modes.
-  * Mouse wheel events should now always be 'wheel-up/down/left/right'.
-  * 'completion-auto-help' now affects 'icomplete-in-buffer'.
-  * The "*Completions*" buffer now always accompanies 'icomplete-in-buffer'.
-  * The default process filter was rewritten in native code.
-  * Network Security Manager now warns about 3DES by default.
-  * Network Security Manager now warns about <2048 bits in DH key exchange.
-  * URL now never sends user email addresses in HTTP requests.
-  * Fix shell injection vulnerability in man.el (CVE-2025-1244).
-  * New user option 'trusted-content' to allow potentially dangerous features.
-    This option is used to fix CVE-2024-53920.
-- Remove obsolete patches
-  * CVE-2025-1244.patch
-  * emacs-25.2-ImageMagick7.patch
-  * emacs-27.1-Xauthority4server.patch
-  * emacs-29.4-boo1234673.patch
-  * emacs-CVE-2024-53920.patch
-  * emacs-gcc14.patch
-- Port patches
-  * emacs-24.1-ps-mule.patch
-  * emacs-24.3-asian-print.patch
-  * emacs-24.3-iconic.patch
-  * emacs-24.4-flyspell.patch
-  * emacs-24.4-nonvoid.patch
-  * emacs-24.4-ps-bdf.patch
-  * emacs-27.1-pdftex.patch
-  * emacs-29.1.dif
-  * pdump.patch
-
--------------------------------------------------------------------
-Wed Feb 12 12:20:32 UTC 2025 - Dr. Werner Fink <werner@suse.de>
-
-- Add patch CVE-2025-1244.patch
-  * Avoid shell injection via custom "man" URI scheme (boo#1237091, CVE-2025-1244)
-
--------------------------------------------------------------------
-Wed Jan 15 13:53:48 UTC 2025 - Dr. Werner Fink <werner@suse.de>
-
-- Try to avoid crash on later loaded shared libraries as seen in
-  bug boo#1234865 with libnvidia-tls.so
-
--------------------------------------------------------------------
-Thu Jan  9 12:26:03 UTC 2025 - Dr. Werner Fink <werner@suse.de>
-
-- Add patch emacs-29.4-boo1234673.patch
-  * Avoid that Emacs recompiles some packages on every startup (boo#1234673) 
-
--------------------------------------------------------------------
-Fri Dec 13 14:42:16 UTC 2024 - Dr. Werner Fink <werner@suse.de>
-
-- Add patch emacs-CVE-2024-53920.patch (bsc#1233894, CVE-2024-53920) 
-  * Disable flymake on start and save to avoid to be attacked with
-    elisp code from foreign source.
-
--------------------------------------------------------------------
-Wed Nov 27 08:46:04 UTC 2024 - Dr. Werner Fink <werner@suse.de>
-
-- Avoid trouble with unknown X pointer shapes below Wayland (boo#1233795) 
-
--------------------------------------------------------------------
-Tue Oct  8 08:06:41 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Prefer webkit2gtk-4.1 over webkit2gtk-4.0: configure also prefers
-  API version 4.1 and uses 4.0 only as a fallback.
-
--------------------------------------------------------------------
-Mon Sep 16 10:47:37 UTC 2024 - Dr. Werner Fink <werner@suse.de>
-
-- Add patch emacs-gcc14.patch to make flymake-tests work even with
-  gcc14 (backport from upstream master) 
-
--------------------------------------------------------------------
-Wed Aug 28 11:03:31 UTC 2024 - Dr. Werner Fink <werner@suse.de>
-
-- flymake-tests fails with gcc14 on 32bit architectures ... therefore
-  use gcc13 here
-
--------------------------------------------------------------------
-Mon Aug 19 11:46:55 UTC 2024 - Dr. Werner Fink <werner@suse.de>
-
-- Only suggest emacs-games to avoid warning about
-  game dir '/var/games/emacs': Permission denied (boo#1228058)
-
--------------------------------------------------------------------
-Sun Aug  4 20:20:37 UTC 2024 - Björn Bidar <bjorn.bidar@thaodan.de>
-
-- Set find-function-C-source-directory in site-start so sources
-  provided by the debugsource package can be found user intervention
-  inside Emacs 
-
--------------------------------------------------------------------
-Thu Jul 25 12:23:48 UTC 2024 - Dr. Werner Fink <werner@suse.de>
-
-- Use simple trusted members of the group games (boo#1228058) 
-
--------------------------------------------------------------------
-Wed Jul 17 09:11:18 UTC 2024 - Dr. Werner Fink <werner@suse.de>
-
-- Split off the emacs-games package for score handling (boo#1227737) 
-- Implement setgid based score handling
-
--------------------------------------------------------------------
-Thu Jul 11 09:31:21 UTC 2024 - Dr. Werner Fink <werner@suse.de>
-
-- The xauth patch should ignore any locking at read time
-  as otherwise emacs server might hang
-- Provide support of ELPA systemwide installations to OBS
-
--------------------------------------------------------------------
-Wed Jul 10 08:54:22 UTC 2024 - Dr. Werner Fink <werner@suse.de>
-
-- Support system wide ELPA and MELPA site lisp paths
-- Move post scriptlets for font-latex to emacs-auctex as
-  triggerin scriptlets 
-
 -------------------------------------------------------------------
 Tue Jul  2 07:52:23 UTC 2024 - Dr. Werner Fink <werner@suse.de>
 

emacs.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package emacs
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,21 +30,10 @@
 %bcond_with     tex4pdf
 %bcond_with     memmmap
 %bcond_with     checks
-# webkit2gtk-4.1 >= 2.41.92 triggers crash as described in PROBLEMS
-%bcond_with     webkit
-#
-# Compare with AUDIT bug boo#1228058
-# With this setup only members of the group "games" can use
-# already existing score files below /var/games/emacs/
-#
-#
-%bcond_without  games
-%define gattr   00755
 
 Name:           emacs
 %if %{with checks}
 BuildRequires:  bubblewrap
-BuildRequires:  screen
 %endif
 %if %{with autoconf}
 BuildRequires:  autoconf
@@ -85,7 +74,7 @@ BuildRequires:  mailutils-devel
 %endif
 BuildRequires:  makeinfo
 BuildRequires:  ncurses-devel
-%if %{with games}
+%if 0%{?suse_version} >= 1500
 BuildRequires:  user(games)
 %endif
 BuildRequires:  systemd-rpm-macros
@@ -103,11 +92,7 @@ BuildRequires:  update-desktop-files
 #BuildRequires:  xdotool
 #BuildRequires:  xorg-x11-Xvfb
 BuildRequires:  xz
-%if 0%{?suse_version} > 1550 && 0%{is_opensuse}
-BuildRequires:  zlib-ng-compat-devel
-%else
 BuildRequires:  zlib-devel
-%endif
 BuildRequires:  pkgconfig(ImageMagick)
 BuildRequires:  pkgconfig(com_err)
 BuildRequires:  pkgconfig(dbus-1)
@@ -151,11 +136,8 @@ BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(pango)
 BuildRequires:  pkgconfig(sm)
-BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(tree-sitter)
-%if %{with webkit}
-BuildRequires:  pkgconfig(webkit2gtk-4.1) >= 2.12
-%endif
+BuildRequires:  pkgconfig(webkit2gtk-4.0) >= 2.12
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(x11-xcb)
 BuildRequires:  pkgconfig(xaw3d)
@@ -171,9 +153,8 @@ BuildRequires:  pkgconfig(xshmfence)
 BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(xwayland)
 BuildRequires:  pkgconfig(xxf86vm)
-BuildRequires:  treesitter_grammar(tree-sitter-ruby)
 URL:            http://www.gnu.org/software/emacs/
-Version:        30.1
+Version:        29.4
 Release:        0
 Summary:        GNU Emacs Base Package
 License:        GPL-3.0-or-later
@@ -182,8 +163,6 @@ Provides:       nxml-mode = 20041004
 Obsoletes:      nxml-mode < 20041004
 Provides:       epg = 1.0.0
 Obsoletes:      epg < 1.0.0
-Provides:       emacs(ELPA)
-Requires:       bubblewrap
 Requires:       emacs-info = %{version}
 Requires:       emacs_program = %{version}-%{release}
 Requires:       etags
@@ -191,8 +170,9 @@ Requires:       etags
 Requires:       mailutils
 %endif
 Requires(pre):  fileutils
-%if %{with games}
-Suggests:       %{name}-games
+%if 0%{?suse_version} >= 1500
+Requires(pre):  group(games)
+Requires(pre):  user(games)
 %endif
 Source:         https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz
 Source1:        app-defaults.Emacs
@@ -219,11 +199,14 @@ Patch12:        emacs-24.3-x11r7.patch
 Patch15:        emacs-24.3-iconic.patch
 Patch16:        emacs-24.4-flyspell.patch
 Patch22:        pdump.patch
-Source23:       emacs-25.1-custom-fonts.patch
-Patch24:        emacs-parallel-compilation-53a5dada.patch
+Patch23:        emacs-25.1-custom-fonts.patch
+# this patch works with both ImageMagick-6 and ImageMagick-7 for us,
+# but that is because we ship /usr/include/ImageMagick-7/wand compat
+# symlink
+Patch24:        emacs-25.2-ImageMagick7.patch
 Patch25:        emacs-26.1-xft4x11.patch
 Patch26:        emacs-27.1-pdftex.patch
-Patch27:        emacs-30.1-seccomp.patch
+Patch29:        emacs-27.1-Xauthority4server.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{expand: %%global include_info %(test -s /usr/share/info/info.info* && echo 0 || echo 1)}
 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
@@ -235,13 +218,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define appDefaultsDir %{_x11data}/app-defaults
 %define appDefaultsFile %{appDefaultsDir}/Emacs
 %else
-%global inodelib    %(ls -id /%{_lib}/|sed 's@ /.*@@')
-%global inodeusrlib %(ls -id %{_libdir}/|sed 's@ /.*@@')
-%if %inodelib == %inodeusrlib
-%define _x11lib     /%{_lib}
-%else
 %define _x11lib     %{_libdir}
-%endif
 %define _x11data    %{_datadir}/X11
 %define _libx11     %{_exec_prefix}/lib/X11
 %define _x11inc     %{_includedir}
@@ -337,7 +314,7 @@ Summary:        Info files for GNU Emacs
 Group:          Documentation/Other
 %if 0%{?suse_version} <= 1500
 Requires(post): %install_info_prereq
-Requires(preun): %install_info_prereq
+Requires(preun):%install_info_prereq
 %endif
 BuildArch:      noarch
 
@@ -346,26 +323,11 @@ This package contains all the Info files for GNU Emacs. These files can
 be read online with GNU Emacs. They describe Emacs and some of its
 modes.
 
-%if %{with games}
-%package        games
-Requires:       emacs = %{version}-%{release}
-Requires(pre):  group(games)
-Requires(pre):  user(games)
-Requires(pre):  permissions
-Provides:       emacs:%{_localstatedir}/games/emacs
-Summary:        Provides scores for Emacs games
-Group:          Amusements/Games/Other
-
-%description    games
-This package provides capability to play games for members of the user
-group called "games".
-%endif
-
 %package     -n etags
 Summary:        Generate Tag Files for Use with Emacs
 Group:          Development/Tools/Navigators
 Requires(post): coreutils update-alternatives
-Requires(preun): coreutils update-alternatives
+Requires(preun):coreutils update-alternatives
 Provides:       ctags:/usr/bin/etags
 
 %description -n etags
@@ -386,10 +348,11 @@ and most assembler-like syntaxes.
 %patch -P15 -p0 -b .iconic
 %patch -P16 -p0 -b .flyspell
 %patch -P22 -p0 -b .pd
-%patch -P24 -p0 -b .pc
+%patch -P23 -p0 -b .custfnt
+%patch -P24 -p1 -b .imag
 %patch -P25 -p0 -b .xft
 %patch -P26 -p0 -b .fmt
-%patch -P27 -p0 -b .console
+%patch -P29 -p0 -b .xauth
 %patch -P0  -p0 -b .0
 %if %{without tex4pdf}
 pushd etc/refcards/
@@ -424,6 +387,7 @@ fi
 %else
 autoreconf -fiv -I $PWD -I $PWD/m4
 %endif
+
   cflags ()
   {
       local flag=$1; shift
@@ -469,13 +433,12 @@ VERSION=%{version}
 %endif
  CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE -DGDK_DISABLE_DEPRECATION_WARNINGS -DGLIB_DISABLE_DEPRECATION_WARNINGS"
 LDFLAGS=
-  cflags -pipe                  CFLAGS
-  cflags -Wno-pointer-sign      CFLAGS
-  cflags -Wno-unused-variable   CFLAGS
-  cflags -Wno-unused-label      CFLAGS
-  cflags -fno-optimize-sibling-calls	CFLAGS
-  cflags -Wl,-O2		LDFLAGS
-  cflags -Wl,--copy-dt-needed-entries	LDFLAGS
+  cflags -pipe                   CFLAGS
+  cflags -Wno-pointer-sign       CFLAGS
+  cflags -Wno-unused-variable    CFLAGS
+  cflags -Wno-unused-label       CFLAGS
+  cflags -fno-optimize-sibling-calls CFLAGS
+  cflags -Wl,-O2		 LDFLAGS
 %ifarch ia64
  CFLAGS=$(echo "${CFLAGS}"|sed -r 's/-O[0-9]?/-O1/g')
 %endif
@@ -518,9 +481,7 @@ DESKTOP="--with-x \
 %if %{with cairo}
 	 --with-cairo \
 %endif
-%if %{with webkit}
 	 --with-xwidgets \
-%endif
 "
     X11="${DESKTOP} \
 	 --with-x-toolkit=lucid \
@@ -559,9 +520,7 @@ DESKTOP="--with-x \
 	 --without-native-compilation \
 %endif
 	 --without-hesiod \
-%if %{with games}
 	 --with-gameuser=:games \
-%endif
 	 --with-kerberos \
 	 --with-kerberos5 \
 	 --with-file-notification=inotify \
@@ -636,13 +595,6 @@ popd
 
 %install
 umask 022
-%if 0%{?suse_version} >= 1550
-%ifarch %ix86 %arm
-    export CC=gcc-13
-    export AR=gcc-ar-13
-    export RANLIB=gcc-ranlib-13
-%endif
-%endif
 #
 PATH=/sbin:$PATH
 ##
@@ -705,12 +657,6 @@ cat << EOF > %{buildroot}/%{_emacs_sitestartdir}/archsitedir.el
 (add-to-list 'load-path "%{_emacs_archsitelispdir}")
 EOF
 
-cat <<EOF > %{buildroot}/%{_emacs_sitestartdir}/function-c-source-directory.el
-;; Set function c source directory to the path of debugsource
-;; so it can be found without user invention
-(setq find-function-C-source-directory "%{_usrsrc}/debug/%{name}-%{version}/src")
-EOF
-
 popd
 (cd %{buildroot}
  find usr/share/emacs/site-lisp/ -type f	\
@@ -751,7 +697,6 @@ rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/fast-lock.el.flc
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/obsolete/fast-lock.el.flc
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/loaddefs.el.flc
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/progmodes/python.el.python
-rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/progmodes/flymake.el.cve202453920
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/textmodes/flyspell.el.flyspell
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/obsolete/spell.el.obsolate
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/cmuscheme.el.0
@@ -765,11 +710,7 @@ rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/mouse.el.prime
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/dynamic-setting.el.custfnt
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/server.el.xauth
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/htmlfontify.el.cve202248339
-rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/progmodes/elisp-mode.el.el.cve202453920
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/progmodes/ruby-mode.el.cve202248338
-rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-macs.el.pc
-rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/emacs-lisp/comp.el.boo1234673
-rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/man.el.boo1237091
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/emacsclient-mail.desktop.cve202327985
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/emacsclient-mail.desktop.cve202327986
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/etc/emacsclient.desktop.cve202327985
@@ -796,10 +737,6 @@ find %{buildroot}%{_datadir}/emacs/%{version}/etc/ -name '*[a-z].[16]' | \
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/COPYING
 ln -sf ../etc/COPYING \
        %{buildroot}%{_datadir}/emacs/%{version}/lisp/COPYING
-# Support system wide ELPA/MELPA
-mkdir -p %{buildroot}%{_libdir}/emacs/elpa
-mkdir -p %{buildroot}%{_datadir}/emacs/%{version}/site-lisp/elpa
-mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp/elpa
 #
 fdupes -q -r -1 %{buildroot}%{_datadir}/emacs/%{version}/etc/images/icons/ %{buildroot}%{_datadir}/icons/ |\
 xargs -n 2 | while read first second; do
@@ -855,76 +792,35 @@ do
 done
 %endif
 
-%if %{with games} && "%{gattr}" == "02755"
-%if 0%{?suse_version} >= 1699
-mkdir -p %{buildroot}%{_datadir}/permissions/permissions.d
-(cat > %{buildroot}%{_datadir}/permissions/permissions.d/emacs-games) <<-'EOF'
-	%{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/update-game-score	games:games	02755
-	EOF
-(cat > %{buildroot}%{_datadir}/permissions/permissions.d/emacs-games.paranoid) <<-'EOF'
-	%{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/update-game-score	games:games	00755
-	EOF
-%else
-mkdir -p %{buildroot}%{_sysconfdir}/permissions.d
-(cat > %{buildroot}%{_sysconfdir}/permissions.d/emacs-games) <<-'EOF'
-	%{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/update-game-score	games:games	02755
-	EOF
-(cat > %{buildroot}%{_sysconfdir}/permissions.d/emacs-games.paranoid) <<-'EOF'
-	%{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/update-game-score	games:games	00755
-	EOF
-%endif
-%endif
-
 %if %{with checks}
 %check
-%if 0%{?suse_version} >= 1550
-%ifarch %ix86 %arm
-export CC=gcc-13
-export AR=gcc-ar-13
-export RANLIB=gcc-ranlib-13
-%endif
-%endif
-sed -ri '/sleep 2/{ s/sleep 2/sleep 6/ }' test/lisp/eshell/eshell-tests.el
-sed -ri '/\(sleep-for/{ s/1/5/ }' test/lisp/net/network-stream-tests.el
-SCREENDIR=$(mktemp -d ${PWD}/screen.XXXXXX) || exit 1
-SCREENRC=${SCREENDIR}/ncurses
-export SCREENRC SCREENDIR
-exec 0< /dev/null
-SCREENLOG=${SCREENDIR}/log
-cat > $SCREENRC<<-EOF
-	deflogin off
-	deflog on
-	logfile $SCREENLOG
-	logfile flush 1
-	logtstamp off
-	log on
-	setsid on
-	scrollback 0
-	silence on
-	utf8 on
-	EOF
-export MAKEFLAGS="--jobs=1"
-> $SCREENLOG
-tail -q -s 0.5 -f $SCREENLOG & pid=$!
-screen -D -m make -k check
-sleep 1
-kill $pid
-%endif
-
-%if %{with games} && "%{gattr}" == "02755"
-%verifyscript games
-%verify_permissions -e %{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/update-game-score
+make check
 %endif
 
 %pre
 test -L usr/bin/emacs && rm -f usr/bin/emacs || true
 
-%if %{with games} && "%{gattr}" == "02755"
-%post games
-%set_permissions %{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/update-game-score
-%endif
+%post -n emacs-nox
+if test -e usr/share/emacs/site-lisp/auctex/font-latex.elc ; then
+  owd=$(pwd)
+  cd usr/share/emacs/site-lisp/auctex || exit 1
+  emacs -batch -no-site-file -no-init-file --eval '(setq load-path (cons "." load-path)
+    byte-compile-warnings nil
+    TeX-lisp-directory "<none>"
+    TeX-auto-global "<none>")' -f batch-byte-compile font-latex.el > /dev/null 2>&1
+  cd $owd
+fi
 
 %post -n emacs-x11
+if test -e usr/share/emacs/site-lisp/auctex/font-latex.elc ; then
+  owd=$(pwd)
+  cd usr/share/emacs/site-lisp/auctex || exit 1
+  emacs -batch -no-site-file -no-init-file --eval '(setq load-path (cons "." load-path)
+    byte-compile-warnings nil
+    TeX-lisp-directory "<none>"
+    TeX-auto-global "<none>")' -f batch-byte-compile font-latex.el > /dev/null 2>&1
+  cd $owd
+fi
 %glib2_gsettings_schema_post
 
 %postun -n emacs-x11
@@ -964,18 +860,19 @@ fi
 %{_bindir}/ebrowse
 %{_bindir}/emacs
 %{_bindir}/emacsclient
-%if %{without nativecomp}
-%dir %{_libdir}/emacs/
-%endif
-%dir %{_libdir}/emacs/elpa/
 %dir %{_libexecdir}/emacs/
 %dir %{_libexecdir}/emacs/%{version}/
-%dir %{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/
-%{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/hexl
+%dir %{_libexecdir}/emacs/%{version}/*-suse-linux*/
+%{_libexecdir}/emacs/%{version}/*-suse-linux*/hexl
 %if %{without mailutils}
-%{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/movemail
+%{_libexecdir}/emacs/%{version}/*-suse-linux*/movemail
+%endif
+%{_libexecdir}/emacs/%{version}/*-suse-linux*/rcs2log
+%if 0
+%attr(04755,games,games) %{_libexecdir}/emacs/%{version}/*-suse-linux*/update-game-score
+%else
+%{_libexecdir}/emacs/%{version}/*-suse-linux*/update-game-score
 %endif
-%{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/rcs2log
 %{_userunitdir}/emacs.service
 %dir %{_datadir}/doc/packages/emacs/
 %{_datadir}/doc/packages/emacs/doc
@@ -985,7 +882,6 @@ fi
 %doc %{_datadir}/emacs/%{version}/etc/AUTHORS
 %doc %{_datadir}/emacs/%{version}/etc/CALC-NEWS
 %doc %{_datadir}/emacs/%{version}/etc/COPYING
-%doc %{_datadir}/emacs/%{version}/etc/copyright-assign.txt
 %doc %{_datadir}/emacs/%{version}/etc/DEBUG
 %doc %{_datadir}/emacs/%{version}/etc/DEVEL.HUMOR
 %doc %{_datadir}/emacs/%{version}/etc/DISTRIB
@@ -1734,79 +1630,6 @@ fi
 %{_datadir}/emacs/%{version}/etc/images/zoom-in.xpm
 %{_datadir}/emacs/%{version}/etc/images/zoom-out.pbm
 %{_datadir}/emacs/%{version}/etc/images/zoom-out.xpm
-%{_datadir}/emacs/%{version}/etc/images/alt.pbm
-%{_datadir}/emacs/%{version}/etc/images/commit.pbm
-%{_datadir}/emacs/%{version}/etc/images/commit.xpm
-%{_datadir}/emacs/%{version}/etc/images/conceal.pbm
-%{_datadir}/emacs/%{version}/etc/images/conceal.svg
-%{_datadir}/emacs/%{version}/etc/images/ctrl.pbm
-%{_datadir}/emacs/%{version}/etc/images/gen-changelog.pbm
-%{_datadir}/emacs/%{version}/etc/images/gen-changelog.xpm
-%{_datadir}/emacs/%{version}/etc/images/gnus/gnus-pointer.svg
-%{_datadir}/emacs/%{version}/etc/images/hyper.pbm
-%{_datadir}/emacs/%{version}/etc/images/ins-changelog.pbm
-%{_datadir}/emacs/%{version}/etc/images/ins-changelog.xpm
-%{_datadir}/emacs/%{version}/etc/images/last-page.pbm
-%{_datadir}/emacs/%{version}/etc/images/last-page.xpm
-%{_datadir}/emacs/%{version}/etc/images/load-changelog.pbm
-%{_datadir}/emacs/%{version}/etc/images/load-changelog.xpm
-%{_datadir}/emacs/%{version}/etc/images/meta.pbm
-%{_datadir}/emacs/%{version}/etc/images/reveal.pbm
-%{_datadir}/emacs/%{version}/etc/images/reveal.svg
-%{_datadir}/emacs/%{version}/etc/images/shift.pbm
-%{_datadir}/emacs/%{version}/etc/images/super.pbm
-%dir %{_datadir}/emacs/%{version}/etc/images/symbols/
-%doc %{_datadir}/emacs/%{version}/etc/images/symbols/README
-%{_datadir}/emacs/%{version}/etc/images/symbols/check-mark_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/check-mark_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/chevron_down_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/chevron_down_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/chevron_left_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/chevron_left_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/chevron_right_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/chevron_right_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/chevron_up_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/chevron_up_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/cross_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/cross_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/cross_circle_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/cross_circle_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/cross_circle_fill_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/cross_circle_fill_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/dot_large_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/dot_large_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/dot_medium_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/dot_medium_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/dot_small_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/dot_small_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/heart_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/heart_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/heart_fill_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/heart_fill_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/heart_half_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/heart_half_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/menu_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/menu_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/minus_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/minus_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/minus_circle_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/minus_circle_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/minus_circle_fill_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/minus_circle_fill_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/plus_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/plus_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/plus_circle_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/plus_circle_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/plus_circle_fill_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/plus_circle_fill_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/star_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/star_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/star_fill_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/star_fill_16.svg
-%{_datadir}/emacs/%{version}/etc/images/symbols/star_half_16.pbm
-%{_datadir}/emacs/%{version}/etc/images/symbols/star_half_16.svg
-%{_datadir}/emacs/%{version}/etc/images/view-diff.pbm
-%{_datadir}/emacs/%{version}/etc/images/view-diff.xpm
 %dir %{_datadir}/emacs/%{version}/etc/nxml/
 %doc %{_datadir}/emacs/%{version}/etc/nxml/README
 %{_datadir}/emacs/%{version}/etc/nxml/test-invalid.xml
@@ -1880,13 +1703,6 @@ fi
 %{_datadir}/emacs/%{version}/etc/schema/dbpool.rnc
 %{_datadir}/emacs/%{version}/etc/schema/dbstart.rnc
 %{_datadir}/emacs/%{version}/etc/schema/docbook.rnc
-%{_datadir}/emacs/%{version}/etc/schema/dotnet-appconfig.rnc
-%{_datadir}/emacs/%{version}/etc/schema/dotnet-packages-config.rnc
-%{_datadir}/emacs/%{version}/etc/schema/dotnet-packages-props.rnc
-%{_datadir}/emacs/%{version}/etc/schema/dotnet-resx.rnc
-%{_datadir}/emacs/%{version}/etc/schema/msbuild.rnc
-%{_datadir}/emacs/%{version}/etc/schema/nuget.rnc
-%{_datadir}/emacs/%{version}/etc/schema/nuspec.rnc
 %{_datadir}/emacs/%{version}/etc/schema/locate.rnc
 %{_datadir}/emacs/%{version}/etc/schema/od-manifest-schema-v1.2-os.rnc
 %{_datadir}/emacs/%{version}/etc/schema/rdfxml.rnc
@@ -1956,14 +1772,8 @@ fi
 %{_datadir}/emacs/%{version}/etc/themes/manoj-dark-theme.el
 %{_datadir}/emacs/%{version}/etc/themes/misterioso-theme.el
 %{_datadir}/emacs/%{version}/etc/themes/modus-operandi-theme.el
-%{_datadir}/emacs/%{version}/etc/themes/modus-operandi-deuteranopia-theme.el
-%{_datadir}/emacs/%{version}/etc/themes/modus-operandi-tinted-theme.el
-%{_datadir}/emacs/%{version}/etc/themes/modus-operandi-tritanopia-theme.el
 %{_datadir}/emacs/%{version}/etc/themes/modus-themes.el
 %{_datadir}/emacs/%{version}/etc/themes/modus-vivendi-theme.el
-%{_datadir}/emacs/%{version}/etc/themes/modus-vivendi-deuteranopia-theme.el
-%{_datadir}/emacs/%{version}/etc/themes/modus-vivendi-tinted-theme.el
-%{_datadir}/emacs/%{version}/etc/themes/modus-vivendi-tritanopia-theme.el
 %{_datadir}/emacs/%{version}/etc/themes/tango-dark-theme.el
 %{_datadir}/emacs/%{version}/etc/themes/tango-theme.el
 %{_datadir}/emacs/%{version}/etc/themes/tsdh-dark-theme.el
@@ -2018,7 +1828,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/autorevert.elc
 %{_datadir}/emacs/%{version}/lisp/avoid.elc
 %{_datadir}/emacs/%{version}/lisp/battery.elc
-%{_datadir}/emacs/%{version}/lisp/bind-key.elc
 %{_datadir}/emacs/%{version}/lisp/bindings.el
 %{_datadir}/emacs/%{version}/lisp/bookmark.elc
 %{_datadir}/emacs/%{version}/lisp/bs.elc
@@ -2274,7 +2083,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/color.elc
 %{_datadir}/emacs/%{version}/lisp/comint.elc
 %{_datadir}/emacs/%{version}/lisp/completion.elc
-%{_datadir}/emacs/%{version}/lisp/completion-preview.elc
 %{_datadir}/emacs/%{version}/lisp/composite.elc
 %{_datadir}/emacs/%{version}/lisp/cus-dep.elc
 %{_datadir}/emacs/%{version}/lisp/cus-edit.elc
@@ -2308,12 +2116,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/ebuff-menu.elc
 %{_datadir}/emacs/%{version}/lisp/echistory.elc
 %{_datadir}/emacs/%{version}/lisp/ecomplete.elc
-%{_datadir}/emacs/%{version}/lisp/editorconfig-conf-mode.elc
-%{_datadir}/emacs/%{version}/lisp/editorconfig-core-handle.elc
-%{_datadir}/emacs/%{version}/lisp/editorconfig-core.elc
-%{_datadir}/emacs/%{version}/lisp/editorconfig-fnmatch.elc
-%{_datadir}/emacs/%{version}/lisp/editorconfig-tools.elc
-%{_datadir}/emacs/%{version}/lisp/editorconfig.elc
 %{_datadir}/emacs/%{version}/lisp/edmacro.elc
 %{_datadir}/emacs/%{version}/lisp/ehelp.elc
 %{_datadir}/emacs/%{version}/lisp/elec-pair.elc
@@ -2351,11 +2153,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-preloaded.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-print.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-seq.elc
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/comp-common.elc
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/comp-run.elc
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/compat.elc
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/ert-font-lock.elc
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/track-changes.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/comp-cstr.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/comp.elc
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/copyright.elc
@@ -2480,7 +2277,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/erc/erc-menu.elc
 %{_datadir}/emacs/%{version}/lisp/erc/erc-netsplit.elc
 %{_datadir}/emacs/%{version}/lisp/erc/erc-networks.elc
-%{_datadir}/emacs/%{version}/lisp/erc/erc-nicks.elc
 %{_datadir}/emacs/%{version}/lisp/erc/erc-notify.elc
 %{_datadir}/emacs/%{version}/lisp/erc/erc-page.elc
 %{_datadir}/emacs/%{version}/lisp/erc/erc-pcomplete.elc
@@ -2497,7 +2293,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/erc/erc-xdcc.elc
 %{_datadir}/emacs/%{version}/lisp/erc/erc.elc
 %dir %{_datadir}/emacs/%{version}/lisp/eshell/
-%{_datadir}/emacs/%{version}/lisp/eshell/esh-module-loaddefs.el
 %{_datadir}/emacs/%{version}/lisp/eshell/em-elecslash.elc
 %{_datadir}/emacs/%{version}/lisp/eshell/em-extpipe.elc
 %{_datadir}/emacs/%{version}/lisp/eshell/em-alias.elc
@@ -2520,6 +2315,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-arg.elc
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-cmd.elc
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-ext.elc
+%{_datadir}/emacs/%{version}/lisp/eshell/esh-groups.elc
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-io.elc
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-mode.elc
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-module.elc
@@ -2560,8 +2356,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/fringe.elc
 %{_datadir}/emacs/%{version}/lisp/generic-x.el
 %dir %{_datadir}/emacs/%{version}/lisp/gnus/
-%{_datadir}/emacs/%{version}/lisp/gnus/nnatom.elc
-%{_datadir}/emacs/%{version}/lisp/gnus/nnfeed.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-rmail.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/canlock.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/deuglify.elc
@@ -2616,6 +2410,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-win.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/gssapi.elc
+%{_datadir}/emacs/%{version}/lisp/gnus/legacy-gnus-agent.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/mail-source.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/message.elc
 %{_datadir}/emacs/%{version}/lisp/gnus/mm-archive.elc
@@ -2704,7 +2499,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/image/gravatar.elc
 %{_datadir}/emacs/%{version}/lisp/image/image-converter.elc
 %{_datadir}/emacs/%{version}/lisp/indent.elc
-%{_datadir}/emacs/%{version}/lisp/indent-aux.elc
 %{_datadir}/emacs/%{version}/lisp/info-look.elc
 %{_datadir}/emacs/%{version}/lisp/info-xref.elc
 %{_datadir}/emacs/%{version}/lisp/info.elc
@@ -2827,7 +2621,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/leim/quail/emoji.elc
 %{_datadir}/emacs/%{version}/lisp/leim/quail/indonesian.elc
 %{_datadir}/emacs/%{version}/lisp/leim/quail/misc-lang.elc
-%{_datadir}/emacs/%{version}/lisp/leim/quail/pakistan.elc
 %{_datadir}/emacs/%{version}/lisp/leim/quail/philippine.elc
 %{_datadir}/emacs/%{version}/lisp/leim/quail/4Corner.elc
 %{_datadir}/emacs/%{version}/lisp/leim/quail/ARRAY30.elc
@@ -2990,8 +2783,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/net/eudcb-ecomplete.elc
 %{_datadir}/emacs/%{version}/lisp/net/eudcb-mailabbrev.elc
 %{_datadir}/emacs/%{version}/lisp/net/tramp-container.elc
-%{_datadir}/emacs/%{version}/lisp/net/tramp-androidsu.elc
-%{_datadir}/emacs/%{version}/lisp/net/tramp-message.elc
 %{_datadir}/emacs/%{version}/lisp/net/ange-ftp.elc
 %{_datadir}/emacs/%{version}/lisp/net/browse-url.elc
 %{_datadir}/emacs/%{version}/lisp/net/dbus.elc
@@ -3159,7 +2950,6 @@ fi
 %dir %{_datadir}/emacs/%{version}/lisp/org/
 %{_datadir}/emacs/%{version}/lisp/org/oc-bibtex.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-cycle.elc
-%{_datadir}/emacs/%{version}/lisp/org/org-element-ast.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-fold-core.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-fold.elc
 %{_datadir}/emacs/%{version}/lisp/org/org-persist.elc
@@ -3329,12 +3119,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/proced.elc
 %{_datadir}/emacs/%{version}/lisp/profiler.elc
 %dir %{_datadir}/emacs/%{version}/lisp/progmodes/
-%{_datadir}/emacs/%{version}/lisp/progmodes/elixir-ts-mode.elc
-%{_datadir}/emacs/%{version}/lisp/progmodes/etags-regen.elc
-%{_datadir}/emacs/%{version}/lisp/progmodes/heex-ts-mode.elc
-%{_datadir}/emacs/%{version}/lisp/progmodes/lua-ts-mode.elc
-%{_datadir}/emacs/%{version}/lisp/progmodes/peg.elc
-%{_datadir}/emacs/%{version}/lisp/progmodes/php-ts-mode.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/c-ts-mode.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/cmake-ts-mode.elc
 %{_datadir}/emacs/%{version}/lisp/progmodes/csharp-mode.elc
@@ -3485,7 +3269,6 @@ fi
 %dir %{_datadir}/emacs/%{version}/lisp/term/
 %{_datadir}/emacs/%{version}/lisp/term/AT386.elc
 %doc %{_datadir}/emacs/%{version}/lisp/term/README
-%{_datadir}/emacs/%{version}/lisp/term/android-win.elc
 %{_datadir}/emacs/%{version}/lisp/term/haiku-win.elc
 %{_datadir}/emacs/%{version}/lisp/term/pgtk-win.elc
 %{_datadir}/emacs/%{version}/lisp/term/bobcat.elc
@@ -3533,7 +3316,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/textmodes/enriched.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/fill.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/flyspell.elc
-%{_datadir}/emacs/%{version}/lisp/textmodes/html-ts-mode.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/ispell.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/less-css-mode.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/makeinfo.elc
@@ -3581,7 +3363,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/tmm.elc
 %{_datadir}/emacs/%{version}/lisp/tool-bar.elc
 %{_datadir}/emacs/%{version}/lisp/tooltip.elc
-%{_datadir}/emacs/%{version}/lisp/touch-screen.elc
 %{_datadir}/emacs/%{version}/lisp/transient.elc
 %{_datadir}/emacs/%{version}/lisp/tree-widget.elc
 %{_datadir}/emacs/%{version}/lisp/treesit.elc
@@ -3620,6 +3401,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/url/url-vars.elc
 %{_datadir}/emacs/%{version}/lisp/url/url.elc
 %dir %{_datadir}/emacs/%{version}/lisp/use-package/
+%{_datadir}/emacs/%{version}/lisp/use-package/bind-key.elc
 %{_datadir}/emacs/%{version}/lisp/use-package/use-package-bind-key.elc
 %{_datadir}/emacs/%{version}/lisp/use-package/use-package-core.elc
 %{_datadir}/emacs/%{version}/lisp/use-package/use-package-delight.elc
@@ -3674,18 +3456,15 @@ fi
 %{_datadir}/emacs/%{version}/lisp/vcursor.elc
 %{_datadir}/emacs/%{version}/lisp/version.elc
 %{_datadir}/emacs/%{version}/lisp/view.elc
-%{_datadir}/emacs/%{version}/lisp/visual-wrap.elc
 %{_datadir}/emacs/%{version}/lisp/w32-fns.elc
 %{_datadir}/emacs/%{version}/lisp/w32-vars.elc
 %{_datadir}/emacs/%{version}/lisp/wdired.elc
-%{_datadir}/emacs/%{version}/lisp/which-key.elc
 %{_datadir}/emacs/%{version}/lisp/whitespace.elc
 %{_datadir}/emacs/%{version}/lisp/wid-browse.elc
 %{_datadir}/emacs/%{version}/lisp/wid-edit.elc
 %{_datadir}/emacs/%{version}/lisp/widget.elc
 %{_datadir}/emacs/%{version}/lisp/windmove.elc
 %{_datadir}/emacs/%{version}/lisp/window.elc
-%{_datadir}/emacs/%{version}/lisp/window-tool-bar.elc
 %{_datadir}/emacs/%{version}/lisp/winner.elc
 %{_datadir}/emacs/%{version}/lisp/woman.elc
 %{_datadir}/emacs/%{version}/lisp/xdg.elc
@@ -3695,7 +3474,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/xwidget.elc
 %{_datadir}/emacs/%{version}/lisp/yank-media.elc
 %dir %{_datadir}/emacs/%{version}/site-lisp/
-%dir %{_datadir}/emacs/%{version}/site-lisp/elpa/
 %{_datadir}/emacs/%{version}/site-lisp/subdirs.el
 %dir %{_datadir}/emacs/%{version}/site-lisp/term/
 %{_datadir}/emacs/%{version}/site-lisp/term/func-keys.el
@@ -3704,44 +3482,26 @@ fi
 %{_datadir}/emacs/%{version}/site-lisp/term/linux.el
 %{_datadir}/emacs/%{version}/site-lisp/term/locale.el
 %dir %{_datadir}/emacs/site-lisp/
-%dir %{_datadir}/emacs/site-lisp/elpa/
 %dir %{_datadir}/emacs/site-lisp/site-start.d/
 %{_mandir}/man1/*.1%{ext_man}
 %exclude %{_mandir}/man1/*tags.1%{ext_man}
-
-%if %{with games}
-%files games
-%if "%{gattr}" == "02755"
-%attr(%{gattr},root,games) %{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/update-game-score
-%if 0%{?suse_version} >= 1699
-%attr(0755,root,root) %{_datadir}/permissions/permissions.d/
-%attr(0644,root,root) %{_datadir}/permissions/permissions.d/emacs-games
-%attr(0644,root,root) %{_datadir}/permissions/permissions.d/emacs-games.paranoid
-%else
-%config %attr(0644,root,root) %{_sysconfdir}/permissions.d/emacs-games
-%config %attr(0644,root,root) %{_sysconfdir}/permissions.d/emacs-games.paranoid
-%endif
-%else
-%attr(%{gattr},root,root) %{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/update-game-score
-%endif
-%dir %attr(0750,root,games) %{_localstatedir}/games/emacs
-%attr(0660,root,games) %{_localstatedir}/games/emacs/snake-scores
-%attr(0660,root,games) %{_localstatedir}/games/emacs/tetris-scores
-%endif
+%dir %attr(775,games,games) %{_localstatedir}/games/emacs
+%attr(660,games,games) %{_localstatedir}/games/emacs/snake-scores
+%attr(660,games,games) %{_localstatedir}/games/emacs/tetris-scores
 
 %files       -n emacs-nox
 %defattr(-, root, root)
 %{_bindir}/emacs-nox
-%{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/emacs-nox*.pdmp
+%{_libexecdir}/emacs/%{version}/*-suse-linux*/emacs-nox*.pdmp
 
 %files       -n emacs-x11
 %defattr(-, root, root)
 %{_bindir}/emacs-x11
 %{_bindir}/emacs-gtk
 %{_bindir}/emacs-wayland
-%{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/emacs-x11*.pdmp
-%{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/emacs-gtk*.pdmp
-%{_libexecdir}/emacs/%{version}/%{_target_cpu}-suse-linux/emacs-wayland*.pdmp
+%{_libexecdir}/emacs/%{version}/*-suse-linux*/emacs-x11*.pdmp
+%{_libexecdir}/emacs/%{version}/*-suse-linux*/emacs-gtk*.pdmp
+%{_libexecdir}/emacs/%{version}/*-suse-linux*/emacs-wayland*.pdmp
 %dir %{appDefaultsDir}
 %{appDefaultsFile}
 %{_datadir}/applications/emacs*.desktop
@@ -3777,7 +3537,6 @@ fi
 %if 0%{?include_info} == 0
 %exclude %{_infodir}/info.info%{ext_info}
 %endif
-%{_infodir}/elisp_type_hierarchy.jpg
 
 %files       -n emacs-el
 %defattr(-, root, root)
@@ -3797,7 +3556,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/autorevert.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/avoid.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/battery.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/bind-key.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/bookmark.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/bs.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/buff-menu.el%{ext_el}
@@ -4034,7 +3792,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/color.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/comint.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/completion.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/completion-preview.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/composite.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/cus-dep.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/cus-edit.el%{ext_el}
@@ -4065,12 +3822,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/ebuff-menu.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/echistory.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/ecomplete.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/editorconfig-conf-mode.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/editorconfig-core-handle.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/editorconfig-core.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/editorconfig-fnmatch.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/editorconfig-tools.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/editorconfig.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/edmacro.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/ehelp.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/elec-pair.el%{ext_el}
@@ -4100,11 +3851,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/checkdoc.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/comp-cstr.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/comp.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/comp-common.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/comp-run.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/compat.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/ert-font-lock.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/track-changes.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-extra.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-generic.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-indent.el%{ext_el}
@@ -4230,7 +3976,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/erc/erc-log.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/erc/erc-match.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/erc/erc-menu.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/erc/erc-nicks.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/erc/erc-netsplit.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/erc/erc-networks.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/erc/erc-notify.el%{ext_el}
@@ -4270,6 +4015,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-arg.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-cmd.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-ext.el%{ext_el}
+%{_datadir}/emacs/%{version}/lisp/eshell/esh-groups.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-io.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-mode.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/eshell/esh-module.el%{ext_el}
@@ -4361,6 +4107,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus-win.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/gnus/gnus.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/gnus/gssapi.el%{ext_el}
+%{_datadir}/emacs/%{version}/lisp/gnus/legacy-gnus-agent.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/gnus/mail-source.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/gnus/message.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/gnus/mm-archive.el%{ext_el}
@@ -4378,8 +4125,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/gnus/mml.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/gnus/mml1991.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/gnus/mml2015.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/gnus/nnatom.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/gnus/nnfeed.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/gnus/nnagent.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/gnus/nnbabyl.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/gnus/nndiary.el%{ext_el}
@@ -4449,7 +4194,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/image/image-converter.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/imenu.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/indent.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/indent-aux.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/info-look.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/info-xref.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/info.el%{ext_el}
@@ -4585,7 +4329,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/leim/quail/latin-post.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/leim/quail/latin-pre.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/leim/quail/lrt.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/leim/quail/pakistan.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/leim/quail/persian.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/leim/quail/programmer-dvorak.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/leim/quail/py-punct.el%{ext_el}
@@ -4754,8 +4497,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/net/soap-inspect.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/net/socks.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/net/telnet.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/net/tramp-androidsu.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/net/tramp-message.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/net/tramp-archive.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/net/tramp-adb.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/net/tramp-cache.el%{ext_el}
@@ -4864,7 +4605,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/org/org-cycle.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/org/org-fold-core.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/org/org-fold.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/org/org-element-ast.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/org/org-persist.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/org/ob-C.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/org/ob-R.el%{ext_el}
@@ -5028,12 +4768,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/printing.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/proced.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/profiler.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/progmodes/elixir-ts-mode.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/progmodes/etags-regen.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/progmodes/heex-ts-mode.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/progmodes/lua-ts-mode.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/progmodes/peg.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/progmodes/php-ts-mode.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/progmodes/c-ts-mode.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/progmodes/cmake-ts-mode.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/progmodes/csharp-mode.el%{ext_el}
@@ -5177,7 +4911,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/tar-mode.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/tempo.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/term.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/term/android-win.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/term/haiku-win.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/term/pgtk-win.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/term/AT386.el%{ext_el}
@@ -5224,7 +4957,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/textmodes/enriched.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/textmodes/fill.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/textmodes/flyspell.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/textmodes/html-ts-mode.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/textmodes/ispell.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/textmodes/less-css-mode.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/textmodes/makeinfo.el%{ext_el}
@@ -5269,7 +5001,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/tmm.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/tool-bar.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/tooltip.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/touch-screen.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/transient.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/tree-widget.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/treesit.el%{ext_el}
@@ -5306,6 +5037,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/url/url-util.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/url/url-vars.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/url/url.el%{ext_el}
+%{_datadir}/emacs/%{version}/lisp/use-package/bind-key.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/use-package/use-package-bind-key.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/use-package/use-package-core.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/use-package/use-package-delight.el%{ext_el}
@@ -5359,18 +5091,15 @@ fi
 %{_datadir}/emacs/%{version}/lisp/vcursor.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/version.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/view.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/visual-wrap.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/w32-fns.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/w32-vars.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/wdired.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/which-key.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/whitespace.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/wid-browse.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/wid-edit.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/widget.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/windmove.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/window.el%{ext_el}
-%{_datadir}/emacs/%{version}/lisp/window-tool-bar.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/winner.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/woman.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/x-dnd.el%{ext_el}

pdump.patch

@@ -11,7 +11,7 @@ diff --git a/src/emacs.c b/src/emacs.c
 index 687b8c7f81f0..2d6bfe07d813 100644
 --- src/emacs.c
 +++ src/emacs.c
-@@ -915,11 +915,15 @@ load_pdump (int argc, char **argv, char *dump_file)
+@@ -867,11 +867,15 @@ load_pdump (int argc, char **argv, char *dump_file)
      NULL
  #endif
      ;
@@ -27,7 +27,7 @@ index 687b8c7f81f0..2d6bfe07d813 100644
  #endif
      ;
  
-@@ -1060,7 +1064,11 @@ load_pdump (int argc, char **argv, char *dump_file)
+@@ -1012,7 +1016,11 @@ load_pdump (int argc, char **argv, char *dump_file)
  	  if (IS_DIRECTORY_SEP (*p))
  	    last_sep = p;
  	}