The ‘patch-compilation-driver’ phase pulls in libgccjit even though it has
been deliberately removed from emacs-minimal.
* gnu/packages/emacs.scm (emacs)[#:phases]: Delete ‘patch-compilation-driver’.
* gnu/packages/patches/emacs-native-comp-driver-options.patch: New file.
* gnu/local.mk: Register it here.
* gnu/packages/emacs.scm (emacs-next): Update to 29.0.50-2.4aeb80c.
This partly reverts dbcba75c0e. In that commit,
emacs-minimal gained a few inputs that weren't actually used as native
compilation is disabled.
Discovered by djeis in IRC, see also
<http://logs.guix.gnu.org/guix/2022-10-02.log#170047>.
* gnu/packages/emacs.scm (emacs-minimal)[inputs]: Remove ld-wrapper, binutils,
glibc, libgccjit, and zlib.
[arguments]<#:phases>: Delete ‘set-libgccjit-path’.
Recent version of emacs 29 with pgtk flag has a problem with handling super
key modifier, due to gtk bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4913
This commit workarounds it.
* gnu/packages/patches/emacs-pgtk-super-key-fix.patch: New file.
* gnu/packages/emacs.scm (emacs-next-pgtk): Use it here.
* gnu/local.mk (dist_patch_DATA): Register it here.
Conflicts resolved in:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/sdl.scm
pango-next, vala-next and librsvg-bootstrap were removed in the process.
librsvg is already a staging-level package, and the next version will no
longer bundle its dependencies, so we might as well drop it early.
* gnu/packages/gnome.scm (librsvg-bootstrap): Remove variable.
* gnu/packages/bittorrent.scm (deluge)[native-inputs]: Replace
LIBRSVG-BOOTSTRAP with LIBRSVG.
* gnu/packages/emacs.scm (emacs)[inputs]: Likewise.
* gnu/packages/gtk.scm (gtk+-2)[propagated-inputs]: Likewise.
* gnu/packages/gtk.scm (gtk+)[propagated-inputs]: Likewise.
This variable was moved from tramp-sh.el to tramp.el, causing the substitute*
snippet which patches it to silently fail.
See also <https://issues.guix.gnu.org/55443>.
* gnu/packages/emacs.scm (emacs)[source]<snippet>: Patch tramp.el rather than tramp-sh.el.
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
The currently used commit breaks magit, so update to a newer one.
* gnu/packages/emacs.scm (emacs-next): Update to 29.0.50-1.0a5477b.
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
* gnu/packages/emacs.scm (emacs-minimal)[inputs, native-inputs]: Reduce to a
single line.
[#:configure-flags]: Use G-Expression rather than double quoting.
The search for guix-emacs.el has already been inlined into a phase shared
by all emacs variants.
* gnu/packages/emacs.scm (emacs-minimal)[inputs]: Remove "emacs/guix-emacs.el".
This is a follow-up to 5f315e1d5f.
The addition of autoconf wasn't reflected in emacs-minimal, causing builds
to break. Also drop labels while we're at it.
* gnu/packages/emacs.scm (emacs-minimal)[inputs]: Drop labels.
[native-inputs]: Drop labels. Add autoconf.
This is a follow-up to commit 64557bc695.
Inputs lacking from emacs proper may not be present in emacs-minimal,
thus throwing an error on lookup. This error is already anticipated in
the handling code.
* gnu/packages/emacs.scm (emacs)[patch-program-file-names]: Wrap
search-input-file in false-if-exception.
This is a follow-up to commit 64557bc695.
The use of G-Expressions in emacs' arguments wasn't reflected in
emacs-minimal, causing builds to fail as reported in
<https://issues.guix.gnu.org/issue/55415>.
* gnu/packages/emacs.scm (emacs-minimal)[arguments]: Convert to list of
G-Expessions.
* gnu/packages/emacs.scm (emacs)[source]<snippet>: Drop trailing ‘#t’.
[arguments]: Convert to list of G-Expressions.
Use ‘search-input-file’ where possible.
Inline references to auxiliary files.
Drop trailing ‘#t’s.
[inputs, native-inputs]: Drop labels.
* gnu/packages/aux-files/emacs/guix-emacs.el
(guix-emacs--non-core-load-path): New procedure.
(guix-emacs-autoload-packages): Use it here.
(guix-emacs-load-package-descriptors): New procedure.
* gnu/packages/emacs.scm (emacs)[install-site-start]: Install advice to run
‘guix-emacs-load-package-descriptors’.
* gnu/packages/emacs.scm (emacs)[patch-program-file-names]: Add patches for
the programs “gs”, “dvipdf”, “ps2pdf” and “pdftotext”.
[inputs]: Add ghostscript and poppler.
* gnu/packages/emacs.scm (emacs)[#:phases]<patch-program-file-names>: Expand
calls to “tramp-compat-process-running-p” so that Guix wrappers are also
matched.
* gnu/packages/emacs.scm (emacs-xwidgets, emacs-next-pgtk)[inputs]:
Replace webkitgtk with webkitgtk-with-libsoup2.
* gnu/packages/webkit.scm (webkitgtk-with-libsoup2): Add further
information about where this package is used and upstream tracker for
libsoup3.
* gnu/packages/emacs.scm (emacs) [restore-emacs-pdmp]: Use lax regular
expressions to match files by the “.pdmp” file ending only. Adjust comment
accordingly.
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
