The package rpms/neovim.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/neovim.git/commit/?id=985faae2ea6....
Change:
+%ifarch %{arm} %{ix86} x86_64 %{mips}
Thanks.
Full change:
============
commit d5678c2da3afb04add85d957a5ecab9310ce399d
Author: Andreas Schneider <asn(a)cryptomilk.org>
Date: Fri Apr 15 15:11:48 2022 +0200
Update to version 0.7.0
diff --git a/.gitignore b/.gitignore
index 581a14b..908737a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
/neovim-0.5.1.tar.gz
/neovim-0.6.0.tar.gz
/neovim-0.6.1.tar.gz
+/neovim-0.7.0.tar.gz
diff --git a/neovim-libvterm-vterm_output_set_callback.patch
b/neovim-libvterm-vterm_output_set_callback.patch
deleted file mode 100644
index ccbdcf8..0000000
--- a/neovim-libvterm-vterm_output_set_callback.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 7813b48645bf2af11c2d18f4e4154a74d4dad662 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn(a)cryptomilk.org>
-Date: Tue, 8 Feb 2022 10:50:17 +0100
-Subject: [PATCH] feat(term): use vterm_output_set_callback()
-
----
- src/nvim/channel.c | 1 -
- src/nvim/terminal.c | 20 ++++++--------------
- 2 files changed, 6 insertions(+), 15 deletions(-)
-
-Index: neovim-0.6.1/src/nvim/channel.c
-===================================================================
---- neovim-0.6.1.orig/src/nvim/channel.c 2022-02-09 21:04:03.103478757 +0100
-+++ neovim-0.6.1/src/nvim/channel.c 2022-02-09 21:05:54.198482470 +0100
-@@ -613,7 +613,6 @@ static void on_channel_output(Stream *st
- } else {
- if (chan->term) {
- terminal_receive(chan->term, ptr, count);
-- terminal_flush_output(chan->term);
- }
-
- rbuffer_consumed(buf, count);
-Index: neovim-0.6.1/src/nvim/terminal.c
-===================================================================
---- neovim-0.6.1.orig/src/nvim/terminal.c 2021-12-31 18:02:21.000000000 +0100
-+++ neovim-0.6.1/src/nvim/terminal.c 2022-02-09 21:06:25.507483517 +0100
-@@ -173,6 +173,11 @@ void terminal_teardown(void)
- pmap_init(ptr_t, &invalidated_terminals);
- }
-
-+static void term_output_callback(const char *s, size_t len, void *user_data)
-+{
-+ terminal_send((Terminal *)user_data, (char *)s, len);
-+}
-+
- // public API {{{
-
- Terminal *terminal_open(buf_T *buf, TerminalOptions opts)
-@@ -196,6 +201,7 @@ Terminal *terminal_open(buf_T *buf, Term
- vterm_screen_set_callbacks(rv->vts, &vterm_screen_callbacks, rv);
- vterm_screen_set_damage_merge(rv->vts, VTERM_DAMAGE_SCROLL);
- vterm_screen_reset(rv->vts, 1);
-+ vterm_output_set_callback(rv->vt, term_output_callback, rv);
- // force a initial refresh of the screen to ensure the buffer will always
- // have as many lines as screen rows when refresh_scrollback is called
- rv->invalid_start = 0;
-@@ -633,7 +639,6 @@ void terminal_paste(long count, char_u *
- return;
- }
- vterm_keyboard_start_paste(curbuf->terminal->vt);
-- terminal_flush_output(curbuf->terminal);
- size_t buff_len = STRLEN(y_array[0]);
- char_u *buff = xmalloc(buff_len);
- for (int i = 0; i < count; i++) { // -V756
-@@ -664,14 +669,6 @@ void terminal_paste(long count, char_u *
- }
- xfree(buff);
- vterm_keyboard_end_paste(curbuf->terminal->vt);
-- terminal_flush_output(curbuf->terminal);
--}
--
--void terminal_flush_output(Terminal *term)
--{
-- size_t len = vterm_output_read(term->vt, term->textbuf,
-- sizeof(term->textbuf));
-- terminal_send(term, term->textbuf, len);
- }
-
- void terminal_send_key(Terminal *term, int c)
-@@ -690,8 +687,6 @@ void terminal_send_key(Terminal *term, i
- } else {
- vterm_keyboard_unichar(term->vt, (uint32_t)c, mod);
- }
--
-- terminal_flush_output(term);
- }
-
- void terminal_receive(Terminal *term, char *data, size_t len)
-@@ -1268,9 +1263,6 @@ static bool send_mouse_event(Terminal *t
- }
-
- mouse_action(term, button, row, col - offset, drag, 0);
-- size_t len = vterm_output_read(term->vt, term->textbuf,
-- sizeof(term->textbuf));
-- terminal_send(term, term->textbuf, len);
- return false;
- }
-
diff --git a/neovim.spec b/neovim.spec
index 0df8c8f..99ec0b9 100644
--- a/neovim.spec
+++ b/neovim.spec
@@ -38,8 +38,8 @@
%endif
Name: neovim
-Version: 0.6.1
-Release: 4%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
License: ASL 2.0
Summary: Vim-fork focused on extensibility and agility
@@ -49,8 +49,7 @@ Source0:
https://github.com/neovim/neovim/archive/v%{version}/%{name}-%{v
Source1: sysinit.vim
Source2: spec-template
-Patch0: neovim-libvterm-vterm_output_set_callback.patch
-Patch1: neovim-libvterm-0-2-support.patch
+Patch0: neovim-libvterm-0-2-support.patch
Patch1000: neovim-lua-bit32.patch
Patch1001: neovim-cmake-lua-5.1.patch
@@ -107,7 +106,6 @@ parts of Vim, without compromise, and more.
%setup -q
%patch0 -p1
-%patch1 -p1
%if %{without luajit}
%patch1000 -p1
@@ -145,7 +143,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%find_lang nvim
%files -f nvim.lang
-%license LICENSE
+%license LICENSE.txt
%doc BACKERS.md CONTRIBUTING.md README.md
%{_bindir}/nvim
@@ -162,6 +160,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/bugreport.vim
%{_datadir}/nvim/runtime/delmenu.vim
%{_datadir}/nvim/runtime/filetype.vim
+%{_datadir}/nvim/runtime/filetype.lua
%{_datadir}/nvim/runtime/ftoff.vim
%{_datadir}/nvim/runtime/ftplugin.vim
%{_datadir}/nvim/runtime/ftplugof.vim
@@ -185,6 +184,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/autoload/contextcomplete.vim
%{_datadir}/nvim/runtime/autoload/csscomplete.vim
%{_datadir}/nvim/runtime/autoload/decada.vim
+%{_datadir}/nvim/runtime/autoload/freebasic.vim
%{_datadir}/nvim/runtime/autoload/gnat.vim
%{_datadir}/nvim/runtime/autoload/gzip.vim
%{_datadir}/nvim/runtime/autoload/haskellcomplete.vim
@@ -226,7 +226,6 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/autoload/provider/clipboard.vim
%{_datadir}/nvim/runtime/autoload/provider/node.vim
%{_datadir}/nvim/runtime/autoload/provider/perl.vim
-%{_datadir}/nvim/runtime/autoload/provider/python.vim
%{_datadir}/nvim/runtime/autoload/provider/python3.vim
%{_datadir}/nvim/runtime/autoload/provider/pythonx.vim
%{_datadir}/nvim/runtime/autoload/provider/ruby.vim
@@ -373,6 +372,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/doc/api.txt
%{_datadir}/nvim/runtime/doc/arabic.txt
%{_datadir}/nvim/runtime/doc/autocmd.txt
+%{_datadir}/nvim/runtime/doc/builtin.txt
%{_datadir}/nvim/runtime/doc/change.txt
%{_datadir}/nvim/runtime/doc/channel.txt
%{_datadir}/nvim/runtime/doc/cmdline.txt
@@ -397,7 +397,6 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/doc/help.txt
%{_datadir}/nvim/runtime/doc/helphelp.txt
%{_datadir}/nvim/runtime/doc/if_cscop.txt
-%{_datadir}/nvim/runtime/doc/if_lua.txt
%{_datadir}/nvim/runtime/doc/if_perl.txt
%{_datadir}/nvim/runtime/doc/if_pyth.txt
%{_datadir}/nvim/runtime/doc/if_ruby.txt
@@ -416,7 +415,6 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/doc/message.txt
%{_datadir}/nvim/runtime/doc/mlang.txt
%{_datadir}/nvim/runtime/doc/motion.txt
-%{_datadir}/nvim/runtime/doc/msgpack_rpc.txt
%{_datadir}/nvim/runtime/doc/nvim.txt
%{_datadir}/nvim/runtime/doc/nvim_terminal_emulator.txt
%{_datadir}/nvim/runtime/doc/options.txt
@@ -435,6 +433,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/doc/quickfix.txt
%{_datadir}/nvim/runtime/doc/quickref.txt
%{_datadir}/nvim/runtime/doc/recover.txt
+%{_datadir}/nvim/runtime/doc/remote.txt
%{_datadir}/nvim/runtime/doc/remote_plugin.txt
%{_datadir}/nvim/runtime/doc/repeat.txt
%{_datadir}/nvim/runtime/doc/rileft.txt
@@ -565,7 +564,6 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/ftplugin/fstab.vim
%{_datadir}/nvim/runtime/ftplugin/fvwm.vim
%{_datadir}/nvim/runtime/ftplugin/gdb.vim
-%{_datadir}/nvim/runtime/ftplugin/git.vim
%{_datadir}/nvim/runtime/ftplugin/gitcommit.vim
%{_datadir}/nvim/runtime/ftplugin/gitconfig.vim
%{_datadir}/nvim/runtime/ftplugin/gitrebase.vim
@@ -586,6 +584,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/ftplugin/hostsaccess.vim
%{_datadir}/nvim/runtime/ftplugin/html.vim
%{_datadir}/nvim/runtime/ftplugin/htmldjango.vim
+%{_datadir}/nvim/runtime/ftplugin/i3config.vim
%{_datadir}/nvim/runtime/ftplugin/indent.vim
%{_datadir}/nvim/runtime/ftplugin/initex.vim
%{_datadir}/nvim/runtime/ftplugin/ishd.vim
@@ -665,6 +664,8 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/ftplugin/ps1xml.vim
%{_datadir}/nvim/runtime/ftplugin/pyrex.vim
%{_datadir}/nvim/runtime/ftplugin/python.vim
+%{_datadir}/nvim/runtime/ftplugin/qb64.vim
+%{_datadir}/nvim/runtime/ftplugin/query.lua
%{_datadir}/nvim/runtime/ftplugin/qf.vim
%{_datadir}/nvim/runtime/ftplugin/quake.vim
%{_datadir}/nvim/runtime/ftplugin/r.vim
@@ -701,6 +702,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/ftplugin/slpconf.vim
%{_datadir}/nvim/runtime/ftplugin/slpreg.vim
%{_datadir}/nvim/runtime/ftplugin/slpspi.vim
+%{_datadir}/nvim/runtime/ftplugin/solution.vim
%{_datadir}/nvim/runtime/ftplugin/spec.vim
%{_datadir}/nvim/runtime/ftplugin/sql.vim
%{_datadir}/nvim/runtime/ftplugin/sshconfig.vim
@@ -753,6 +755,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/indent/ant.vim
%{_datadir}/nvim/runtime/indent/automake.vim
%{_datadir}/nvim/runtime/indent/awk.vim
+%{_datadir}/nvim/runtime/indent/basic.vim
%{_datadir}/nvim/runtime/indent/bib.vim
%{_datadir}/nvim/runtime/indent/bst.vim
%{_datadir}/nvim/runtime/indent/bzl.vim
@@ -786,6 +789,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/indent/falcon.vim
%{_datadir}/nvim/runtime/indent/fortran.vim
%{_datadir}/nvim/runtime/indent/framescript.vim
+%{_datadir}/nvim/runtime/indent/freebasic.vim
%{_datadir}/nvim/runtime/indent/gitconfig.vim
%{_datadir}/nvim/runtime/indent/gitolite.vim
%{_datadir}/nvim/runtime/indent/go.vim
@@ -830,6 +834,8 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/indent/prolog.vim
%{_datadir}/nvim/runtime/indent/pyrex.vim
%{_datadir}/nvim/runtime/indent/python.vim
+%{_datadir}/nvim/runtime/indent/qb64.vim
+%{_datadir}/nvim/runtime/indent/query.lua
%{_datadir}/nvim/runtime/indent/r.vim
%{_datadir}/nvim/runtime/indent/raml.vim
%{_datadir}/nvim/runtime/indent/readline.vim
@@ -977,11 +983,15 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%dir %{_datadir}/nvim/runtime/lua/vim
%{_datadir}/nvim/runtime/lua/vim/F.lua
+%{_datadir}/nvim/runtime/lua/vim/_editor.lua
+%{_datadir}/nvim/runtime/lua/vim/_init_packages.lua
%{_datadir}/nvim/runtime/lua/vim/_meta.lua
%{_datadir}/nvim/runtime/lua/vim/compat.lua
%{_datadir}/nvim/runtime/lua/vim/diagnostic.lua
+%{_datadir}/nvim/runtime/lua/vim/filetype.lua
%{_datadir}/nvim/runtime/lua/vim/highlight.lua
%{_datadir}/nvim/runtime/lua/vim/inspect.lua
+%{_datadir}/nvim/runtime/lua/vim/keymap.lua
%{_datadir}/nvim/runtime/lua/vim/lsp.lua
%{_datadir}/nvim/runtime/lua/vim/shared.lua
%{_datadir}/nvim/runtime/lua/vim/treesitter.lua
@@ -1112,6 +1122,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/print/prolog.ps
%dir %{_datadir}/nvim/runtime/spell
+%{_datadir}/nvim/runtime/spell/cleanadd.vim
%{_datadir}/nvim/runtime/spell/en.utf-8.spl
%dir %{_datadir}/nvim/runtime/syntax
@@ -1239,6 +1250,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/syntax/debsources.vim
%{_datadir}/nvim/runtime/syntax/def.vim
%{_datadir}/nvim/runtime/syntax/denyhosts.vim
+%{_datadir}/nvim/runtime/syntax/dep3patch.vim
%{_datadir}/nvim/runtime/syntax/desc.vim
%{_datadir}/nvim/runtime/syntax/desktop.vim
%{_datadir}/nvim/runtime/syntax/dictconf.vim
@@ -1354,6 +1366,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/syntax/htmldjango.vim
%{_datadir}/nvim/runtime/syntax/htmlm4.vim
%{_datadir}/nvim/runtime/syntax/htmlos.vim
+%{_datadir}/nvim/runtime/syntax/i3config.vim
%{_datadir}/nvim/runtime/syntax/ia64.vim
%{_datadir}/nvim/runtime/syntax/ibasic.vim
%{_datadir}/nvim/runtime/syntax/icemenu.vim
@@ -1541,6 +1554,8 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/syntax/purifylog.vim
%{_datadir}/nvim/runtime/syntax/pyrex.vim
%{_datadir}/nvim/runtime/syntax/python.vim
+%{_datadir}/nvim/runtime/syntax/qb64.vim
+%{_datadir}/nvim/runtime/syntax/query.lua
%{_datadir}/nvim/runtime/syntax/qf.vim
%{_datadir}/nvim/runtime/syntax/quake.vim
%{_datadir}/nvim/runtime/syntax/r.vim
@@ -1643,6 +1658,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/syntax/sqloracle.vim
%{_datadir}/nvim/runtime/syntax/sqr.vim
%{_datadir}/nvim/runtime/syntax/squid.vim
+%{_datadir}/nvim/runtime/syntax/squirrel.vim
%{_datadir}/nvim/runtime/syntax/srec.vim
%{_datadir}/nvim/runtime/syntax/sshconfig.vim
%{_datadir}/nvim/runtime/syntax/sshdconfig.vim
@@ -1778,6 +1794,9 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json
%changelog
+* Fri Apr 15 2022 Andreas Schneider <asn(a)redhat.com> - 0.7.0-1
+- Update to version 0.7.0
+
* Thu Mar 17 2022 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 0.6.1-4
- Support building on EPEL 8
diff --git a/sources b/sources
index 9c2c738..6649da0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (neovim-0.6.1.tar.gz) =
399489f6aaabec2a89b695b22dcd860149acaad723372cced0b4d2cdae464e2db5758372b9123cd0d2a683e0ea42b871935eb85e550cecce620d896691cfda53
+SHA512 (neovim-0.7.0.tar.gz) =
3597c54fb925a4d607bca9ba0fdb37df90ecb816da99f52baf46cc2ec79727a55048ba1d8d22c8e7d61f0e8e35546326b1d0d15c0a91de8bf5bc529c45fb1ce0
commit 985faae2ea652c581e22785d95c441284fe913da
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Thu Mar 10 15:32:37 2022 -0800
Force out-of-source build on EPEL 8 (neovim requires it, but it's not
the default with EPEL 8's %%cmake)
Disable luajit on EL8 aarch64
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/neovim.spec b/neovim.spec
index a493865..0df8c8f 100644
--- a/neovim.spec
+++ b/neovim.spec
@@ -1,8 +1,24 @@
+%if 0%{?el8}
+# see
https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds
+# EPEL 8's %%cmake defaults to in-source build, which neovim does not support
+%undefine __cmake_in_source_build
+%endif
+
%bcond_with jemalloc
-%ifarch %{arm} %{ix86} x86_64 %{mips} aarch64
-%bcond_without luajit
+%ifarch %{arm} %{ix86} x86_64 %{mips}
+ %bcond_without luajit
%else
-%bcond_with luajit
+ %ifarch aarch64
+ %if 0%{?el8}
+ # luajit codepath buggy on el8 aarch64
+ #
https://bugzilla.redhat.com/show_bug.cgi?id=2065340
+ %bcond_with luajit
+ %else
+ %bcond_without luajit
+ %endif
+ %else
+ %bcond_with luajit
+ %endif
%endif
%global luv_min_ver 1.42.0
@@ -23,7 +39,7 @@
Name: neovim
Version: 0.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: ASL 2.0
Summary: Vim-fork focused on extensibility and agility
@@ -1762,6 +1778,9 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name
"*.awk" \) \
%{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json
%changelog
+* Thu Mar 17 2022 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 0.6.1-4
+- Support building on EPEL 8
+
* Wed Feb 09 2022 Andreas Schneider <asn(a)redhat.com> - 0.6.1-3
- Fix libvterm 0.2 support