| 1 |
commit: 6b19b1fec1b69d44e2fd8a8fdc64c874cfa195c8 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 3 23:57:27 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 3 23:58:15 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b19b1fe |
| 7 |
|
| 8 |
app-editors/neovim: fix CMake patch for 0.8.0-r1 |
| 9 |
|
| 10 |
Fixes: bb9639a94ba59a7b247838d36f6af9a37af61f2d |
| 11 |
Fixes: 317d433897aa1ecb0138d97df6d9374ace4005b4 |
| 12 |
Closes: https://bugs.gentoo.org/879305 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
...patch => neovim-0.8.0-cmake-release-type.patch} | 22 +++++++++++----------- |
| 16 |
app-editors/neovim/neovim-0.8.0-r1.ebuild | 3 +-- |
| 17 |
2 files changed, 12 insertions(+), 13 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-editors/neovim/files/neovim-9999-cmake-release-type.patch b/app-editors/neovim/files/neovim-0.8.0-cmake-release-type.patch |
| 20 |
similarity index 50% |
| 21 |
rename from app-editors/neovim/files/neovim-9999-cmake-release-type.patch |
| 22 |
rename to app-editors/neovim/files/neovim-0.8.0-cmake-release-type.patch |
| 23 |
index 8c24b6b6123f..8114e2a92b74 100644 |
| 24 |
--- a/app-editors/neovim/files/neovim-9999-cmake-release-type.patch |
| 25 |
+++ b/app-editors/neovim/files/neovim-0.8.0-cmake-release-type.patch |
| 26 |
@@ -1,16 +1,16 @@ |
| 27 |
Ensure that :checkhealth is happy with the Gentoo build type. |
| 28 |
https://bugs.gentoo.org/757744 |
| 29 |
---- a/runtime/lua/nvim/health.lua |
| 30 |
-+++ b/runtime/lua/nvim/health.lua |
| 31 |
-@@ -149,7 +149,7 @@ local function check_performance() |
| 32 |
- let s:buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+') |
| 33 |
- if empty(s:buildtype) |
| 34 |
- call health#report_error('failed to get build type from :version') |
| 35 |
-- elseif s:buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)' |
| 36 |
-+ elseif s:buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo|Gentoo)' |
| 37 |
- call health#report_ok(s:buildtype) |
| 38 |
- else |
| 39 |
- call health#report_info(s:buildtype) |
| 40 |
+--- a/runtime/autoload/health/nvim.vim |
| 41 |
++++ b/runtime/autoload/health/nvim.vim |
| 42 |
+@@ -135,7 +135,7 @@ function! s:check_performance() abort |
| 43 |
+ let buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+') |
| 44 |
+ if empty(buildtype) |
| 45 |
+ call health#report_error('failed to get build type from :version') |
| 46 |
+- elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)' |
| 47 |
++ elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo|Gentoo)' |
| 48 |
+ call health#report_ok(buildtype) |
| 49 |
+ else |
| 50 |
+ call health#report_info(buildtype) |
| 51 |
--- a/CMakeLists.txt |
| 52 |
+++ b/CMakeLists.txt |
| 53 |
@@ -137,12 +137,6 @@ else() |
| 54 |
|
| 55 |
diff --git a/app-editors/neovim/neovim-0.8.0-r1.ebuild b/app-editors/neovim/neovim-0.8.0-r1.ebuild |
| 56 |
index fe675b291f83..60b97a82d314 100644 |
| 57 |
--- a/app-editors/neovim/neovim-0.8.0-r1.ebuild |
| 58 |
+++ b/app-editors/neovim/neovim-0.8.0-r1.ebuild |
| 59 |
@@ -73,13 +73,12 @@ PATCHES=() |
| 60 |
if [[ ${PV} == 9999 ]]; then |
| 61 |
PATCHES+=( |
| 62 |
"${FILESDIR}/${PN}-9999-cmake_lua_version.patch" |
| 63 |
- "${FILESDIR}/${PN}-9999-cmake-release-type.patch" |
| 64 |
"${FILESDIR}/${PN}-9999-cmake-darwin.patch" |
| 65 |
) |
| 66 |
else |
| 67 |
PATCHES+=( |
| 68 |
"${FILESDIR}/${PN}-9999-cmake_lua_version.patch" |
| 69 |
- "${FILESDIR}/${PN}-9999-cmake-release-type.patch" |
| 70 |
+ "${FILESDIR}/${PN}-0.8.0-cmake-release-type.patch" |
| 71 |
"${FILESDIR}/${PN}-9999-cmake-darwin.patch" |
| 72 |
) |
| 73 |
fi |
Archives