commit: 16878a79858814d50abfddb4e4668005d162dc2e
Author: brahmajit das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Fri Apr 7 16:20:26 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 02:50:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16878a79
app-editors/neovim: Using 0.9.0 patches for live ebuild
This also removes older 9999 patches to remove rudundancy.
Signed-off-by: brahmajit das <brahmajit.xyz <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-editors/neovim/files/neovim-9999-cmake-darwin.patch | 13 -------------
.../neovim/files/neovim-9999-cmake_lua_version.patch | 11 -----------
app-editors/neovim/neovim-9999.ebuild | 11 +++--------
3 files changed, 3 insertions(+), 32 deletions(-)
diff --git a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
deleted file mode 100644
index cba966a4ebfa..000000000000
--- a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/nvim/CMakeLists.txt
-+++ b/src/nvim/CMakeLists.txt
-@@ -394,10 +394,6 @@ foreach(gen_include ${prop})
- list(APPEND gen_cflags "-I${gen_include}")
- endforeach()
- list(APPEND gen_cflags "-I${DEPS_PREFIX}/include")
--if(APPLE AND CMAKE_OSX_SYSROOT)
-- list(APPEND gen_cflags "-isysroot")
-- list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}")
--endif()
- set(gen_cflags ${gen_cflags} -O2)
-
- set(NVIM_VERSION_GIT_H
${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef_git.h)
diff --git a/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch
b/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch
deleted file mode 100644
index b14b3b992349..000000000000
--- a/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/nvim/CMakeLists.txt
-+++ b/src/nvim/CMakeLists.txt
-@@ -464,7 +464,7 @@ endif()
- # The unit test lib requires LuaJIT; it will be skipped if LuaJIT is missing.
- option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF)
- if(PREFER_LUA)
-- find_package(Lua 5.1 EXACT REQUIRED)
-+ find_package(Lua ${PREFER_LUA} EXACT REQUIRED)
- target_include_directories(main_lib SYSTEM BEFORE INTERFACE
${LUA_INCLUDE_DIR})
- target_link_libraries(main_lib INTERFACE ${LUA_LIBRARIES})
- # Passive (not REQUIRED): if LUAJIT_FOUND is not set, fixtures for
unittests is skipped.
diff --git a/app-editors/neovim/neovim-9999.ebuild
b/app-editors/neovim/neovim-9999.ebuild
index 75c83337a13a..74754842445c 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -69,16 +69,11 @@ BDEPEND+="
"
PATCHES=(
- "${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
- "${FILESDIR}/${PN}-9999-cmake-darwin.patch"
+ "${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch"
+ "${FILESDIR}/${PN}-0.9.0-cmake-darwin.patch"
+ "${FILESDIR}/${PN}-0.9.0-cmake-release-type.patch"
)
-if [[ ${PV} != 9999 ]]; then
- PATCHES+=(
- "${FILESDIR}/${PN}-0.8.0-cmake-release-type.patch"
- )
-fi
-
src_prepare() {
# Use our system vim dir
sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
