neovim: update to 0.11.0
This commit is contained in:
parent
1cd9cd0cb0
commit
fbd78888be
4 changed files with 45 additions and 130 deletions
|
@ -1,28 +0,0 @@
|
||||||
Void uses the "None" build type to apply our chosen compile settings.
|
|
||||||
|
|
||||||
diff --git a/cmake/Util.cmake b/cmake/Util.cmake
|
|
||||||
index f09de78..f48f2d0 100644
|
|
||||||
--- a/cmake/Util.cmake
|
|
||||||
+++ b/cmake/Util.cmake
|
|
||||||
@@ -193,7 +193,7 @@ endfunction()
|
|
||||||
# Passing CMAKE_BUILD_TYPE for multi-config generators will not only not be
|
|
||||||
# used, but also generate a warning for the user.
|
|
||||||
function(set_default_buildtype BUILD_TYPE)
|
|
||||||
- set(allowableBuildTypes Debug Release MinSizeRel RelWithDebInfo)
|
|
||||||
+ set(allowableBuildTypes Debug Release MinSizeRel RelWithDebInfo None)
|
|
||||||
if(NOT BUILD_TYPE IN_LIST allowableBuildTypes)
|
|
||||||
message(FATAL_ERROR "Invalid build type: ${BUILD_TYPE}")
|
|
||||||
endif()
|
|
||||||
diff --git a/runtime/lua/nvim/health.lua b/runtime/lua/nvim/health.lua
|
|
||||||
index 5bc0319..40a72c1 100644
|
|
||||||
--- a/runtime/lua/nvim/health.lua
|
|
||||||
+++ b/runtime/lua/nvim/health.lua
|
|
||||||
@@ -153,7 +153,7 @@ local function check_performance()
|
|
||||||
local buildtype = vim.fn.matchstr(vim.fn.execute('version'), [[\v\cbuild type:?\s*[^\n\r\t ]+]])
|
|
||||||
if buildtype == '' then
|
|
||||||
health.error('failed to get build type from :version')
|
|
||||||
- elseif vim.regex([[\v(MinSizeRel|Release|RelWithDebInfo)]]):match_str(buildtype) then
|
|
||||||
+ elseif vim.regex([[\v(MinSizeRel|Release|RelWithDebInfo|None)]]):match_str(buildtype) then
|
|
||||||
health.ok(buildtype)
|
|
||||||
else
|
|
||||||
health.info(buildtype)
|
|
|
@ -1,16 +1,7 @@
|
||||||
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
|
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
|
||||||
index c171fab..cb29798 100644
|
index d103b5f..66cf20e 100644
|
||||||
--- a/runtime/CMakeLists.txt
|
--- a/runtime/CMakeLists.txt
|
||||||
+++ b/runtime/CMakeLists.txt
|
+++ b/runtime/CMakeLists.txt
|
||||||
@@ -11,7 +11,7 @@ get_directory_property(LUA_GEN DIRECTORY ${PROJECT_SOURCE_DIR}/src/nvim DEFINITI
|
|
||||||
get_directory_property(LUA_GEN_DEPS DIRECTORY ${PROJECT_SOURCE_DIR}/src/nvim DEFINITION LUA_GEN_DEPS)
|
|
||||||
|
|
||||||
add_custom_command(OUTPUT ${GENERATED_SYN_VIM}
|
|
||||||
- COMMAND ${LUA_GEN} ${SYN_VIM_GENERATOR} ${GENERATED_SYN_VIM} ${FUNCS_DATA}
|
|
||||||
+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${LUA_GEN} ${SYN_VIM_GENERATOR} ${GENERATED_SYN_VIM} ${FUNCS_DATA}
|
|
||||||
DEPENDS
|
|
||||||
${LUA_GEN_DEPS}
|
|
||||||
${SYN_VIM_GENERATOR}
|
|
||||||
@@ -33,7 +33,7 @@ foreach(PACKAGE ${PACKAGES})
|
@@ -33,7 +33,7 @@ foreach(PACKAGE ${PACKAGES})
|
||||||
add_custom_command(OUTPUT "${GENERATED_PACKAGE_DIR}/${PACKNAME}/doc/tags"
|
add_custom_command(OUTPUT "${GENERATED_PACKAGE_DIR}/${PACKNAME}/doc/tags"
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_directory
|
COMMAND ${CMAKE_COMMAND} -E copy_directory
|
||||||
|
@ -30,37 +21,19 @@ index c171fab..cb29798 100644
|
||||||
DEPENDS
|
DEPENDS
|
||||||
nvim_bin
|
nvim_bin
|
||||||
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
|
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
|
||||||
index a100e73..786a29c 100644
|
index 2a60eef..961ffbd 100644
|
||||||
--- a/src/nvim/CMakeLists.txt
|
--- a/src/nvim/CMakeLists.txt
|
||||||
+++ b/src/nvim/CMakeLists.txt
|
+++ b/src/nvim/CMakeLists.txt
|
||||||
@@ -543,7 +543,7 @@ foreach(sfile ${NVIM_SOURCES}
|
@@ -515,7 +515,7 @@ add_custom_command(
|
||||||
add_custom_command(
|
"${NVIM_VERSION_DEF_H}"
|
||||||
OUTPUT "${gf_c_h}" "${gf_h_h}"
|
DEPENDS "${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef-$<CONFIG>.h")
|
||||||
COMMAND ${CMAKE_C_COMPILER} ${sfile} ${PREPROC_OUTPUT} ${gen_cflags}
|
|
||||||
- COMMAND ${LUA_GEN} "${HEADER_GENERATOR}" "${sfile}" "${gf_c_h}" "${gf_h_h}" "${gf_i}"
|
|
||||||
+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${LUA_GEN} "${HEADER_GENERATOR}" "${sfile}" "${gf_c_h}" "${gf_h_h}" "${gf_i}"
|
|
||||||
DEPENDS ${depends})
|
|
||||||
list(APPEND NVIM_GENERATED_FOR_SOURCES "${gf_c_h}")
|
|
||||||
list(APPEND NVIM_GENERATED_FOR_HEADERS "${gf_h_h}")
|
|
||||||
@@ -553,7 +553,7 @@ foreach(sfile ${NVIM_SOURCES}
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
add_custom_command(OUTPUT ${GENERATED_UNICODE_TABLES}
|
-set(LUA_GEN ${LUA_GEN_PRG} ${GENERATOR_PRELOAD} ${PROJECT_SOURCE_DIR} $<TARGET_FILE:nlua0> ${PROJECT_BINARY_DIR})
|
||||||
- COMMAND ${LUA_PRG} ${UNICODE_TABLES_GENERATOR}
|
+set(LUA_GEN ${CMAKE_CROSSCOMPILING_EMULATOR} ${LUA_GEN_PRG} ${GENERATOR_PRELOAD} ${PROJECT_SOURCE_DIR} $<TARGET_FILE:nlua0> ${PROJECT_BINARY_DIR})
|
||||||
+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${LUA_PRG} ${UNICODE_TABLES_GENERATOR}
|
set(LUA_GEN_DEPS ${GENERATOR_PRELOAD} $<TARGET_FILE:nlua0>)
|
||||||
${UNICODE_DIR}
|
|
||||||
${GENERATED_UNICODE_TABLES}
|
# Like LUA_GEN but includes also vim.fn, vim.api, vim.uv, etc
|
||||||
DEPENDS
|
@@ -614,7 +614,7 @@ add_custom_command(
|
||||||
@@ -567,7 +567,7 @@ configure_file(${GENERATOR_DIR}/nvim_version.lua.in ${NVIM_VERSION_LUA})
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT ${GENERATED_API_DISPATCH} ${GENERATED_API_METADATA}
|
|
||||||
${FUNCS_METADATA} ${LUA_API_C_BINDINGS} ${GENERATED_KEYSETS_DEFS}
|
|
||||||
- COMMAND ${LUA_GEN} ${API_DISPATCH_GENERATOR}
|
|
||||||
+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${LUA_GEN} ${API_DISPATCH_GENERATOR}
|
|
||||||
${GENERATED_API_DISPATCH}
|
|
||||||
${GENERATED_API_METADATA} ${FUNCS_METADATA}
|
|
||||||
${LUA_API_C_BINDINGS}
|
|
||||||
@@ -591,7 +591,7 @@ add_custom_command(
|
|
||||||
OUTPUT ${VIM_MODULE_FILE}
|
OUTPUT ${VIM_MODULE_FILE}
|
||||||
COMMAND ${CMAKE_COMMAND} -E env
|
COMMAND ${CMAKE_COMMAND} -E env
|
||||||
"LUAC_PRG=${LUAC_PRG}"
|
"LUAC_PRG=${LUAC_PRG}"
|
||||||
|
@ -69,55 +42,11 @@ index a100e73..786a29c 100644
|
||||||
# NB: vim._init_packages and vim.inspect must be be first and second ones
|
# NB: vim._init_packages and vim.inspect must be be first and second ones
|
||||||
# respectively, otherwise --luamod-dev won't work properly.
|
# respectively, otherwise --luamod-dev won't work properly.
|
||||||
${LUA_INIT_PACKAGES_MODULE_SOURCE} "vim._init_packages"
|
${LUA_INIT_PACKAGES_MODULE_SOURCE} "vim._init_packages"
|
||||||
@@ -626,7 +626,7 @@ add_custom_command(
|
|
||||||
${GENERATED_UI_EVENTS_REMOTE}
|
|
||||||
${UI_METADATA}
|
|
||||||
${GENERATED_UI_EVENTS_CLIENT}
|
|
||||||
- COMMAND ${LUA_GEN} ${API_UI_EVENTS_GENERATOR}
|
|
||||||
+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${LUA_GEN} ${API_UI_EVENTS_GENERATOR}
|
|
||||||
${CMAKE_CURRENT_LIST_DIR}/api/ui_events.in.h
|
|
||||||
${GENERATED_UI_EVENTS_CALL}
|
|
||||||
${GENERATED_UI_EVENTS_REMOTE}
|
|
||||||
@@ -658,29 +658,29 @@ list(APPEND NVIM_GENERATED_FOR_SOURCES
|
|
||||||
)
|
|
||||||
|
|
||||||
add_custom_command(OUTPUT ${GENERATED_EX_CMDS_ENUM} ${GENERATED_EX_CMDS_DEFS}
|
|
||||||
- COMMAND ${LUA_GEN} ${EX_CMDS_GENERATOR} ${GENERATED_INCLUDES_DIR} ${GENERATED_DIR}
|
|
||||||
+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${LUA_GEN} ${EX_CMDS_GENERATOR} ${GENERATED_INCLUDES_DIR} ${GENERATED_DIR}
|
|
||||||
DEPENDS ${LUA_GEN_DEPS} ${EX_CMDS_GENERATOR} ${CMAKE_CURRENT_LIST_DIR}/ex_cmds.lua
|
|
||||||
)
|
|
||||||
|
|
||||||
add_custom_command(OUTPUT ${GENERATED_FUNCS} ${FUNCS_DATA}
|
|
||||||
- COMMAND ${LUA_GEN} ${FUNCS_GENERATOR} ${GENERATED_DIR} ${FUNCS_METADATA} ${FUNCS_DATA}
|
|
||||||
+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${LUA_GEN} ${FUNCS_GENERATOR} ${GENERATED_DIR} ${FUNCS_METADATA} ${FUNCS_DATA}
|
|
||||||
DEPENDS ${LUA_GEN_DEPS} ${FUNCS_GENERATOR} ${CMAKE_CURRENT_LIST_DIR}/eval.lua ${FUNCS_METADATA}
|
|
||||||
)
|
|
||||||
list(APPEND NVIM_GENERATED_FOR_SOURCES
|
|
||||||
"${GENERATED_FUNCS}")
|
|
||||||
|
|
||||||
add_custom_command(OUTPUT ${GENERATED_EVENTS_ENUM} ${GENERATED_EVENTS_NAMES_MAP}
|
|
||||||
- COMMAND ${LUA_GEN} ${EVENTS_GENERATOR} ${GENERATED_EVENTS_ENUM} ${GENERATED_EVENTS_NAMES_MAP}
|
|
||||||
+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${LUA_GEN} ${EVENTS_GENERATOR} ${GENERATED_EVENTS_ENUM} ${GENERATED_EVENTS_NAMES_MAP}
|
|
||||||
DEPENDS ${LUA_GEN_DEPS} ${EVENTS_GENERATOR} ${CMAKE_CURRENT_LIST_DIR}/auevents.lua
|
|
||||||
)
|
|
||||||
|
|
||||||
add_custom_command(OUTPUT ${GENERATED_OPTIONS}
|
|
||||||
- COMMAND ${LUA_GEN} ${OPTIONS_GENERATOR} ${GENERATED_OPTIONS}
|
|
||||||
+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${LUA_GEN} ${OPTIONS_GENERATOR} ${GENERATED_OPTIONS}
|
|
||||||
DEPENDS ${LUA_GEN_DEPS} ${OPTIONS_GENERATOR} ${CMAKE_CURRENT_LIST_DIR}/options.lua
|
|
||||||
)
|
|
||||||
|
|
||||||
add_custom_command(OUTPUT ${GENERATED_OPTIONS_ENUM} ${GENERATED_OPTIONS_MAP}
|
|
||||||
- COMMAND ${LUA_GEN} ${OPTIONS_ENUM_GENERATOR} ${GENERATED_OPTIONS_ENUM} ${GENERATED_OPTIONS_MAP}
|
|
||||||
+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${LUA_GEN} ${OPTIONS_ENUM_GENERATOR} ${GENERATED_OPTIONS_ENUM} ${GENERATED_OPTIONS_MAP}
|
|
||||||
DEPENDS ${LUA_GEN_DEPS} ${OPTIONS_ENUM_GENERATOR} ${CMAKE_CURRENT_LIST_DIR}/options.lua
|
|
||||||
)
|
|
||||||
|
|
||||||
diff --git a/src/nvim/po/CMakeLists.txt b/src/nvim/po/CMakeLists.txt
|
diff --git a/src/nvim/po/CMakeLists.txt b/src/nvim/po/CMakeLists.txt
|
||||||
index 348ba28..8e9988d 100644
|
index f0436a2..81a9433 100644
|
||||||
--- a/src/nvim/po/CMakeLists.txt
|
--- a/src/nvim/po/CMakeLists.txt
|
||||||
+++ b/src/nvim/po/CMakeLists.txt
|
+++ b/src/nvim/po/CMakeLists.txt
|
||||||
@@ -53,14 +53,14 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
|
@@ -55,14 +55,14 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
|
||||||
list(SORT NVIM_RELATIVE_SOURCES)
|
list(SORT NVIM_RELATIVE_SOURCES)
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT ${NVIM_POT}
|
OUTPUT ${NVIM_POT}
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
Void uses the "None" build type to apply our chosen compile settings.
|
||||||
|
|
||||||
|
diff --git a/runtime/lua/vim/health/health.lua b/runtime/lua/vim/health/health.lua
|
||||||
|
index dd6fe7f..25d8d81 100644
|
||||||
|
--- a/runtime/lua/vim/health/health.lua
|
||||||
|
+++ b/runtime/lua/vim/health/health.lua
|
||||||
|
@@ -157,7 +157,7 @@ local function check_performance()
|
||||||
|
local buildtype = vim.fn.matchstr(vim.fn.execute('version'), [[\v\cbuild type:?\s*[^\n\r\t ]+]])
|
||||||
|
if buildtype == '' then
|
||||||
|
health.error('failed to get build type from :version')
|
||||||
|
- elseif vim.regex([[\v(MinSizeRel|Release|RelWithDebInfo)]]):match_str(buildtype) then
|
||||||
|
+ elseif vim.regex([[\v(MinSizeRel|Release|RelWithDebInfo|None)]]):match_str(buildtype) then
|
||||||
|
health.ok(buildtype)
|
||||||
|
else
|
||||||
|
health.info(buildtype)
|
|
@ -1,20 +1,19 @@
|
||||||
# Template file for 'neovim'
|
# Template file for 'neovim'
|
||||||
pkgname=neovim
|
pkgname=neovim
|
||||||
version=0.10.4
|
version=0.11.0
|
||||||
revision=2
|
revision=1
|
||||||
# as per https://github.com/neovim/neovim/blob/master/cmake.deps/deps.txt
|
# as per https://github.com/neovim/neovim/blob/master/cmake.deps/deps.txt
|
||||||
_treesitter_c_version=0.21.3
|
_treesitter_c_version=0.23.4
|
||||||
_treesitter_lua_version=0.1.0
|
_treesitter_lua_version=0.3.0
|
||||||
_treesitter_vim_version=0.4.0
|
_treesitter_vim_version=0.5.0
|
||||||
_treesitter_vimdoc_version=3.0.0
|
_treesitter_vimdoc_version=3.0.1
|
||||||
_treesitter_query_version=0.4.0
|
_treesitter_query_version=0.5.1
|
||||||
_treesitter_markdown_version=0.2.3
|
_treesitter_markdown_version=0.4.1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
build_helper="qemu"
|
build_helper="qemu"
|
||||||
configure_args="-DCOMPILE_LUA=OFF -DPREFER_LUA=$(vopt_if luajit OFF ON)"
|
configure_args="-DCOMPILE_LUA=OFF -DENABLE_TRANSLATIONS=ON -DPREFER_LUA=$(vopt_if luajit OFF ON)"
|
||||||
hostmakedepends="gettext patchelf"
|
hostmakedepends="gettext patchelf"
|
||||||
makedepends="libuv-devel libvterm-devel msgpack-devel
|
makedepends="libuv-devel libluv-devel libutf8proc-devel tree-sitter-devel unibilium-devel
|
||||||
libluv-devel tree-sitter-devel unibilium-devel
|
|
||||||
lua51-lpeg $(vopt_if luajit LuaJIT-devel lua51-devel)"
|
lua51-lpeg $(vopt_if luajit LuaJIT-devel lua51-devel)"
|
||||||
short_desc="Fork of Vim aiming to improve user experience, plugins and GUIs"
|
short_desc="Fork of Vim aiming to improve user experience, plugins and GUIs"
|
||||||
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
|
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
|
||||||
|
@ -28,13 +27,13 @@ distfiles="https://github.com/neovim/neovim/archive/refs/tags/v${version}.tar.gz
|
||||||
https://github.com/neovim/tree-sitter-vimdoc/archive/refs/tags/v${_treesitter_vimdoc_version}.tar.gz>treesitter_vimdoc_${_treesitter_vimdoc_version}.tar.gz
|
https://github.com/neovim/tree-sitter-vimdoc/archive/refs/tags/v${_treesitter_vimdoc_version}.tar.gz>treesitter_vimdoc_${_treesitter_vimdoc_version}.tar.gz
|
||||||
https://github.com/tree-sitter-grammars/tree-sitter-query/archive/refs/tags/v${_treesitter_query_version}.tar.gz>treesitter_query_${_treesitter_query_version}.tar.gz
|
https://github.com/tree-sitter-grammars/tree-sitter-query/archive/refs/tags/v${_treesitter_query_version}.tar.gz>treesitter_query_${_treesitter_query_version}.tar.gz
|
||||||
https://github.com/tree-sitter-grammars/tree-sitter-markdown/archive/refs/tags/v${_treesitter_markdown_version}.tar.gz>treesitter_markdown_${_treesitter_markdown_version}.tar.gz"
|
https://github.com/tree-sitter-grammars/tree-sitter-markdown/archive/refs/tags/v${_treesitter_markdown_version}.tar.gz>treesitter_markdown_${_treesitter_markdown_version}.tar.gz"
|
||||||
checksum="10413265a915133f8a853dc757571334ada6e4f0aa15f4c4cc8cc48341186ca2
|
checksum="6826c4812e96995d29a98586d44fbee7c9b2045485d50d174becd6d5242b3319
|
||||||
75a3780df6114cd37496761c4a7c9fd900c78bee3a2707f590d78c0ca3a24368
|
b66c5043e26d84e5f17a059af71b157bcf202221069ed220aa1696d7d1d28a7a
|
||||||
230cfcbfa74ed1f7b8149e9a1f34c2efc4c589a71fe0f5dc8560622f8020d722
|
a34cc70abfd8d2d4b0fabf01403ea05f848e1a4bc37d8a4bfea7164657b35d31
|
||||||
9f856f8b4a10ab43348550fa2d3cb2846ae3d8e60f45887200549c051c66f9d5
|
90019d12d2da0751c027124f27f5335babf069a050457adaed53693b5e9cf10a
|
||||||
a639bf92bf57bfa1cdc90ca16af27bfaf26a9779064776dd4be34c1ef1453f6c
|
76b65e5bee9ff78eb21256619b1995aac4d80f252c19e1c710a4839481ded09e
|
||||||
d3a423ab66dc62b2969625e280116678a8a22582b5ff087795222108db2f6a6e
|
fe8c712880a529d454347cd4c58336ac2db22243bae5055bdb5844fb3ea56192
|
||||||
4909d6023643f1afc3ab219585d4035b7403f3a17849782ab803c5f73c8a31d5"
|
e0fdb2dca1eb3063940122e1475c9c2b069062a638c95939e374c5427eddee9f"
|
||||||
|
|
||||||
skip_extraction="
|
skip_extraction="
|
||||||
treesitter_c_${_treesitter_c_version}.tar.gz
|
treesitter_c_${_treesitter_c_version}.tar.gz
|
||||||
|
|
Loading…
Add table
Reference in a new issue