<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/670a0f4eb6b9d70126d958eb6cb80622074d71fc">https://github.com/macports/macports-ports/commit/670a0f4eb6b9d70126d958eb6cb80622074d71fc</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 670a0f4eb6b neovim, -devel: update to 0.10.4 and 20250226
</span>670a0f4eb6b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 670a0f4eb6b9d70126d958eb6cb80622074d71fc
</span>Author: Chris Rawnsley <chris@puny.agency>
AuthorDate: Tue Feb 25 18:00:55 2025 +0000
<span style='display:block; white-space:pre;color:#404040;'> neovim, -devel: update to 0.10.4 and 20250226
</span>---
editors/neovim/Portfile | 34 +++++++-------
...01-build-and-install-tree-sitter-parsers.patch} | 54 ++++++++++++++++------
...2-include-lua51-headers-to-build-properly.patch | 25 ++++++++++
editors/neovim/files/patch-lua51-includes.diff | 21 ---------
4 files changed, 82 insertions(+), 52 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/neovim/Portfile b/editors/neovim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 72e1f9af67c..693c1ad7ba9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/neovim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/neovim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup neovim neovim 0.10.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup neovim neovim 0.10.4 v
</span> revision 0
categories editors
maintainers {l2dy @l2dy} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,9 @@ long_description \
</span> homepage https://neovim.io
github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4d6f8395afad5763894c2cf60c56ada2a41ed2ad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 546cb2da9fffbb7e913261344bbf4cf1622721f6c5a67aa77609e976e78b8e89 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12801272
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c5817b0b1c0ec7a82682d84f34453cf6443bc8e4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 10413265a915133f8a853dc757571334ada6e4f0aa15f4c4cc8cc48341186ca2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12808381
</span>
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,28 +44,25 @@ cmake.build_type Release
</span>
configure.args-append -DLUA_PRG=${prefix}/bin/luajit
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args-replace -p0 -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Building parsers is normally an extra step, see https://github.com/neovim/neovim/issues/29042
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles embed-parsers-build.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-lua51-includes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 0001-build-and-install-tree-sitter-parsers.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-include-lua51-headers-to-build-properly.patch
</span>
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/CMakeLists.txt
}
subport neovim-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # To progress past the 31 Aug 2024 nightly, there needs to be a new release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # of utf8proc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See: https://github.com/neovim/neovim/commit/26be6446e5ea1c5b22c50bfd9a0e5aa85927aff9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See: https://github.com/JuliaStrings/utf8proc/issues/272
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup neovim neovim 53af02adbad049f5fc24540cc0f38fa4f9aadf58
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20240831-[string range ${github.version} 0 6]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup neovim neovim a2b464944a4eb391fe6213304a4df5677845b52c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20250226-[string range ${github.version} 0 6]
</span> revision 0
github.tarball_from tarball
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 0baf764ccc3bb01d33983c295c03be5426ce0859 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ad0278f8dac15fcec59443ac99d42c6bf6ba4c40543889d0763cf2aa455ff690 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12950105
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 470c893ebb6cc91104d10ccaf8713fc0ee085604 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f462eff2d0f32193ee353c394f42ff1caf3bb1079348bde6fbe82b05d7f76923 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12853137
</span>
conflicts neovim
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,6 +73,11 @@ subport neovim-devel {
</span> depends_lib-append \
port:libutf8proc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # workaround for https://github.com/neovim/neovim/pull/30749
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|lpeg.so lpeg\${CMAKE_SHARED_LIBRARY_SUFFIX}|lpeg\${CMAKE_SHARED_LIBRARY_SUFFIX} lpeg.so|g" ${worksrcpath}/cmake/FindLpeg.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.url ${github.homepage}/commits/nightly.atom
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/neovim/files/embed-parsers-build.diff b/editors/neovim/files/0001-build-and-install-tree-sitter-parsers.patch
</span>similarity index 52%
rename from editors/neovim/files/embed-parsers-build.diff
rename to editors/neovim/files/0001-build-and-install-tree-sitter-parsers.patch
<span style='display:block; white-space:pre;color:#808080;'>index 2c7bd30790e..f4c0ac0d348 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/neovim/files/embed-parsers-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/neovim/files/0001-build-and-install-tree-sitter-parsers.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 12e0d6e6a..27fe5c50d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 8a790cba559e22955f35c4089da597de10c406f8 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 8 Jun 2024 07:47:36 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/2] build and install tree-sitter parsers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+neovim needs a number of prebuilt parsers in <prefix>/lib/nvim/parser/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+or else it will throw errors when opening e.g. ":help".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+USE_BUNDLED is also not a valid option for the root cmake build system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+anymore, but applies to the one in cmake.deps/.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMakeLists.txt | 13 +++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake.deps/cmake/BuildTreesitterParsers.cmake | 4 +++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/nvim/CMakeLists.txt | 12 +++++-------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 21 insertions(+), 8 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f7c9956325..1b89b6b606 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CMakeLists.txt
</span> @@ -102,6 +102,19 @@ endif()
list(INSERT CMAKE_PREFIX_PATH 0 ${DEPS_PREFIX})
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,10 +37,10 @@ index 12e0d6e6a..27fe5c50d 100644
</span> if(APPLE)
# If the macOS deployment target is not set manually (via $MACOSX_DEPLOYMENT_TARGET),
# fall back to local system version. Needs to be done both here and in cmake.deps.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git cmake.deps/cmake/BuildTreesitterParsers.cmake cmake.deps/cmake/BuildTreesitterParsers.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 060447e6f..9c3f7165e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake.deps/cmake/BuildTreesitterParsers.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake.deps/cmake/BuildTreesitterParsers.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/cmake.deps/cmake/BuildTreesitterParsers.cmake b/cmake.deps/cmake/BuildTreesitterParsers.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 060447e6fe..9c3f7165e4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake.deps/cmake/BuildTreesitterParsers.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake.deps/cmake/BuildTreesitterParsers.cmake
</span> @@ -21,13 +21,15 @@ function(BuildTSParser)
ExternalProject_Add(${NAME}
DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/${NAME}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,20 +58,29 @@ index 060447e6f..9c3f7165e 100644
</span> foreach(lang c lua vim vimdoc query)
BuildTSParser(LANG ${lang})
endforeach()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/nvim/CMakeLists.txt src/nvim/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a100e733d..6e05f66cf 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/nvim/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/nvim/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -770,10 +770,8 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 574344e4e0..04bc3cb842 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/nvim/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/nvim/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -771,13 +771,11 @@ endif()
</span>
file(MAKE_DIRECTORY ${BINARY_LIB_DIR})
-# install treesitter parser if bundled
-if(EXISTS ${DEPS_PREFIX}/lib/nvim/parser)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_custom_command(TARGET nvim_runtime_deps COMMAND ${CMAKE_COMMAND} -E ${COPY_DIRECTORY} ${DEPS_PREFIX}/lib/nvim/parser ${BINARY_LIB_DIR}/parser)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_custom_command(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TARGET nvim_runtime_deps
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- POST_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND ${CMAKE_COMMAND} -E ${COPY_DIRECTORY} ${DEPS_PREFIX}/lib/nvim/parser ${BINARY_LIB_DIR}/parser)
</span> -endif()
+add_dependencies(nvim_runtime_deps ${ALL_BUNDLED_TS_PARSER_TARGETS})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+add_custom_command(TARGET nvim_runtime_deps COMMAND ${CMAKE_COMMAND} -E ${COPY_DIRECTORY} ${DEPS_INSTALL_DIR}/lib/nvim/parser ${BINARY_LIB_DIR}/parser)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++add_custom_command(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TARGET nvim_runtime_deps
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POST_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND ${CMAKE_COMMAND} -E ${COPY_DIRECTORY} ${DEPS_INSTALL_DIR}/lib/nvim/parser ${BINARY_LIB_DIR}/parser)
</span>
install(DIRECTORY ${BINARY_LIB_DIR}
DESTINATION ${CMAKE_INSTALL_LIBDIR}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.48.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/neovim/files/0002-include-lua51-headers-to-build-properly.patch b/editors/neovim/files/0002-include-lua51-headers-to-build-properly.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ef8ccc2b7a7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/neovim/files/0002-include-lua51-headers-to-build-properly.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a1ffaae2f304c58c14cc111dd7c9b72efd392dd3 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Chris Haumesser <5400416-wryfi@users.noreply.gitlab.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 7 Aug 2024 16:41:39 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/2] include lua51 headers to build properly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMakeLists.txt | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1b89b6b606..21d98c52a3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,8 @@ if(XCODE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(FATAL_ERROR [[Xcode generator is not supported. Use "Ninja" or "Unix Makefiles" instead]])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++include_directories(BEFORE @PREFIX@/include/lua5.1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Point CMake at any custom modules we may ship
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.48.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/neovim/files/patch-lua51-includes.diff b/editors/neovim/files/patch-lua51-includes.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c43457359aa..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/neovim/files/patch-lua51-includes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 12e0d6e6a..538e6819e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,6 +23,8 @@ if(XCODE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(FATAL_ERROR [[Xcode generator is not supported. Use "Ninja" or "Unix Makefiles" instead]])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+include_directories(BEFORE @PREFIX@/include/lua5.1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Point CMake at any custom modules we may ship
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,6 +41,7 @@ include(InstallHelpers)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(PreventInTreeBuilds)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(Util)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #-------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # User settings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #-------------------------------------------------------------------------------
</span></pre><pre style='margin:0'>
</pre>