gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

app-editors/neovim: fix CMake patch for 0.8.0-r1

Browse Source 
Fixes: bb9639a94b
Fixes: 317d433897
Closes: https://bugs.gentoo.org/879305
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2022-11-03 23:57:27 +00:00
parent 9c55e17fa7
commit 6b19b1fec1
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app-editors/neovim/files/neovim-9999-cmake-release-type.patch → app-editors/neovim/files/neovim-0.8.0-cmake-release-type.patch
View File

@@ -1,16 +1,16 @@
Ensure that :checkhealth is happy with the Gentoo build type.
https://bugs.gentoo.org/757744
--- a/runtime/lua/nvim/health.lua
+++ b/runtime/lua/nvim/health.lua
@@ -149,7 +149,7 @@ local function check_performance()
let s:buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+')
if empty(s:buildtype)
call health#report_error('failed to get build type from :version')
- elseif s:buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)'
+ elseif s:buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo|Gentoo)'
call health#report_ok(s:buildtype)
else
call health#report_info(s:buildtype)
--- a/runtime/autoload/health/nvim.vim
+++ b/runtime/autoload/health/nvim.vim
@@ -135,7 +135,7 @@ function! s:check_performance() abort
let buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+')
if empty(buildtype)
call health#report_error('failed to get build type from :version')
- elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)'
+ elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo|Gentoo)'
call health#report_ok(buildtype)
else
call health#report_info(buildtype)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -137,12 +137,6 @@ else()

3
app-editors/neovim/neovim-0.8.0-r1.ebuild
View File

@@ -73,13 +73,12 @@ PATCHES=()
if [[ ${PV} == 9999 ]]; then
PATCHES+=(
"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
"${FILESDIR}/${PN}-9999-cmake-release-type.patch"
"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
)
else
PATCHES+=(
"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
"${FILESDIR}/${PN}-9999-cmake-release-type.patch"
"${FILESDIR}/${PN}-0.8.0-cmake-release-type.patch"
"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
)
fi