neovim: update to 0.10.2

This commit is contained in:
tranzystorekk 2024-10-03 12:40:06 +02:00
parent bf14577cbe
commit 8d52ef0222
2 changed files with 16 additions and 15 deletions

View File

@ -30,10 +30,10 @@ index c171fab..cb29798 100644
DEPENDS
nvim_bin
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index d9cc695..81e9b50 100644
index a100e73..786a29c 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -541,7 +541,7 @@ foreach(sfile ${NVIM_SOURCES}
@@ -543,7 +543,7 @@ foreach(sfile ${NVIM_SOURCES}
add_custom_command(
OUTPUT "${gf_c_h}" "${gf_h_h}"
COMMAND ${CMAKE_C_COMPILER} ${sfile} ${PREPROC_OUTPUT} ${gen_cflags}
@ -42,7 +42,7 @@ index d9cc695..81e9b50 100644
DEPENDS ${depends})
list(APPEND NVIM_GENERATED_FOR_SOURCES "${gf_c_h}")
list(APPEND NVIM_GENERATED_FOR_HEADERS "${gf_h_h}")
@@ -551,7 +551,7 @@ foreach(sfile ${NVIM_SOURCES}
@@ -553,7 +553,7 @@ foreach(sfile ${NVIM_SOURCES}
endforeach()
add_custom_command(OUTPUT ${GENERATED_UNICODE_TABLES}
@ -51,7 +51,7 @@ index d9cc695..81e9b50 100644
${UNICODE_DIR}
${GENERATED_UNICODE_TABLES}
DEPENDS
@@ -565,7 +565,7 @@ configure_file(${GENERATOR_DIR}/nvim_version.lua.in ${NVIM_VERSION_LUA})
@@ -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}
@ -60,7 +60,7 @@ index d9cc695..81e9b50 100644
${GENERATED_API_DISPATCH}
${GENERATED_API_METADATA} ${FUNCS_METADATA}
${LUA_API_C_BINDINGS}
@@ -589,7 +589,7 @@ add_custom_command(
@@ -591,7 +591,7 @@ add_custom_command(
OUTPUT ${VIM_MODULE_FILE}
COMMAND ${CMAKE_COMMAND} -E env
"LUAC_PRG=${LUAC_PRG}"
@ -69,7 +69,7 @@ index d9cc695..81e9b50 100644
# NB: vim._init_packages and vim.inspect must be be first and second ones
# respectively, otherwise --luamod-dev won't work properly.
${LUA_INIT_PACKAGES_MODULE_SOURCE} "vim._init_packages"
@@ -624,7 +624,7 @@ add_custom_command(
@@ -626,7 +626,7 @@ add_custom_command(
${GENERATED_UI_EVENTS_REMOTE}
${UI_METADATA}
${GENERATED_UI_EVENTS_CLIENT}
@ -78,7 +78,7 @@ index d9cc695..81e9b50 100644
${CMAKE_CURRENT_LIST_DIR}/api/ui_events.in.h
${GENERATED_UI_EVENTS_CALL}
${GENERATED_UI_EVENTS_REMOTE}
@@ -656,29 +656,29 @@ list(APPEND NVIM_GENERATED_FOR_SOURCES
@@ -658,29 +658,29 @@ list(APPEND NVIM_GENERATED_FOR_SOURCES
)
add_custom_command(OUTPUT ${GENERATED_EX_CMDS_ENUM} ${GENERATED_EX_CMDS_DEFS}
@ -114,22 +114,23 @@ index d9cc695..81e9b50 100644
)
diff --git a/src/nvim/po/CMakeLists.txt b/src/nvim/po/CMakeLists.txt
index 6c20089..0e99128 100644
index 348ba28..8e9988d 100644
--- a/src/nvim/po/CMakeLists.txt
+++ b/src/nvim/po/CMakeLists.txt
@@ -53,13 +53,13 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
@@ -53,14 +53,14 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
list(SORT NVIM_RELATIVE_SOURCES)
add_custom_command(
OUTPUT ${NVIM_POT}
- COMMAND $<TARGET_FILE:nvim_bin> -u NONE -i NONE -n --headless --cmd "set cpo+=+"
+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:nvim_bin> -u NONE -i NONE -n --headless --cmd "set cpo+=+"
-S ${CMAKE_CURRENT_SOURCE_DIR}/tojavascript.vim ${NVIM_POT} ${PROJECT_SOURCE_DIR}/runtime/optwin.vim
-c "silent source ${CMAKE_CURRENT_SOURCE_DIR}/tojavascript.vim"
${NVIM_POT} ${PROJECT_SOURCE_DIR}/runtime/optwin.vim
COMMAND ${XGETTEXT_PRG} -o ${NVIM_POT} --default-domain=nvim
--add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2
-D ${CMAKE_CURRENT_SOURCE_DIR} -D ${CMAKE_CURRENT_BINARY_DIR}
${NVIM_RELATIVE_SOURCES} optwin.js
- COMMAND $<TARGET_FILE:nvim_bin> -u NONE -i NONE -n --headless --cmd "set cpo+=+"
+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:nvim_bin> -u NONE -i NONE -n --headless --cmd "set cpo+=+"
-S ${CMAKE_CURRENT_SOURCE_DIR}/fixfilenames.vim ${NVIM_POT} ../../../runtime/optwin.vim
-c "silent source ${CMAKE_CURRENT_SOURCE_DIR}/fixfilenames.vim"
${NVIM_POT} ${PROJECT_SOURCE_DIR}/runtime/optwin.vim
VERBATIM
DEPENDS ${NVIM_SOURCES} nvim_bin nvim_runtime_deps)

View File

@ -1,7 +1,7 @@
# Template file for 'neovim'
pkgname=neovim
version=0.10.1
revision=2
version=0.10.2
revision=1
# as per https://github.com/neovim/neovim/blob/master/cmake.deps/deps.txt
_treesitter_c_version=0.21.3
_treesitter_lua_version=0.1.0
@ -28,7 +28,7 @@ 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/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"
checksum="edce96e79903adfcb3c41e9a8238511946325ea9568fde177a70a614501af689
checksum="546cb2da9fffbb7e913261344bbf4cf1622721f6c5a67aa77609e976e78b8e89
75a3780df6114cd37496761c4a7c9fd900c78bee3a2707f590d78c0ca3a24368
230cfcbfa74ed1f7b8149e9a1f34c2efc4c589a71fe0f5dc8560622f8020d722
9f856f8b4a10ab43348550fa2d3cb2846ae3d8e60f45887200549c051c66f9d5