diff options
| author | Ting-Wei Lan <lantw44@gmail.com> | 2020-11-02 22:08:50 +0800 |
|---|---|---|
| committer | Ting-Wei Lan <lantw44@gmail.com> | 2020-11-02 22:08:50 +0800 |
| commit | ffa9e9fe7a69abc47a7a1e24e051613f7f884d91 (patch) | |
| tree | b5d2e5969f4d49549b6b29b0924fa524afef5fce /guix | |
| parent | ab344e353e446e171eb576fcfb9839038d083865 (diff) | |
| download | copr-rpm-spec-ffa9e9fe7a69abc47a7a1e24e051613f7f884d91.tar copr-rpm-spec-ffa9e9fe7a69abc47a7a1e24e051613f7f884d91.tar.gz copr-rpm-spec-ffa9e9fe7a69abc47a7a1e24e051613f7f884d91.tar.bz2 copr-rpm-spec-ffa9e9fe7a69abc47a7a1e24e051613f7f884d91.tar.lz copr-rpm-spec-ffa9e9fe7a69abc47a7a1e24e051613f7f884d91.tar.xz copr-rpm-spec-ffa9e9fe7a69abc47a7a1e24e051613f7f884d91.tar.zst copr-rpm-spec-ffa9e9fe7a69abc47a7a1e24e051613f7f884d91.zip | |
guix: Fix Emacs 27 build
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/emacs-guix/emacs-guix-0.5.2-emacs-27.patch | 29 | ||||
| -rw-r--r-- | guix/emacs-guix/emacs-guix.spec | 8 |
2 files changed, 36 insertions, 1 deletions
diff --git a/guix/emacs-guix/emacs-guix-0.5.2-emacs-27.patch b/guix/emacs-guix/emacs-guix-0.5.2-emacs-27.patch new file mode 100644 index 0000000..b29e3d7 --- /dev/null +++ b/guix/emacs-guix/emacs-guix-0.5.2-emacs-27.patch @@ -0,0 +1,29 @@ +From 58a840d0671091e3064e36244790ef8839da87d6 Mon Sep 17 00:00:00 2001 +From: Oleg Pykhalov <go.wigust@gmail.com> +Date: Wed, 12 Aug 2020 17:44:17 +0300 +Subject: [PATCH] build: Fix build for Emacs 27 + +<https://gitlab.com/emacs-guix/emacs-guix/-/merge_requests/5>. + +* elisp/local.mk (AUTOLOADS): Add '-l autoload' option to make it +compatible with Emacs 27. +--- + elisp/local.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/elisp/local.mk b/elisp/local.mk +index a871aa9..3bc0a27 100644 +--- a/elisp/local.mk ++++ b/elisp/local.mk +@@ -109,7 +109,7 @@ nodist_lisp_DATA = \ + $(AUTOLOADS) + + $(AUTOLOADS): $(EL_FILES) +- $(AM_V_GEN) $(EMACS) -Q --batch --eval \ ++ $(AM_V_GEN) $(EMACS) -Q --batch -l autoload --eval \ + "(let ((backup-inhibited t) \ + (generated-autoload-file \"$(abs_builddir)/$(AUTOLOADS)\")) \ + (update-directory-autoloads \"$(abs_srcdir)/%D%\"))" +-- +GitLab + diff --git a/guix/emacs-guix/emacs-guix.spec b/guix/emacs-guix/emacs-guix.spec index a97b4c0..5c69d8d 100644 --- a/guix/emacs-guix/emacs-guix.spec +++ b/guix/emacs-guix/emacs-guix.spec @@ -3,7 +3,7 @@ Name: emacs-%{pkg} Version: 0.5.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Emacs-Guix is an Emacs interface for GNU Guix package manager License: GPLv3+ @@ -13,6 +13,7 @@ Source0: https://emacs-guix.gitlab.io/website/releases/%{name}-%{version} # Fix crash when installing a package # https://gitlab.com/emacs-guix/emacs-guix/-/issues/18 Patch0: emacs-guix-0.5.2-guix-api-change.patch +Patch1: emacs-guix-0.5.2-emacs-27.patch %global debug_package %{nil} %global guile_source_dir %{_datadir}/guile/site/2.2 @@ -20,6 +21,7 @@ Patch0: emacs-guix-0.5.2-guix-api-change.patch BuildRequires: emacs, texinfo BuildRequires: guix >= 0.13.0 +BuildRequires: autoconf, automake BuildRequires: pkgconfig(guile-2.2), guile-gcrypt BuildRequires: emacs-geiser, emacs-dash, emacs-bui, emacs-edit-indirect BuildRequires: emacs-magit, emacs-magit-popup @@ -48,6 +50,7 @@ available info about packages and to do many other things. %build +autoreconf -fiv %configure \ --with-lispdir=%{_emacs_sitelispdir}/%{pkg} \ --with-geiser-lispdir=%{_emacs_sitelispdir}/geiser \ @@ -103,6 +106,9 @@ fi %changelog +* Sun Nov 1 2020 Ting-Wei Lan <lantw44@gmail.com> - 0.5.2-3 +- Fix build with Emacs 27 + * Tue Jun 09 2020 Ting-Wei Lan <lantw44@gmail.com> - 0.5.2-2 - Add a patch from upstream to fix crash when installing a package |