diff --git a/neovim-0.1.7-bitop.patch b/neovim-0.1.7-bitop.patch index 5f3eda4..9f48d29 100644 --- a/neovim-0.1.7-bitop.patch +++ b/neovim-0.1.7-bitop.patch @@ -1,10 +1,24 @@ --- - CMakeLists.txt | 2 +- - src/nvim/ex_cmds.lua | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + CMakeLists.txt | 4 ++-- + runtime/lua/vim/uri.lua | 2 +- + src/nvim/ex_cmds.lua | 2 +- + src/nvim/generators/gen_ex_cmds.lua | 2 +- + test/unit/charset/vim_str2nr_spec.lua | 2 +- + test/unit/eval/typval_spec.lua | 2 +- + test/unit/os/fs_spec.lua | 2 +- + 7 files changed, 8 insertions(+), 8 deletions(-) --- a/CMakeLists.txt +++ b/CMakeLists.txt +@@ -413,7 +413,7 @@ endif() + option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF) + + if(PREFER_LUA) +- find_package(Lua 5.1 REQUIRED) ++ find_package(Lua 5.1 EXACT REQUIRED) + set(LUA_PREFERRED_INCLUDE_DIRS ${LUA_INCLUDE_DIR}) + set(LUA_PREFERRED_LIBRARIES ${LUA_LIBRARIES}) + # Passive (not REQUIRED): if LUAJIT_FOUND is not set, nvim-test is skipped. @@ -517,7 +517,7 @@ endforeach() # Find Lua interpreter @@ -14,6 +28,17 @@ if(NOT LUA_PRG) foreach(CURRENT_LUA_PRG luajit lua5.1 lua5.2 lua) unset(_CHECK_LUA_PRG CACHE) +--- a/runtime/lua/vim/uri.lua ++++ b/runtime/lua/vim/uri.lua +@@ -33,7 +33,7 @@ do + } + local sbyte, tohex = string.byte + if jit then +- tohex = require'bit'.tohex ++ tohex = require'bit32'.tohex + else + tohex = function(b) return string.format("%02x", b) end + end --- a/src/nvim/ex_cmds.lua +++ b/src/nvim/ex_cmds.lua @@ -1,4 +1,4 @@ @@ -22,3 +47,40 @@ local module = {} +--- a/src/nvim/generators/gen_ex_cmds.lua ++++ b/src/nvim/generators/gen_ex_cmds.lua +@@ -22,7 +22,7 @@ local defsfname = autodir .. '/ex_cmds_d + local enumfile = io.open(enumfname, 'w') + local defsfile = io.open(defsfname, 'w') + +-local bit = require 'bit' ++local bit = require 'bit32' + local ex_cmds = require('ex_cmds') + local defs = ex_cmds.cmds + local flags = ex_cmds.flags +--- a/test/unit/charset/vim_str2nr_spec.lua ++++ b/test/unit/charset/vim_str2nr_spec.lua +@@ -1,5 +1,5 @@ + local helpers = require("test.unit.helpers")(after_each) +-local bit = require('bit') ++local bit = require('bit32') + + local itp = helpers.gen_itp(it) + +--- a/test/unit/eval/typval_spec.lua ++++ b/test/unit/eval/typval_spec.lua +@@ -1,4 +1,4 @@ +-local bit = require('bit') ++local bit = require('bit32') + local helpers = require('test.unit.helpers')(after_each) + local eval_helpers = require('test.unit.eval.helpers') + +--- a/test/unit/os/fs_spec.lua ++++ b/test/unit/os/fs_spec.lua +@@ -1,5 +1,5 @@ + local lfs = require('lfs') +-local bit = require('bit') ++local bit = require('bit32') + + local helpers = require('test.unit.helpers')(after_each) + local itp = helpers.gen_itp(it) diff --git a/neovim-0.5.0.tar.gz b/neovim-0.5.0.tar.gz deleted file mode 100644 index 6ab14cb..0000000 --- a/neovim-0.5.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2294caa9d2011996499fbd70e4006e4ef55db75b99b6719154c09262e23764ef -size 10337976 diff --git a/neovim-0.5.1.tar.gz b/neovim-0.5.1.tar.gz new file mode 100644 index 0000000..dceb97c --- /dev/null +++ b/neovim-0.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa449795e5cc69bdd2eeed7095f20b9c086c6ecfcde0ab62ab97a9d04243ec84 +size 10349190 diff --git a/neovim.changes b/neovim.changes index 40fec65..ec6a5aa 100644 --- a/neovim.changes +++ b/neovim.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +Mon Sep 27 06:23:49 UTC 2021 - Matej Cepl + +- Temporarily switch off failing builds on aarch64 + +------------------------------------------------------------------- +Mon Sep 27 00:14:44 UTC 2021 - Matej Cepl + +- Update to 0.5.1: +BREAKING CHANGES: + - feat(lua)!: register_keystroke_callback => on_key + - feat(lsp)!: change handler signature #15504 +FEATURES: + - feat(jobstart): add parameter to close stdin +FIXES: + - #15732 fix(inccommand): ignore trailing commands only for *previewed* command + - backport: fix(windowing): positioning of relative floats + - #15495 backport: tests(lua/on_yank): assert conditions that fail correctly + - #15482 backport: fix(lua): verify buffer in highlight.on_yank + - #15454 backport: fix(window.c): win_close from other tabpage + - #15372 backport: fix(autocmd.c): fix conditions in block_autocmds, unblock_autocmds + - backport: refactor(sign): include longer sign column option + - backport: fix(sign): reset auto sign column with minimum in float win minimal style + - backport: fix(decorations): crash when :bdelete (extmark_free_all) after clear_namespace + - #15111 backport: fix(:source): copy curbuf lines to memory before sourcing + - #14809 backport: fix(:source, nvim_exec): handle Vimscript line continuations + - #15043 backport: test/memory_usage_spec: skip on MacOS + - #14984 backport: fixup(clipboard): Fix error not properly handled + - #14982 backport: fix(vim.opt): vimL map string values not trimmed + - #14962 backport: fixup(clipboard): Use case matching + - #15489 fix(man.vim): filetype=man is too eager + - build: use RelWithDebInfo build for nightlies, Release for releases + - build: update appdata.xml version in release commit + - test(treesitter): skip all parsers tests if parsers aren't installed + - Rename stdin to stdin_mode (fixes Windows build) +FIXES (LSP): + - #15523 backport: fix(lsp): resolve bufnr in buf_is_attached + - backport: fix(lsp): Ensure human readable errors are printed + - backport: fix(lsp): Ensure users get feedback on references/symbols errors or empty results + - #14954 backport: fix(lsp): correctly check for windows in lsp logger + - #15023 backport: fix(lsp): restore diagnostics extmarks that were moved to the last edit line + - #15011 backport: fix(lsp): restore diagnostics extmarks on buffer changes + - backport: fix(lsp): prevent double for cached plaintext markup + - feat(lsp): allow root_dir to be nil (#15430) (Mathias Fußenegger) + - lsp(start_client): Allow passing custom workspaceFolders to the LSP (#15132) (sim) + - fix(lsp): check if buffer is valid in changetracking (#15505) (Jose Alvarez) + - fix(lsp): avoid ipairs on non-sequential tables (#15059) (Michael Lingelbach) + - feat(lsp): improve vim.lsp.util.apply_text_edits (#15561) (hrsh7th) + - feat(lsp): improve logging (#15636) (Michael Lingelbach) + ------------------------------------------------------------------- Sat Jul 3 16:41:13 UTC 2021 - Matej Cepl diff --git a/neovim.spec b/neovim.spec index f422fc8..932b19f 100644 --- a/neovim.spec +++ b/neovim.spec @@ -36,12 +36,14 @@ %endif %endif Name: neovim -Version: 0.5.0 +Version: 0.5.1 Release: 0 Summary: Vim-fork focused on extensibility and agility License: Apache-2.0 AND Vim Group: Productivity/Text/Editors URL: https://neovim.io/ +# Temporary measure before we can figure out what to do +ExcludeArch: aarch64 Source0: https://github.com/neovim/neovim/archive/v%{version}/%{name}-%{version}.tar.gz Source1: sysinit.vim Source2: spec-template @@ -129,7 +131,12 @@ parts of Vim, without compromise, and more. %define vimplugin_dir %{_datadir}/vim/site %prep -%autosetup -p1 +%setup -q +%patch0 -p1 +# %%if %%{without luajit} +%patch1 -p1 +# %%endif +%patch2 -p1 # Remove __DATE__ and __TIME__. BUILD_TIME=$(LC_ALL=C date -ur %{_sourcedir}/%{name}.changes +'%{H}:%{M}') @@ -148,15 +155,15 @@ export CXXFLAGS="%{optflags} -fcommon" %{__cmake} .. -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DPREFER_LUA=%{?with_luajit:OFF}%{!?with_luajit:ON} \ -DLUA_PRG=%{_bindir}/%{?with_luajit:luajit}%{!?with_luajit:lua} \ - -DLIBLUV_INCLUDE_DIR=%{_includedir}/lua-%{luaver} \ + -DLIBLUV_INCLUDE_DIR=%{_includedir}/lua%{luaver} \ -DLIBLUV_LIBRARY=%{_libdir}/lua/%{luaver}/luv.so \ -DCMAKE_SKIP_RPATH=ON -DCMAKE_VERBOSE_MAKEFILE=ON \ -DUSE_BUNDLED=OFF -DLUAJIT_USE_BUNDLED=OFF \ -DCMAKE_COLOR_MAKEFILE=OFF \ -DCMAKE_C_FLAGS_RELWITHDEBINFO="$opts" \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ - -DLIBLUV_LIBRARY=%{lua_archdir}/luv.so \ - -DLIBLUV_INCLUDE_DIR:PATH=%{lua_incdir} + -DLUA_LIBRARY=%{lua_archdir}/luv.so \ + -DLUA_INCLUDE_DIR:PATH=%{lua_incdir} %make_build popd