From 9df8d313fa329fe23f473dea36545e7b4991ef70 Mon Sep 17 00:00:00 2001 From: TomIO Date: Mon, 20 May 2024 21:19:37 +0200 Subject: [PATCH] bump(main/neovim): 0.10.0 closes #20221 also set a maintainer --- packages/neovim/build.sh | 9 ++++---- packages/neovim/cmake-FindLpeg.cmake.patch | 10 ++++++++ packages/neovim/runtime-CMakeLists.txt.patch | 23 ++++++++++--------- .../neovim/src-nvim-po-CMakeLists.txt.patch | 14 +++++------ 4 files changed, 33 insertions(+), 23 deletions(-) create mode 100644 packages/neovim/cmake-FindLpeg.cmake.patch diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh index 38f85f1c3696ce..8bf65774c5061e 100644 --- a/packages/neovim/build.sh +++ b/packages/neovim/build.sh @@ -2,14 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://neovim.io/ TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)" TERMUX_PKG_LICENSE="Apache-2.0, VIM License" TERMUX_PKG_LICENSE_FILE="LICENSE.txt" -TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.9.5" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_MAINTAINER="Joshua Kahn @TomJo2000" +TERMUX_PKG_VERSION="0.10.0" TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=fe74369fc30a32ec7a086b1013acd0eacd674e7570eb1acc520a66180c9e9719 +TERMUX_PKG_SHA256=372ea2584b0ea2a5a765844d95206bda9e4a57eaa1a2412a9a0726bab750f828 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" +TERMUX_PKG_DEPENDS="libiconv, libuv, luv, libmsgpack, libandroid-support, libvterm (>= 1:0.3-0), libluajit, libunibilium, libtreesitter, lua-lpeg" TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/neovim/cmake-FindLpeg.cmake.patch b/packages/neovim/cmake-FindLpeg.cmake.patch new file mode 100644 index 00000000000000..5bf35c94c8be97 --- /dev/null +++ b/packages/neovim/cmake-FindLpeg.cmake.patch @@ -0,0 +1,10 @@ +diff --git a/cmake/FindLpeg.cmake b/cmake/FindLpeg.cmake +index 3d0ff5929..13793f444 100644 +--- a/cmake/FindLpeg.cmake ++++ b/cmake/FindLpeg.cmake +@@ -1,4 +1,4 @@ +-find_library2(LPEG_LIBRARY NAMES lpeg_a lpeg liblpeg_a lpeg${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES lua/5.1) ++find_library2(LPEG_LIBRARY NAMES lpeg_a lpeg liblpeg_a lpeg${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES lua/5.3) + + find_package_handle_standard_args(Lpeg DEFAULT_MSG LPEG_LIBRARY) + mark_as_advanced(LPEG_LIBRARY) diff --git a/packages/neovim/runtime-CMakeLists.txt.patch b/packages/neovim/runtime-CMakeLists.txt.patch index eae593d4a0e65c..f5bdb5a13240d9 100644 --- a/packages/neovim/runtime-CMakeLists.txt.patch +++ b/packages/neovim/runtime-CMakeLists.txt.patch @@ -1,21 +1,22 @@ -diff -u -r ../neovim-0.3.2/runtime/CMakeLists.txt ./runtime/CMakeLists.txt ---- ../neovim-0.3.2/runtime/CMakeLists.txt 2018-12-31 00:06:17.000000000 +0000 -+++ ./runtime/CMakeLists.txt 2019-01-03 00:07:55.652628776 +0000 -@@ -32,7 +32,7 @@ - add_custom_target("${PACKNAME}-tags" +diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt +index c171fab9e..fb87d04c4 100644 +--- a/runtime/CMakeLists.txt ++++ b/runtime/CMakeLists.txt +@@ -33,7 +33,7 @@ foreach(PACKAGE ${PACKAGES}) + add_custom_command(OUTPUT "${GENERATED_PACKAGE_DIR}/${PACKNAME}/doc/tags" COMMAND ${CMAKE_COMMAND} -E copy_directory ${PACKAGE} ${GENERATED_PACKAGE_DIR}/${PACKNAME} -- COMMAND "${PROJECT_BINARY_DIR}/bin/nvim" +- COMMAND $ + COMMAND "${PROJECT_BINARY_DIR}/../host-build/bin/nvim" -u NONE -i NONE -e --headless -c "helptags doc" -c quit DEPENDS - nvim -@@ -71,7 +71,7 @@ - COMMAND ${CMAKE_COMMAND} -E remove doc/* + nvim_bin +@@ -65,7 +65,7 @@ add_custom_command(OUTPUT ${GENERATED_HELP_TAGS} + COMMAND ${CMAKE_COMMAND} -E remove_directory doc COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/runtime/doc doc -- COMMAND "${PROJECT_BINARY_DIR}/bin/nvim" +- COMMAND $ + COMMAND "${PROJECT_BINARY_DIR}/../host-build/bin/nvim" -u NONE -i NONE -e --headless -c "helptags ++t doc" -c quit DEPENDS - nvim + nvim_bin diff --git a/packages/neovim/src-nvim-po-CMakeLists.txt.patch b/packages/neovim/src-nvim-po-CMakeLists.txt.patch index 41de5ca1c621b8..9793d1ee2f0125 100644 --- a/packages/neovim/src-nvim-po-CMakeLists.txt.patch +++ b/packages/neovim/src-nvim-po-CMakeLists.txt.patch @@ -1,28 +1,28 @@ diff --git a/src/nvim/po/CMakeLists.txt b/src/nvim/po/CMakeLists.txt -index 1db21880b..791e833e1 100644 +index 6c2008926..75884bfff 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) +@@ -53,13 +53,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 $ -u NONE -i NONE -n --headless --cmd "set cpo+=+" +- COMMAND $ -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 $ -u NONE -i NONE -n --headless --cmd "set cpo+=+" +- COMMAND $ -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) + DEPENDS ${NVIM_SOURCES} nvim_bin nvim_runtime_deps) +@@ -88,7 +88,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 $ -u NONE -n -e +- COMMAND $ -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} ||