| 1 |
commit: 2f06c41edaa2b6454f430ca85511f25af26c314b |
| 2 |
Author: Tianyang Zhou <qsdrqs <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Jun 1 01:25:56 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 1 02:15:00 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f06c41e |
| 7 |
|
| 8 |
app-editors/neovim: fix lua patch for neovim git |
| 9 |
|
| 10 |
Signed-off-by: Tianyang Zhou <qsdrqs <AT> gmail.com> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/25714 |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
app-editors/neovim/files/neovim-9999-cmake_lua_version.patch | 11 +++++++++++ |
| 15 |
app-editors/neovim/neovim-9999.ebuild | 6 +++++- |
| 16 |
2 files changed, 16 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch b/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch |
| 19 |
new file mode 100644 |
| 20 |
index 000000000000..d7e01275fb02 |
| 21 |
--- /dev/null |
| 22 |
+++ b/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch |
| 23 |
@@ -0,0 +1,11 @@ |
| 24 |
+--- a/CMakeLists.txt |
| 25 |
++++ b/CMakeLists.txt |
| 26 |
+@@ -384,7 +384,7 @@ |
| 27 |
+ option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF) |
| 28 |
+ |
| 29 |
+ if(PREFER_LUA) |
| 30 |
+- find_package(Lua 5.1 EXACT REQUIRED) |
| 31 |
++ find_package(Lua ${PREFER_LUA} EXACT REQUIRED) |
| 32 |
+ set(LUA_PREFERRED_INCLUDE_DIRS ${LUA_INCLUDE_DIR}) |
| 33 |
+ set(LUA_PREFERRED_LIBRARIES ${LUA_LIBRARIES}) |
| 34 |
+ # Passive (not REQUIRED): if LUAJIT_FOUND is not set, nvim-test is skipped. |
| 35 |
|
| 36 |
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild |
| 37 |
index f23e7434577b..4316da6d93cc 100644 |
| 38 |
--- a/app-editors/neovim/neovim-9999.ebuild |
| 39 |
+++ b/app-editors/neovim/neovim-9999.ebuild |
| 40 |
@@ -67,10 +67,14 @@ BDEPEND=" |
| 41 |
" |
| 42 |
|
| 43 |
PATCHES=( |
| 44 |
- "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch" |
| 45 |
"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch" |
| 46 |
"${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch" |
| 47 |
) |
| 48 |
+if [[ ${PV} == 9999 ]]; then |
| 49 |
+ PATCHES+=("${FILESDIR}/${PN}-9999-cmake_lua_version.patch") |
| 50 |
+else |
| 51 |
+ PATCHES+=("${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch") |
| 52 |
+fi |
| 53 |
|
| 54 |
src_prepare() { |
| 55 |
# Use our system vim dir |
Archives