diff --git a/0001-Don-t-specify-StartupWMClass-in-emacs.desktop.patch b/0001-Don-t-specify-StartupWMClass-in-emacs.desktop.patch new file mode 100644 index 0000000..09f2ed7 --- /dev/null +++ b/0001-Don-t-specify-StartupWMClass-in-emacs.desktop.patch @@ -0,0 +1,31 @@ +From 164e45695f9784469ff2f66cafcd6bc927c246be Mon Sep 17 00:00:00 2001 +From: Peter Oliver +Date: Tue, 18 Mar 2025 13:16:15 +0000 +Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20specify=20StartupWMClass=20in?= + =?UTF-8?q?=20emacs.desktop?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +See the explanation at +https://debbugs.gnu.org/cgi/bugreport.cgi?bug=49505#67. In summary, the +value we were providing doesn’t work on Wayland, and the default should +be fine. + +* etc/emacs.desktop: Don’t specify StartupWMClass +--- + etc/emacs.desktop | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/etc/emacs.desktop b/etc/emacs.desktop +index 0d7cac14da5..16ad3c7eb48 100644 +--- a/etc/emacs.desktop ++++ b/etc/emacs.desktop +@@ -9,4 +9,3 @@ Type=Application + Terminal=false + Categories=Development;TextEditor; + StartupNotify=true +-StartupWMClass=Emacs +-- +2.48.1 + diff --git a/0001-Support-Tree-sitter-version-0.26-and-later.patch b/0001-Support-Tree-sitter-version-0.26-and-later.patch new file mode 100644 index 0000000..936ca2e --- /dev/null +++ b/0001-Support-Tree-sitter-version-0.26-and-later.patch @@ -0,0 +1,106 @@ +From 16f0be6354ea13331859c861fa7d423a0b54bec7 Mon Sep 17 00:00:00 2001 +From: Eli Zaretskii +Date: Fri, 17 Oct 2025 14:15:41 +0300 +Subject: [PATCH] Support Tree-sitter version 0.26 and later + +* src/treesit.c (init_treesit_functions) +[TREE_SITTER_LANGUAGE_VERSION >= 15]: Define prototype for, and +load 'ts_language_abi_version' instead of the deprecated (and +removed in tree-sitter 0.26) 'ts_language_version'. +(ts_language_abi_version) [TREE_SITTER_LANGUAGE_VERSION >= 15]: +Define on WINDOWSNT, instead of 'ts_language_version'. +(treesit_language_abi_version): New compatibility function. +(treesit_load_language, Ftreesit_language_abi_version): Use +'treesit_language_abi_version' instead of 'ts_language_version'. +(Bug#79627) +--- + src/treesit.c | 34 +++++++++++++++++++++++++++++++++- + 1 file changed, 33 insertions(+), 1 deletion(-) + +diff --git a/src/treesit.c b/src/treesit.c +index e2986c186b8..4d6bf9a5dbd 100644 +--- a/src/treesit.c ++++ b/src/treesit.c +@@ -34,7 +34,11 @@ Copyright (C) 2021-2025 Free Software Foundation, Inc. + # include "w32common.h" + + /* In alphabetical order. */ ++#if TREE_SITTER_LANGUAGE_VERSION >= 15 ++#undef ts_language_abi_version ++#else + #undef ts_language_version ++#endif + #undef ts_node_child + #undef ts_node_child_by_field_name + #undef ts_node_child_count +@@ -89,7 +93,11 @@ Copyright (C) 2021-2025 Free Software Foundation, Inc. + #undef ts_tree_get_changed_ranges + #undef ts_tree_root_node + ++#if TREE_SITTER_LANGUAGE_VERSION >= 15 ++DEF_DLL_FN (uint32_t, ts_language_abi_version, (const TSLanguage *)); ++#else + DEF_DLL_FN (uint32_t, ts_language_version, (const TSLanguage *)); ++#endif + DEF_DLL_FN (TSNode, ts_node_child, (TSNode, uint32_t)); + DEF_DLL_FN (TSNode, ts_node_child_by_field_name, + (TSNode, const char *, uint32_t)); +@@ -166,7 +174,11 @@ init_treesit_functions (void) + if (!library) + return false; + ++#if TREE_SITTER_LANGUAGE_VERSION >= 15 ++ LOAD_DLL_FN (library, ts_language_abi_version); ++#else + LOAD_DLL_FN (library, ts_language_version); ++#endif + LOAD_DLL_FN (library, ts_node_child); + LOAD_DLL_FN (library, ts_node_child_by_field_name); + LOAD_DLL_FN (library, ts_node_child_count); +@@ -224,7 +236,11 @@ init_treesit_functions (void) + return true; + } + ++#if TREE_SITTER_LANGUAGE_VERSION >= 15 ++#define ts_language_abi_version fn_ts_language_abi_version ++#else + #define ts_language_version fn_ts_language_version ++#endif + #define ts_node_child fn_ts_node_child + #define ts_node_child_by_field_name fn_ts_node_child_by_field_name + #define ts_node_child_count fn_ts_node_child_count +@@ -632,6 +648,22 @@ treesit_load_language_push_for_each_suffix (Lisp_Object lib_base_name, + } + } + ++/* This function is a compatibility shim. Tree-sitter 0.25 introduced ++ ts_language_abi_version as a replacement for ts_language_version, and ++ tree-sitter 0.26 removed ts_language_version. Here we use the fact ++ that 0.25 bumped TREE_SITTER_LANGUAGE_VERSION to 15, to use the new ++ function instead of the old one, when Emacs is compiled against ++ tree-sitter version 0.25 or newer. */ ++static uint32_t ++treesit_language_abi_version (const TSLanguage *ts_lang) ++{ ++#if TREE_SITTER_LANGUAGE_VERSION >= 15 ++ return ts_language_abi_version (ts_lang); ++#else ++ return ts_language_version (ts_lang); ++#endif ++} ++ + /* Load the dynamic library of LANGUAGE_SYMBOL and return the pointer + to the language definition. + +@@ -817,7 +849,7 @@ DEFUN ("treesit-language-abi-version", Ftreesit_language_abi_version, + &signal_data); + if (ts_language == NULL) + return Qnil; +- uint32_t version = ts_language_version (ts_language); ++ uint32_t version = treesit_language_abi_version (ts_language); + return make_fixnum((ptrdiff_t) version); + } + } +-- +2.52.0 + diff --git a/default.el b/default.el index 7df4cee..7ec900f 100644 --- a/default.el +++ b/default.el @@ -1,7 +1,13 @@ -;;; default.el - loaded after ".emacs" on startup -;;; -;;; Setting `inhibit-default-init' non-nil in "~/.emacs" -;;; prevents loading of this file. Also the "-q" option to emacs -;;; prevents both "~/.emacs" and this file from being loaded at startup. +;;; default.el --- loaded after ".emacs" on startup -*- lexical-binding: t -*- + +;;; Commentary: +;; +;; Setting `inhibit-default-init' non-nil in "~/.emacs" +;; prevents loading of this file. Also the "-q" option to "emacs" +;; prevents both "~/.emacs" and this file from being loaded at startup. + +;;; Code: (setq-default smime-CA-directory "/etc/ssl/certs") + +;;; default.el ends here diff --git a/dotemacs.el b/dotemacs.el index e1bee17..f7ddcf9 100644 --- a/dotemacs.el +++ b/dotemacs.el @@ -1,4 +1,4 @@ -;; .emacs +;;; -*- lexical-binding: t -*- (custom-set-variables ;; uncomment to always end a file with a newline diff --git a/emacs-desktop.patch b/emacs-desktop.patch deleted file mode 100644 index 2453407..0000000 --- a/emacs-desktop.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 90e902854c53c6ab5ef8711af27f42fbc77d9ffe Mon Sep 17 00:00:00 2001 -From: Peter Oliver -Date: Mon, 10 Apr 2023 20:55:54 +0100 -Subject: [PATCH] Use a wrapper to avoid the pure GTK build on X11, where it is - unsupported. - ---- - etc/emacs.desktop | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/emacs.desktop b/etc/emacs.desktop -index 0d7cac14da5..eabc78bb884 100644 ---- a/etc/emacs.desktop -+++ b/etc/emacs.desktop -@@ -3,7 +3,7 @@ Name=Emacs - GenericName=Text Editor - Comment=Edit text - MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; --Exec=emacs %F -+Exec=emacs-desktop %F - Icon=emacs - Type=Application - Terminal=false --- -2.39.2 - diff --git a/emacs-desktop.sh b/emacs-desktop.sh index 30648ae..2f60d9d 100755 --- a/emacs-desktop.sh +++ b/emacs-desktop.sh @@ -1,16 +1,39 @@ -#!/bin/sh +#!/usr/bin/bash # The pure GTK build of emacs is not supported on X11, so try to avoid -# using if there is an alternative. +# using it there if there is another alternative. -if [ "$XDG_SESSION_TYPE" = 'x11' ]; then - case "$(readlink -f /usr/bin/emacs)" in - */emacs-*.*-pgtk) - if type emacs-gtk+x11 >/dev/null; then - exec emacs-gtk+x11 "$@" - elif type emacs-lucid >/dev/null; then - exec emacs-lucid "$@" - fi +preferred="$(readlink -f /usr/bin/emacs)" + +if [[ $XDG_SESSION_TYPE == 'x11' ]]; then + case "$preferred" in + *-pgtk) + for variant in gtk+x11 lucid; do + if type "emacs-$variant" >/dev/null; then + exec -a emacs "emacs-$variant" "$@" + fi + done + ;; + */emacs-desktop) + # If this wrapper script is itself the preferred alternative, + # select something suitable from the options available. + for variant in gtk+x11 lucid pgtk nw; do + if type "emacs-$variant" >/dev/null; then + exec -a emacs "emacs-$variant" "$@" + fi + done + exit 2 + ;; + esac +else + case "$preferred" in + */emacs-desktop) + for variant in pgtk gtk+x11 lucid nw; do + if type "emacs-$variant" >/dev/null; then + exec -a emacs "emacs-$variant" "$@" + fi + done + exit 2 ;; esac fi diff --git a/emacs.spec b/emacs.spec index 00d464b..e10f642 100644 --- a/emacs.spec +++ b/emacs.spec @@ -12,7 +12,7 @@ Version: 30.2 Release: %autorelease License: GPL-3.0-or-later AND CC0-1.0 URL: https://www.gnu.org/software/emacs/ -%if %{lua: print(select(3, string.find(rpm.expand('%version'), '%d+%.(%d+)')))} == 0 +%if %{lua: print(select(3, string.find(rpm.expand('%version'), '%d+%.%d+%.(%d+)')) or 0)} >= 90 Source0: https://alpha.gnu.org/gnu/emacs/pretest/emacs-%{version}.tar.xz Source1: https://alpha.gnu.org/gnu/emacs/pretest/emacs-%{version}.tar.xz.sig %else @@ -26,11 +26,11 @@ Source102: https://keys.openpgp.org/vks/v1/by-fingerprint/12BB9B400EE3F77282 Source4: dotemacs.el Source5: site-start.el Source6: default.el -# Emacs Terminal Mode, #551949, #617355 -Source7: emacs-terminal.desktop -Source8: emacs-terminal.sh Source9: emacs-desktop.sh +Source10: emacs_lisp.attr +Source11: emacs_lisp.rec + # Avoid trademark issues Patch: 0001-Pong-and-Tetris-are-excluded.patch @@ -43,8 +43,8 @@ Patch: emacs-system-crypto-policies.patch # => remove it if we stop using this patch Patch: emacs-libdir-vs-systemd.patch -# Avoid using the pure GTK build on X11 where it is unsupported: -Patch: emacs-desktop.patch +# Hint what to do to avoid using the pure GTK build on X11, where it is +# unsupported: Patch: emacs-pgtk-on-x-error-message.patch # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2276822 @@ -52,6 +52,16 @@ Patch: emacs-pgtk-on-x-error-message.patch # gets any new backends, this patch may need extending. Patch: 0002-Fall-back-to-the-terminal-from-pure-GTK-when-no-disp.patch +# Don't override StartupWMClass. The overriding value doesn't work on +# Wayland, and the default should be fine. +# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=49505#67 +Patch: 0001-Don-t-specify-StartupWMClass-in-emacs.desktop.patch + +# Don't wait for Emacs 31 before updating to Tree-sitter 0.26. +# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=63555 +# https://bugzilla.redhat.com/show_bug.cgi?id=2420305 +Patch: 0001-Support-Tree-sitter-version-0.26-and-later.patch + BuildRequires: alsa-lib-devel BuildRequires: atk-devel BuildRequires: autoconf @@ -121,17 +131,6 @@ BuildRequires: util-linux %global marker ()(64bit) %endif -# Emacs doesn't run without a font, rhbz#732422 -Requires: google-noto-sans-mono-vf-fonts - -Requires(preun): /usr/sbin/alternatives -Requires(posttrans): /usr/sbin/alternatives -Requires: emacs-common = %{epoch}:%{version}-%{release} -Requires: libpixbufloader-xpm.so%{?marker} -Provides: emacs(bin) = %{epoch}:%{version}-%{release} -Provides: emacs-pgtk = %{epoch}:%{version}-%{release} -Supplements: ((libwayland-server and emacs-common) unless emacs-nw) - %define site_lisp %{_datadir}/emacs/site-lisp %define site_start_d %{site_lisp}/site-start.d %define pkgconfig %{_datadir}/pkgconfig @@ -144,23 +143,75 @@ editor. It contains special code editing features, a scripting language the editor. } +Provides: emacs(bin) = %{epoch}:%{version}-%{release} +Requires: (emacs-pgtk = %{epoch}:%{version}-%{release} or emacs-gtk+x11 = %{epoch}:%{version}-%{release} or emacs-lucid = %{epoch}:%{version}-%{release} or emacs-nw = %{epoch}:%{version}-%{release}) + +Suggests: (emacs-nw if fedora-release-identity-basic) +Suggests: (emacs-nw if fedora-release-cloud) +Suggests: (emacs-nw if fedora-release-container) +Suggests: (emacs-nw if fedora-release-coreos) +Suggests: (emacs-gtk+x11 if fedora-release-i3) +Suggests: (emacs-nw if fedora-release-iot) +Suggests: (emacs-gtk+x11 if fedora-release-matecompiz) +Suggests: (emacs-pgtk if fedora-release-miraclewm) +Suggests: (emacs-pgtk if fedora-release-miraclewm-atomic) +Suggests: (emacs-pgtk if fedora-release-mobility) +Suggests: (emacs-nw if fedora-release-server) +Suggests: (emacs-pgtk if fedora-release-silverblue) +Suggests: (emacs-pgtk if fedora-release-sway) +Suggests: (emacs-pgtk if fedora-release-sway-atomic) +Suggests: (emacs-nw if fedora-release-toolbx) +Suggests: (emacs-pgtk if fedora-release-workstation) +Suggests: (emacs-gtk+x11 if fedora-release-xfce) + +## If you know the best variant for these editions, please fill +## them in. +# Suggests: (emacs- if fedora-release-budgie) +# Suggests: (emacs- if fedora-release-budgie-atomic) +# Suggests: (emacs- if fedora-release-cinnamon) +# Suggests: (emacs- if fedora-release-compneuro) +# Suggests: (emacs- if fedora-release-cosmic) +# Suggests: (emacs- if fedora-release-cosmic-atomic) +# Suggests: (emacs- if fedora-release-designsuite) +# Suggests: (emacs- if fedora-release-kde) +# Suggests: (emacs- if fedora-release-kde-mobile) +# Suggests: (emacs- if fedora-release-kinoite) +# Suggests: (emacs- if fedora-release-kinoite-mobile) +# Suggests: (emacs- if fedora-release-lxqt) +# Suggests: (emacs- if fedora-release-soas) +# Suggests: (emacs- if fedora-release-wsl) %description %desc -This package provides an emacs binary with support for Wayland, using the + + +%package pgtk +Summary: GNU Emacs text editor with GTK toolkit for Wayland + +# Emacs doesn't run without a font, rhbz#732422 +Requires: google-noto-sans-mono-vf-fonts + +Requires(preun): /usr/sbin/alternatives +Requires(posttrans): /usr/sbin/alternatives +Requires: emacs-common = %{epoch}:%{version}-%{release} +Requires: libpixbufloader-xpm.so%{?marker} +Supplements: ((libwayland-server and emacs) unless emacs-nw) + +%description pgtk +%desc +This package provides an emacs-pgtk binary with support for Wayland, using the GTK toolkit. %if %{with gtkx11} %package gtk+x11 -Summary: GNU Emacs text editor with GTK toolkit X support +Summary: GNU Emacs text editor with GTK toolkit for X11 Requires: google-noto-sans-mono-vf-fonts Requires(preun): /usr/sbin/alternatives Requires(posttrans): /usr/sbin/alternatives Requires: emacs-common = %{epoch}:%{version}-%{release} Requires: libpixbufloader-xpm.so%{?marker} -Provides: emacs(bin) = %{epoch}:%{version}-%{release} -Supplements: ((xorg-x11-server-Xorg and emacs-common) unless emacs-nw) +Supplements: ((xorg-x11-server-Xorg and emacs) unless emacs-nw) %description gtk+x11 %desc @@ -171,12 +222,11 @@ Window System, using the GTK toolkit. %if %{with lucid} %package lucid -Summary: GNU Emacs text editor with Lucid toolkit X support +Summary: GNU Emacs text editor with Lucid toolkit for X11 Requires: google-noto-sans-mono-vf-fonts Requires(preun): /usr/sbin/alternatives Requires(posttrans): /usr/sbin/alternatives Requires: emacs-common = %{epoch}:%{version}-%{release} -Provides: emacs(bin) = %{epoch}:%{version}-%{release} %description lucid %desc @@ -191,7 +241,6 @@ Summary: GNU Emacs text editor with no window system support Requires(preun): /usr/sbin/alternatives Requires(posttrans): /usr/sbin/alternatives Requires: emacs-common = %{epoch}:%{version}-%{release} -Provides: emacs(bin) = %{epoch}:%{version}-%{release} Provides: emacs-nox = %{epoch}:%{version}-%{release} Obsoletes: emacs-nox < 1:30 @@ -220,16 +269,16 @@ License: GPL-3.0-or-later AND GFDL-1.3-no-invariants-or-later AND BSD-3-Cl Requires(preun): /usr/sbin/alternatives Requires(posttrans): /usr/sbin/alternatives Requires: /usr/bin/readlink -Requires: %{name}-filesystem +Requires: %{name}-filesystem >= 1:30.2 Requires: emacsclient Requires: libgccjit -Recommends: emacs(bin) +Recommends: emacs = %{epoch}:%{version}-%{release} Recommends: enchant2 Recommends: info Provides: %{name}-el = %{epoch}:%{version}-%{release} Obsoletes: emacs-el < 1:24.3-29 # transient.el is provided by emacs in lisp/transient.el -Provides: emacs-transient = 0.3.7 +Provides: emacs-transient = 0.7.2.2 # the existing emacs-transient package is obsoleted by emacs 28+, last package # version as of the release of emacs 28.1 is obsoleted Obsoletes: emacs-transient < 0.3.0-4 @@ -240,7 +289,10 @@ Recommends: /usr/bin/git Recommends: gcc Recommends: (gcc-c++ if libtree-sitter < 0.24.0) -Recommends: libtree-sitter-java +%global _local_file_attrs emacs_lisp +%{load:%SOURCE10} +%global __emacs_lisp_recommends \ + %{_builddir}/%{name}-%{version}/build-pgtk/src/emacs -x %SOURCE11 %description common %desc @@ -248,20 +300,6 @@ This package contains all the common files needed by emacs, emacs-gtk+x11, emacs-lucid, or emacs-nw. - -%package terminal -Summary: A desktop menu item for GNU Emacs terminal. -Requires: (emacs or emacs-gtk+x11 or emacs-lucid) -BuildArch: noarch - -%description terminal -Contains a desktop menu item running GNU Emacs terminal. Install -emacs-terminal if you need a terminal with Malayalam support. - -Please note that emacs-terminal is a temporary package and it will be -removed when another terminal becomes capable of handling Malayalam. - - %package devel Summary: Development header files for Emacs @@ -431,11 +469,37 @@ cat > macros.emacs << EOF %%_emacs_version %{version} %%_emacs_ev %{?epoch:%{epoch}:}%{version} %%_emacs_evr %{?epoch:%{epoch}:}%{version}-%{release} +%%_emacs_archsitelispdir %%{_libdir}/emacs/site-lisp %%_emacs_sitelispdir %{site_lisp} %%_emacs_sitestartdir %{site_start_d} %%_emacs_bytecompile(W) /usr/bin/emacs -batch --no-init-file --no-site-file --eval '(push nil load-path)' %%{-W:--eval '(setq byte-compile-error-on-warn t)' }-f batch-byte-compile %%* EOF +cat > 00-dynamic-module-dir.el << 'EOF' +;;; 00-dynamic-module-dir.el --- Add arch-specifc dir to load-path -*- lexical-binding: t -*- + +;;; Commentary: +;; +;; This directory is for installing Emacs dynamic modules into. See +;; also RPM macro %%_emacs_archsitelispdir. + +(add-to-list 'load-path "%{_libdir}/emacs/site-lisp") + +;;; 00-dynamic-module-dir.el ends here +EOF + +cat > 10-source-directory.el << 'EOF' +;;; 10-source-directory.el --- Set source-directory -*- lexical-binding: t -*- + +;;; Commentary: +;; +;; This solves rhbz#474958; Function `update-directory-autoloads' now +;; finally works. + +(setq source-directory "%{_datadir}/emacs/%{version}/") + +;;; 10-source-directory.el ends here +EOF %install %if %{with nw} @@ -490,24 +554,18 @@ ln -s emacs-%{version}-nw %{buildroot}%{_bindir}/emacs-nox # Make sure movemail isn't setgid chmod 755 %{buildroot}%{emacs_libexecdir}/movemail -mkdir -p %{buildroot}%{site_lisp} +mkdir -p %{buildroot}%{site_lisp} %{buildroot}%{site_start_d} install -p -m 0644 %SOURCE5 %{buildroot}%{site_lisp}/site-start.el install -p -m 0644 %SOURCE6 %{buildroot}%{site_lisp} +install -p -m 0644 00-dynamic-module-dir.el %{buildroot}%{site_start_d}/ +install -p -m 0644 10-source-directory.el %{buildroot}%{site_start_d}/ -# This solves bz#474958, "update-directory-autoloads" now finally -# works the path is different each version, so we'll generate it here -echo "(setq source-directory \"%{_datadir}/emacs/%{version}/\")" \ - >> %{buildroot}%{site_lisp}/site-start.el - -mv %{buildroot}%{_bindir}/{etags,etags.emacs} mv %{buildroot}%{_mandir}/man1/{ctags.1.gz,gctags.1.gz} -mv %{buildroot}%{_mandir}/man1/{etags.1.gz,etags.emacs.1.gz} mv %{buildroot}%{_bindir}/{ctags,gctags} + # BZ 927996 mv %{buildroot}%{_infodir}/{info.info.gz,info.gz} -mkdir -p %{buildroot}%{site_lisp}/site-start.d - # Default initialization file mkdir -p %{buildroot}%{_sysconfdir}/skel install -p -m 0644 %SOURCE4 %{buildroot}%{_sysconfdir}/skel/.emacs @@ -516,20 +574,18 @@ install -p -m 0644 %SOURCE4 %{buildroot}%{_sysconfdir}/skel/.emacs mkdir -p %{buildroot}/%{pkgconfig} install -p -m 0644 emacs.pc %{buildroot}/%{pkgconfig} -# Install rpm macro definition file -mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d -install -p -m 0644 macros.emacs %{buildroot}%{_rpmconfigdir}/macros.d/ - -# Installing emacs-terminal binary -install -p -m 755 %SOURCE8 %{buildroot}%{_bindir}/emacs-terminal +# Install rpm macros +mkdir -p \ + %{buildroot}%{_fileattrsdir} \ + %{buildroot}%{_rpmconfigdir} \ + %{buildroot}%{_rpmmacrodir} +install -p -m 0644 %SOURCE10 %{buildroot}%{_fileattrsdir} +install -p -m 0755 %SOURCE11 %{buildroot}%{_rpmconfigdir} +install -p -m 0644 macros.emacs %{buildroot}%{_rpmmacrodir} # After everything is installed, remove info dir rm -f %{buildroot}%{_infodir}/dir -# Install desktop files -desktop-file-install --dir=%{buildroot}%{_datadir}/applications \ - %SOURCE7 - # Install a wrapper to avoid running the Wayland-only build on X11 install -p -m 0755 %SOURCE9 %{buildroot}%{_bindir}/emacs-desktop @@ -638,12 +694,14 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/*.metainfo.xm desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop -%preun +%preun pgtk if [ $1 = 0 ]; then + /usr/sbin/alternatives --remove emacs %{_bindir}/emacs-desktop || : /usr/sbin/alternatives --remove emacs %{_bindir}/emacs-pgtk || : fi -%posttrans +%posttrans pgtk +/usr/sbin/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-desktop 85 || : /usr/sbin/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-pgtk 80 || : %if %{with lucid} @@ -692,17 +750,14 @@ fi %endif %preun common -if [ $1 = 0 ]; then - /usr/sbin/alternatives --remove emacs.etags %{_bindir}/etags.emacs || : -fi - -%posttrans common -/usr/sbin/alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \ - --slave %{_mandir}/man1/etags.1.gz emacs.etags.man %{_mandir}/man1/etags.emacs.1.gz || : +/usr/sbin/alternatives --remove emacs.etags %{_bindir}/etags.emacs || : -%files -f pgtk-filelist -f pgtk-dirlist +%files + +%files pgtk -f pgtk-filelist -f pgtk-dirlist %ghost %{_bindir}/emacs +%{_bindir}/emacs-desktop %{_bindir}/emacs-%{version}-pgtk %{_bindir}/emacs-pgtk %{_datadir}/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml @@ -737,12 +792,13 @@ fi %files common -f common-filelist -f info-filelist %config(noreplace) %{_sysconfdir}/skel/.emacs +%{_fileattrsdir}/emacs_lisp.attr +%{_rpmconfigdir}/emacs_lisp.rec %{_rpmconfigdir}/macros.d/macros.emacs %license build-pgtk/etc/COPYING %doc build-pgtk/doc/NEWS build-pgtk/BUGS build-pgtk/README %{_bindir}/ebrowse -%{_bindir}/emacs-desktop -%{_bindir}/etags.emacs +%{_bindir}/etags %{_bindir}/gctags %{_datadir}/applications/emacs.desktop %{_datadir}/applications/emacs-mail.desktop @@ -753,12 +809,11 @@ fi %{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg %{_mandir}/man1/ebrowse.1* %{_mandir}/man1/emacs.1* -%{_mandir}/man1/etags.emacs.1* +%{_mandir}/man1/etags.1* %{_mandir}/man1/gctags.1* %dir %{_datadir}/emacs/%{version} %{_datadir}/emacs/%{version}/etc %{_datadir}/emacs/%{version}/site-lisp -%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/%{version} %dir %{native_lisp} %dir %{_libexecdir}/emacs @@ -772,13 +827,9 @@ fi %attr(0644,root,root) %config %{site_lisp}/site-start.el %{pkgconfig}/emacs.pc -%files terminal -%{_bindir}/emacs-terminal -%{_datadir}/applications/emacs-terminal.desktop %files devel %{_includedir}/emacs-module.h - %changelog %autochangelog diff --git a/emacs_lisp.attr b/emacs_lisp.attr new file mode 100644 index 0000000..bf13cd7 --- /dev/null +++ b/emacs_lisp.attr @@ -0,0 +1,5 @@ +# -*- rpm-spec -*- + +%__emacs_lisp_recommends %{_rpmconfigdir}/emacs_lisp.rec +%__emacs_lisp_path %{_datadir}/emacs/.+\.el(\.gz)?$ +%__emacs_lisp_protocol multifile diff --git a/emacs_lisp.rec b/emacs_lisp.rec new file mode 100755 index 0000000..acf02d7 --- /dev/null +++ b/emacs_lisp.rec @@ -0,0 +1,49 @@ +#!/usr/bin/emacs -x + +;; This file is not part of GNU Emacs. + +;;; Commentary: + +;; Inspect Emacs Lisp files for usage of Tree-sitter parsers, and +;; generate RPM Recommends for those. + +;;; Code: + +(setq backtrace-on-error-noninteractive nil + jka-compr-verbose nil) + +(condition-case nil + (while (setq filename (read-from-minibuffer "")) + (when (string-match-p (rx ".el" (optional ".gz") line-end) + filename) + (condition-case err + (let* ((symlink-target (file-symlink-p filename)) + (source-filename + (if (and (stringp symlink-target) + (string-match-p (rx line-start "/") + symlink-target)) + (file-name-concat (getenv "RPM_BUILD_ROOT") + symlink-target) + filename))) + (with-temp-buffer + (insert-file-contents source-filename) + (setq parsers ()) + (while + (search-forward-regexp + (rx "(" (or "treesit-ensure-installed" + "treesit-parser-create" + "treesit-ready-p") + " '") + nil t) + (add-to-list 'parsers (thing-at-point 'symbol t))) + (when parsers + (princ (concat ";" filename "\n")) + (dolist (parser parsers) + (princ (concat "tree-sitter(" parser ")" "\n")))))) + + ;; Missing files are probably caused by "broken" symlinks + ;; (which may actually be fulfilled by some other package). + (file-missing (message "warning: %s" (error-message-string err)))))) + (end-of-file nil)) + +;;; emacs_lisp.rec ends here diff --git a/site-start.el b/site-start.el index efbb75b..87b3b13 100644 --- a/site-start.el +++ b/site-start.el @@ -1,9 +1,16 @@ -;;; loaded before user's ".emacs" file and default.el +;;; site-start.el --- loaded before user's ".emacs" file and default.el -*- lexical-binding: t -*- + +;;; Commentary: +;; +;; Load *.el and *.elc in /usr/share/emacs/site-lisp/site-start.d on startup + +;;; Code: -;; load *.el and *.elc in /usr/share/emacs/site-lisp/site-start.d on startup (mapc 'load (delete-dups (mapcar 'file-name-sans-extension (directory-files "/usr/share/emacs/site-lisp/site-start.d" t "\\.elc?\\'")))) + +;;; site-start.el ends here