Skip to content

Commit

Permalink
neovim: update to 0.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
pschmitt authored and xtkoba committed Apr 17, 2023
1 parent e12a635 commit ebeb10f
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 58 deletions.
5 changes: 2 additions & 3 deletions packages/neovim/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility
TERMUX_PKG_LICENSE="Apache-2.0, VIM License"
TERMUX_PKG_LICENSE_FILE="LICENSE.txt"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.8.3
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=0.9.0
TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=adf45ff160e1d89f519b6114732eba03485ae469beb27919b0f7a4f6b44233c1
TERMUX_PKG_SHA256=39d79107c54d2f3babcad2cd157c399241c04f6e75e98c18e8afaf2bb5e82937
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+\.\d+\.\d+"
TERMUX_PKG_DEPENDS="libiconv, libuv, luv, libmsgpack, libandroid-support, libvterm (>= 1:0.3-0), libtermkey, libluajit, libunibilium, libtreesitter"
Expand Down
33 changes: 0 additions & 33 deletions packages/neovim/neovim-0.8.1-make-clean.patch.beforehostbuild

This file was deleted.

11 changes: 0 additions & 11 deletions packages/neovim/neovim-0.8.3-msgpack-6.0.0.patch

This file was deleted.

19 changes: 11 additions & 8 deletions packages/neovim/runtime-lua-man.lua.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
--- a/runtime/lua/man.lua
+++ b/runtime/lua/man.lua
@@ -438,7 +438,7 @@
-- Force MANPAGER=cat to ensure Vim is not recursively invoked (by man-db).
-- http://comments.gmane.org/gmane.editors.vim.devel/29085
-- Set MAN_KEEP_FORMATTING so Debian man doesn't discard backspaces.
- local cmd = { 'env', 'MANPAGER=cat', 'MANWIDTH=' .. manwidth, 'MAN_KEEP_FORMATTING=1', 'man' }
+ local cmd = { 'env', 'MANPAGER=cat', 'MANWIDTH=' .. manwidth, 'MAN_KEEP_FORMATTING=1', 'mandoc' }
if localfile_arg then
cmd[#cmd + 1] = '-l'
@@ -271,9 +271,9 @@
-- inconsistently supported. Instead, call -w with a section and a name.
local cmd
if sect == '' then
- cmd = { 'man', FIND_ARG, name }
+ cmd = { 'mandoc', FIND_ARG, name }
else
- cmd = { 'man', FIND_ARG, sect, name }
+ cmd = { 'mandoc', FIND_ARG, sect, name }
end

local lines = system(cmd, silent)
5 changes: 2 additions & 3 deletions packages/neovim/src-nvim-os-stdpaths.c.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- ./src/nvim/os/stdpaths.c.orig 2022-09-30 19:19:51.775645300 +0000
+++ ./src/nvim/os/stdpaths.c 2022-09-30 19:20:49.755422449 +0000
--- ./src/nvim/os/stdpaths.c.orig 2022-07-02 15:46:11.997439729 +0530
+++ ./src/nvim/os/stdpaths.c 2022-07-02 15:47:38.817439696 +0530
@@ -51,8 +51,8 @@
[kXDGCacheHome] = "~/.cache",
[kXDGStateHome] = "~/.local/state",
Expand All @@ -10,4 +10,3 @@
+ [kXDGDataDirs] = "@TERMUX_PREFIX@/local/share/:@TERMUX_PREFIX@/share/",
#endif
};

29 changes: 29 additions & 0 deletions packages/neovim/src-nvim-po-CMakeLists.txt.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
diff --git a/src/nvim/po/CMakeLists.txt b/src/nvim/po/CMakeLists.txt
index 1db21880b..791e833e1 100644
--- a/src/nvim/po/CMakeLists.txt
+++ b/src/nvim/po/CMakeLists.txt
@@ -48,13 +48,13 @@ 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> -u NONE -i NONE -n --headless --cmd "set cpo+=+"
+ COMMAND "${PROJECT_BINARY_DIR}/../host-build/bin/nvim" -u NONE -i NONE -n --headless --cmd "set cpo+=+"
-S ${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> -u NONE -i NONE -n --headless --cmd "set cpo+=+"
+ COMMAND "${PROJECT_BINARY_DIR}/../host-build/bin/nvim" -u NONE -i NONE -n --headless --cmd "set cpo+=+"
-S ${CMAKE_CURRENT_SOURCE_DIR}/fixfilenames.vim ${NVIM_POT} ../../../runtime/optwin.vim
VERBATIM
DEPENDS ${NVIM_SOURCES} nvim nvim_runtime_deps)
@@ -83,7 +83,7 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
set(poFile ${CMAKE_CURRENT_SOURCE_DIR}/${name}.po)

add_custom_target(check-po-${name}
- COMMAND $<TARGET_FILE:nvim> -u NONE -n -e
+ COMMAND "${PROJECT_BINARY_DIR}/../host-build/bin/nvim" -u NONE -n -e
-S ${CMAKE_CURRENT_SOURCE_DIR}/check.vim
-c "if error == 0 | q | endif" -c cq ${poFile} ||
${CMAKE_COMMAND} -E echo "${name}.po failed the check."

0 comments on commit ebeb10f

Please sign in to comment.