<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/391c7804e8d2a5f359d9108d95bcdc304d1b9d62">https://github.com/macports/macports-ports/commit/391c7804e8d2a5f359d9108d95bcdc304d1b9d62</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 391c7804e8d neovim: include lua51 headers to build properly
</span>391c7804e8d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 391c7804e8d2a5f359d9108d95bcdc304d1b9d62
</span>Author: Chris Haumesser <5400416-wryfi@users.noreply.gitlab.com>
AuthorDate: Wed Aug 7 16:41:39 2024 -0700
<span style='display:block; white-space:pre;color:#404040;'> neovim: include lua51 headers to build properly
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> fixes https://trac.macports.org/ticket/70420
</span><span style='display:block; white-space:pre;color:#404040;'> fixes https://trac.macports.org/ticket/66077
</span>---
editors/neovim/Portfile | 9 +++++++--
editors/neovim/files/patch-lua51-includes.diff | 21 +++++++++++++++++++++
2 files changed, 28 insertions(+), 2 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 6c79bb4bd3e..12b359d644b 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;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
github.setup neovim neovim 0.10.1 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories editors
maintainers {raimue @raimue} \
{l2dy @l2dy} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,12 @@ cmake.build_type Release
</span> configure.args-append -DLUA_PRG=${prefix}/bin/luajit
# 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:#e0ffe0;'>+patchfiles embed-parsers-build.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-lua51-includes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
subport neovim-devel {
github.setup neovim neovim 0c2860d9e5ec5417a94db6e3edd237578b76d418
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c43457359aa
</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/patch-lua51-includes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 12e0d6e6a..538e6819e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ 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;'>+@@ -39,6 +41,7 @@ include(InstallHelpers)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(PreventInTreeBuilds)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(Util)
</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;'>+ #-------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # User settings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-------------------------------------------------------------------------------
</span></pre><pre style='margin:0'>
</pre>