1 |
commit: 317d433897aa1ecb0138d97df6d9374ace4005b4 |
2 |
Author: Bharath Saiguhan <bharathsaiguhan <AT> protonmail <DOT> com> |
3 |
AuthorDate: Mon Oct 31 06:26:23 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 2 20:02:16 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=317d4338 |
7 |
|
8 |
app-editors/neovim: fix cmake-release-type.patch |
9 |
|
10 |
Upstream converted the (old) runtime/autoload/health/nvim.vim file into |
11 |
the (new) runtime/lua/nvim/health.lua file. This causes patching to fail |
12 |
during building, since the old file won't be found. |
13 |
|
14 |
This commit modifies the patch file to work on the new file. |
15 |
|
16 |
Signed-off-by: Bharath Saiguhan <bharathsaiguhan <AT> protonmail.com> |
17 |
Closes: https://github.com/gentoo/gentoo/pull/28048 |
18 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
19 |
|
20 |
.../files/neovim-9999-cmake-release-type.patch | 22 +++++++++++----------- |
21 |
1 file changed, 11 insertions(+), 11 deletions(-) |
22 |
|
23 |
diff --git a/app-editors/neovim/files/neovim-9999-cmake-release-type.patch b/app-editors/neovim/files/neovim-9999-cmake-release-type.patch |
24 |
index 8114e2a92b74..8c24b6b6123f 100644 |
25 |
--- a/app-editors/neovim/files/neovim-9999-cmake-release-type.patch |
26 |
+++ b/app-editors/neovim/files/neovim-9999-cmake-release-type.patch |
27 |
@@ -1,16 +1,16 @@ |
28 |
Ensure that :checkhealth is happy with the Gentoo build type. |
29 |
https://bugs.gentoo.org/757744 |
30 |
---- a/runtime/autoload/health/nvim.vim |
31 |
-+++ b/runtime/autoload/health/nvim.vim |
32 |
-@@ -135,7 +135,7 @@ function! s:check_performance() abort |
33 |
- let buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+') |
34 |
- if empty(buildtype) |
35 |
- call health#report_error('failed to get build type from :version') |
36 |
-- elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)' |
37 |
-+ elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo|Gentoo)' |
38 |
- call health#report_ok(buildtype) |
39 |
- else |
40 |
- call health#report_info(buildtype) |
41 |
+--- a/runtime/lua/nvim/health.lua |
42 |
++++ b/runtime/lua/nvim/health.lua |
43 |
+@@ -149,7 +149,7 @@ local function check_performance() |
44 |
+ let s:buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+') |
45 |
+ if empty(s:buildtype) |
46 |
+ call health#report_error('failed to get build type from :version') |
47 |
+- elseif s:buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)' |
48 |
++ elseif s:buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo|Gentoo)' |
49 |
+ call health#report_ok(s:buildtype) |
50 |
+ else |
51 |
+ call health#report_info(s:buildtype) |
52 |
--- a/CMakeLists.txt |
53 |
+++ b/CMakeLists.txt |
54 |
@@ -137,12 +137,6 @@ else() |