diff --git a/7657-run-tests-aarch64.patch b/7657-run-tests-aarch64.patch deleted file mode 100644 index eaf3829..0000000 --- a/7657-run-tests-aarch64.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 59f4bd435c6754f475dfb61bb6c881ce914b17e6 Mon Sep 17 00:00:00 2001 -From: James McCoy -Date: Wed, 29 Nov 2017 10:07:12 -0500 -Subject: [PATCH] unittest: Ignore _Float128 types in ffi - -When building with certain GCC versions, a _Float128 type is present -when setting up the ffi for unit tests. - - ./test/unit/helpers.lua:256: declaration specifier expected near '_Float128' at line 396 - /usr/bin/luajit: /usr/share/lua/5.1/busted/runner.lua:99: attempt to concatenate local 'message' (a table value) - stack traceback: - /usr/share/lua/5.1/busted/runner.lua:99: in function 'fn' - /usr/share/lua/5.1/mediator.lua:103: in function 'publish' - /usr/share/lua/5.1/busted/modules/helper_loader.lua:21: in function 'helperLoader' - /usr/share/lua/5.1/busted/runner.lua:147: in function - /usr/bin/busted:3: in main chunk - [C]: at 0x004044a0 - - CMake Error at /<>/cmake/RunTests.cmake:53 (message): - Running unit tests failed with error: 1. - -Since this is being pulled in by a dependency, not directly used by -nvim, just ignore the type. - -Closes #7423 ---- - test/unit/helpers.lua | 1 + - 1 file changed, 1 insertion(+) - ---- a/test/unit/helpers.lua -+++ b/test/unit/helpers.lua -@@ -135,6 +135,7 @@ local function filter_complex_blocks(bod - if not (string.find(line, "(^)", 1, true) ~= nil - or string.find(line, "_ISwupper", 1, true) - or string.find(line, "_Float") -+ or string.find(line, "_Float128") - or string.find(line, "msgpack_zone_push_finalizer") - or string.find(line, "msgpack_unpacker_reserve_buffer") - or string.find(line, "UUID_NULL") -- static const uuid_t UUID_NULL = {...} diff --git a/neovim-0.1.7-bitop.patch b/neovim-0.1.7-bitop.patch deleted file mode 100644 index 9f48d29..0000000 --- a/neovim-0.1.7-bitop.patch +++ /dev/null @@ -1,86 +0,0 @@ ---- - 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 - include(LuaHelpers) --set(LUA_DEPENDENCIES lpeg mpack bit) -+set(LUA_DEPENDENCIES lpeg mpack bit32) - 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 @@ --local bit = require 'bit' -+local bit = require 'bit32' - - 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.7.2.tar.gz b/neovim-0.7.2.tar.gz deleted file mode 100644 index 3cb681e..0000000 --- a/neovim-0.7.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ccab8ca02a0c292de9ea14b39f84f90b635a69282de38a6b4ccc8565bc65d096 -size 10933623 diff --git a/neovim-0.8.0.tar.gz b/neovim-0.8.0.tar.gz new file mode 100644 index 0000000..16c8fe9 --- /dev/null +++ b/neovim-0.8.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:505e3dfb71e2f73495c737c034a416911c260c0ba9fd2092c6be296655be4d18 +size 11387355 diff --git a/neovim.changes b/neovim.changes index e5da183..0ac2216 100644 --- a/neovim.changes +++ b/neovim.changes @@ -1,3 +1,143 @@ +------------------------------------------------------------------- +Mon Oct 3 06:30:59 UTC 2022 - Matej Cepl + +- Update to 0.8.0: + - Breaking changes: + - Remove 'insertmode' 'remap' and 'terse' options + - highlight: Rename attributes to match Vim (#19159) + - highlight: Error on invalid names and allow '.' and '@' + - terminal: Drop winpty, require Windows 10 #18253 + - treesitter: Use @foo.bar style highlight groups + - treesitter: Do not merge queries by default (#20105) + - Features: + - runtime: Enable filetype.lua by default (#19216) + - Add undo! + - Add "prerelease" to version dict + - Click support for 'statusline', 'winbar' #18650 + - Add preview functionality to user commands + - allow Cmdheight=0 (EXPERIMENTAL) #16251 + - Stdpath('run'), /tmp/nvim.user/ #18993 + - Add 'mousescroll' option (#12355) + - Allow :wincmd to accept a count (#19815) + - Multibuffer preview support for inccommand + - Man: Port to Lua (#19912) + - api: Ui options relevant for remote TUI + - api: Add nvim_parse_cmd And nvim_cmd + - api: Support handling stdin stream in remote ui + - api: Add group_name to nvim_get_autocmds + - api: Enable nvim_exec_autocmds to pass arbitrary data + (#18613) + - api: Support pattern array for exec_autocmds + - api: Add unsilent to command APIs + - api: Add replace_keycodes to nvim_set_keymap (#19598) + - api: Add support for :horizontal modifier + - api: Add "move" to nvim_input_mouse + - api/ui: "ui_watched" option for ui-side extmarks + - build: Add_glob_target runs only on changed files #19070 + - checkhealth: Check for slow shell #17829 + - defaults: Session data in $XDG_STATE_HOME #15583 + - defaults: Search selection by * and # in visual mode + (#18538) + - defaults: Nnoremap & :&& #19365 + - defaults: enable mouse by default (set mouse=nvi) #19290 + - diagnostic: Pass diagnostics as data to DiagnosticChanged + autocmd (#20173) + - docs: Gen_help_html.lua + - edit: Insert an unsimplified key using CTRL-SHIFT-V + - treesitter: Full support for spelling + - filetype: Convert more patterns to filetype.lua + - filetype: Remove side effects from vim.filetype.match + (#18894) + - filetype: Expand environment variables in filetype patterns + (#20145) + - fs: Add vim.fs functions: parents() dirname() basename() + dir() find() normalize() + - highlight: Implement CurSearch highlight + - highlight: Support scoped @spam.eggs.baked_beans groups + - input: Delay all simplifications + - l10n: Turkish translations #19441 + - l10n: Improve zh_CN translations (#19483) + - lsp: Remove capabilities sanitization (#17814) + - lsp: Show feedback on empty hover response (#18308) + - lsp: Options to filter and auto-apply code actions (#18221) + - lsp: Add vim.lsp.buf.format (#18193) + - lsp: Add logging level "OFF" (#18379) + - lsp: Add LspAttach and LspDetach autocommands + - lsp: Add filter to vim.lsp.get_active_clients() + - lsp: Option to reuse_win for jump actions (#18577) + - lsp: Add a start function (#18631) + - lsp: Send didChangeConfiguration after init (#18847) + - lsp: Defaults: tagfunc, omnifunc, formatexpr (#19003, + #19677) + - lsp: Allow passing custom list handler to LSP functions + that return lists (#19213) + - lsp: Provide feedback if server can't compute rename result + (#19546) + - lsp: Add range option to code_action; deprecate + range_code_action (#19551) + - lsp: Disable exit_timeout by default (#19672) + - lsp: Add tcp support + - lua: Vim.deprecate() #18320 + - lua: Vim.cmd() with kwargs acts like nvim_cmd() #18523 + - lua: Allow some vim script functions to run in fast + callbacks + - lua: Measure require in --startuptime + - lua: Allow vim.cmd to be indexed (#19238) + - lua: Print source locations of lua callbacks (#19597) + - lua: Add vim.iconv (#18286) + - lua: Vim.ui_attach to get ui events from lua (EXPERIMENTAL) + - man.vim: List command flags in "gO" outline #17558 + - mappings: Do not replace existing mapping for simplified + form + - mappings: Allow special keys and modifiers in mapping + - mapset: Support restoring "replace_keycodes" and "desc" + - mapset: Support restoring Lua callback (#20024) + - marks: Restore viewport on jump #15831 + - nvim_create_user_command: Pass structured modifiers to + commands + - pum: Pretend 'mousemoveevent' is set when showing + right-click menu + - server: Set $NVIM, unset $NVIM_LISTEN_ADDRESS #11009 + - server: Instance "name", store pipes in stdpath(state) + - term: Add support for libvterm >= 0.2 + - terminal: Implement for terminal mode + - terminal: Recognize underdouble and undercurl + - terminfo: Bump built-in terminfo entries (#18570) + - treesitter: Allow customizing language symbol name + - treesitter: Add ability to retreive a tree/node given a + range + - treesitter: Upstream node methods from nvim-treesitter + - treesitter: Include language in invalid query error + (#14053) + - treesitter: Bundle Lua parser and queries + - treesitter: Add viml parser and queries + - treesitter: Add injections + - treesitter: Add vim.treesitter.start(), enable for Lua + - treesitter: Bundle :help parser and queries + - tui: Query terminal for CSI u support (#18181) + - tui: Recognize keypad keys when using kitty keyboard + protocol + - tui: Try terminfo for [re]set_cursor_color OSC #19255 + - tui: Allow grid and host to disagree on ambiguous-width + chars (#19686) + - tui: Recognize sidescroll events (#19992) + - tui: Support 'mousemoveevent' + - ui: Add 'winbar' + - ui: Clear message history explicitly with msg_history_clear + event + - ui: Make right-click menu work properly with ext_multigrid + - ui: Allow to set the highlight namespace per window + - ui: Use msg_grid based implementation for cmdheight=0 + - ui-ext: Make 'mousemoveevent' a ui_option + - eval: Make Lua Funcref work as method and in substitute() + (#20217) + - eval: Input() support any type for "cancelreturn" in a dict + (#19357) +- Remove neovim-0.1.7-bitop.patch (bsc#1202958), we actually + don't need it (luajit has bit module) and it hurts us. +- Remove unnecessary neovim.patch +- Remove upstreamed 7657-run-tests-aarch64.patch. + ------------------------------------------------------------------- Sat Sep 3 11:24:50 UTC 2022 - Jan Engelhardt diff --git a/neovim.patch b/neovim.patch deleted file mode 100644 index e228e15..0000000 --- a/neovim.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - third-party/cmake/BuildLuarocks.cmake | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/third-party/cmake/BuildLuarocks.cmake -+++ b/third-party/cmake/BuildLuarocks.cmake -@@ -93,7 +93,9 @@ if(UNIX OR (MINGW AND CMAKE_CROSSCOMPILI - BuildLuarocks( - CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/src/luarocks/configure - --prefix=${HOSTDEPS_INSTALL_DIR} --force-config ${LUAROCKS_OPTS} -- INSTALL_COMMAND ${MAKE_PRG} -j1 bootstrap) -+ INSTALL_COMMAND ${MAKE_PRG} -j1 bootstrap -+ INSTALL_COMMAND && ${MAKE_PRG} -j1 build -+ INSTALL_COMMAND && ${MAKE_PRG} -j1 install) - elseif(MSVC OR MINGW) - - if(MINGW) diff --git a/neovim.spec b/neovim.spec index 2523546..66790b0 100644 --- a/neovim.spec +++ b/neovim.spec @@ -26,7 +26,7 @@ %define luaver 5.1 %define luaver_nopoint 51 Name: neovim -Version: 0.7.2 +Version: 0.8.0 Release: 0 Summary: Vim-fork focused on extensibility and agility License: Apache-2.0 AND Vim @@ -40,13 +40,6 @@ Source3: suse-spec-template # we need /usr/bin/luajit. Fake it. Source10: lj-busted.sh Source99: neovim-rpmlintrc -# PATCH-FIX-OPENSUSE neovim.patch mcepl@cepl.eu -Patch0: neovim.patch -# PATCH-FIX-OPENSUSE neovim-0.1.7-bitop.patch mcepl@cepl.eu build with old Lua with external bit module -Patch1: neovim-0.1.7-bitop.patch -# PATCH-FIX-UPSTREAM 7657-run-tests-aarch64.patch gh#neovim/neovim#7423 mcepl@suse.com -# fix running tests on aarch64 -Patch2: 7657-run-tests-aarch64.patch BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -60,7 +53,7 @@ BuildRequires: libnsl-devel BuildRequires: libtermkey-devel BuildRequires: libtool BuildRequires: libuv-devel -BuildRequires: libvterm-devel >= 0.1 +BuildRequires: libvterm-devel >= 0.3 BuildRequires: lua-macros BuildRequires: make BuildRequires: msgpack-c-devel @@ -71,7 +64,7 @@ BuildRequires: unibilium-devel BuildRequires: unzip BuildRequires: update-desktop-files Requires: gperf -Requires: libvterm0 >= 0.1 +Requires: libvterm0 >= 0.3 Recommends: python3-neovim Requires(post): desktop-file-utils Requires(postun):desktop-file-utils @@ -86,11 +79,9 @@ BuildRequires: lua51-devel # compat versions of libs. BuildRequires: lua51-LPeg BuildRequires: libluv-devel >= %{luv_min_ver} -BuildRequires: lua51-bit32 BuildRequires: lua51-luarocks BuildRequires: lua51-luv >= %{luv_min_ver} BuildRequires: lua51-mpack -Requires: lua51-bit32 Requires: lua51-luv >= %{luv_min_ver} %if 0%{?suse_version} < 1330 BuildRequires: hicolor-icon-theme