[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/

[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/

[Sam James]

commit:     665f51f23f91f5f61aba27b459c7a57d5c56ef9d
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Sep 26 17:55:44 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct  1 07:32:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=665f51f2

app-editors/neovim: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/33066
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-editors/neovim/files/neovim-0.9.0-cmake-darwin.patch | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/app-editors/neovim/files/neovim-0.9.0-cmake-darwin.patch b/app-editors/neovim/files/neovim-0.9.0-cmake-darwin.patch
deleted file mode 100644
index cba966a4ebfa..000000000000
--- a/app-editors/neovim/files/neovim-0.9.0-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)

[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/

[Sam James]

commit:     651728e2b139dd5c51d1bbdeb4f9cbb18f22d486
Author:     Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Sat Dec  9 06:18:35 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 04:46:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=651728e2

app-editors/neovim: Rebase patch from upstream

Closes: https://bugs.gentoo.org/917665
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34185
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-editors/neovim/files/neovim-9999-cmake-darwin.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
index 892d349b7e1c..7d2352c6a18b 100644
--- a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
+++ b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
@@ -1,12 +1,12 @@
+Patch author: mortezadadgar <mortezadadgar97@gmail.com>
 --- a/src/nvim/CMakeLists.txt
 +++ b/src/nvim/CMakeLists.txt
-@@ -416,10 +416,6 @@ foreach(target ${targets})
+@@ -477,9 +477,6 @@ foreach(target ${targets})
    endforeach()
  endforeach()
  
 -if(APPLE AND CMAKE_OSX_SYSROOT)
--  list(APPEND gen_cflags "-isysroot")
--  list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}")
+-  list(APPEND gen_cflags "-isysroot" "${CMAKE_OSX_SYSROOT}")
 -endif()
  if(MSVC)
    list(APPEND gen_cflags -wd4003)

[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/

[Sam James]

commit:     89e287df0c13e7a249f1bb173129850ce7bdea23
Author:     brahmajit das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Sun Mar 12 06:15:42 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 13 18:02:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89e287df

app-editors/neovim: fix live ebuild darwin patch

Another upstream commit broke the darwin patch, this commit fixes it.

Signed-off-by: brahmajit das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30070
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-editors/neovim/files/neovim-9999-cmake-darwin.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
index cdfb38c3fef4..cba966a4ebfa 100644
--- a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
+++ b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
@@ -1,9 +1,9 @@
 --- a/src/nvim/CMakeLists.txt
 +++ b/src/nvim/CMakeLists.txt
-@@ -440,10 +440,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES)
- foreach(gen_include ${prop})
+@@ -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}")

[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/

[Sam James]

commit:     e9b48235e47eaf2ab355b88cd531c477710742d2
Author:     brahmajit das <listout <AT> protonmail <DOT> com>
AuthorDate: Sat Mar  4 05:41:47 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar  4 06:02:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9b48235

app-editors/neovim: fix live ebuild darwin patch

With commit https://github.com/neovim/neovim/commit/4cf4ae93df6af09ef3a0df678bb3d154b65bf731
checking against string "Darwin" is removed and variable name APPLE is
used instead.

Signed-off-by: brahmajit das <listout <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29918
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-editors/neovim/files/neovim-9999-cmake-darwin.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
index b2920451743d..cdfb38c3fef4 100644
--- a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
+++ b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
@@ -4,10 +4,10 @@
  foreach(gen_include ${prop})
    list(APPEND gen_cflags "-I${gen_include}")
  endforeach()
--if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT)
+-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)

[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/

[Sam James]

commit:     32825269468fe6331698b5d71561f87809019b6f
Author:     brahmajit das <listout <AT> protonmail <DOT> com>
AuthorDate: Thu Dec 29 16:50:37 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 05:48:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32825269

app-editors/neovim: Dropping old patches

Signed-off-by: brahmajit das <listout <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/neovim-0.4.4-cmake-release-type.patch    | 13 -----
 .../files/neovim-0.4.4-cmake_lua_version.patch     | 11 -----
 .../neovim/files/neovim-0.7.2-cmake-darwin.patch   | 55 ----------------------
 3 files changed, 79 deletions(-)

diff --git a/app-editors/neovim/files/neovim-0.4.4-cmake-release-type.patch b/app-editors/neovim/files/neovim-0.4.4-cmake-release-type.patch
deleted file mode 100644
index 2c9c80a7a690..000000000000
--- a/app-editors/neovim/files/neovim-0.4.4-cmake-release-type.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Ensure that :checkhealth is happy with the Gentoo build type.
-https://bugs.gentoo.org/757744
---- a/runtime/autoload/health/nvim.vim
-+++ b/runtime/autoload/health/nvim.vim
-@@ -118,7 +118,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)

diff --git a/app-editors/neovim/files/neovim-0.4.4-cmake_lua_version.patch b/app-editors/neovim/files/neovim-0.4.4-cmake_lua_version.patch
deleted file mode 100644
index 4703dee52613..000000000000
--- a/app-editors/neovim/files/neovim-0.4.4-cmake_lua_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -384,7 +384,7 @@
- option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF)
- 
- if(PREFER_LUA)
--  find_package(Lua 5.1 REQUIRED)
-+  find_package(Lua ${PREFER_LUA} EXACT REQUIRED)
-   set(LUA_PREFERRED_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
-   set(LUA_PREFERRED_LIBRARIES ${LUA_LIBRARIES})
-   # Passive (not REQUIRED): if LUAJIT_FOUND is not set, nvim-test is skipped.

diff --git a/app-editors/neovim/files/neovim-0.7.2-cmake-darwin.patch b/app-editors/neovim/files/neovim-0.7.2-cmake-darwin.patch
deleted file mode 100644
index a8404bd4a97a..000000000000
--- a/app-editors/neovim/files/neovim-0.7.2-cmake-darwin.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,23 +80,6 @@ set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig")
- # used for check_c_compiler_flag
- include(CheckCCompilerFlag)
- 
--if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
--  # CMake tries to treat /sw and /opt/local as extension of the system path, but
--  # that doesn't really work out very well.  Once you have a dependency that
--  # resides there and have to add it as an include directory, then any other
--  # dependency that could be satisfied from there must be--otherwise you can end
--  # up with conflicting versions.  So, let's make them more of a priority having
--  # them be included as one of the first places to look for dependencies.
--  list(APPEND CMAKE_PREFIX_PATH /sw /opt/local)
--
--  # Work around some old, broken detection by CMake for knowing when to use the
--  # isystem flag.  Apple's compilers have supported this for quite some time
--  # now.
--  if(CMAKE_COMPILER_IS_GNUCC)
--    set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
--  endif()
--endif()
--
- if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-   # Ignore case when comparing filenames on Windows and Mac.
-   set(CASE_INSENSITIVE_FILENAME TRUE)
---- a/src/nvim/CMakeLists.txt
-+++ b/src/nvim/CMakeLists.txt
-@@ -205,10 +205,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES)
- foreach(gen_include ${gen_includes} ${LUA_PREFERRED_INCLUDE_DIRS})
-   list(APPEND gen_cflags "-I${gen_include}")
- endforeach()
--if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT)
--  list(APPEND gen_cflags "-isysroot")
--  list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}")
--endif()
- string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type)
- separate_arguments(C_FLAGS_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS})
- separate_arguments(C_FLAGS_${build_type}_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS_${build_type}})
---- a/third-party/CMakeLists.txt
-+++ b/third-party/CMakeLists.txt
-@@ -117,13 +117,6 @@ if(CMAKE_CXX_COMPILER)
-   set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}")
- endif()
- 
--if(CMAKE_OSX_SYSROOT)
--  set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}")
--  if(DEPS_CXX_COMPILER)
--    set(DEPS_CXX_COMPILER "${DEPS_CXX_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}")
--  endif()
--endif()
--
- if(CMAKE_OSX_ARCHITECTURES)
-   string(REPLACE ";" "|" CMAKE_OSX_ARCHITECTURES_ALT_SEP "${CMAKE_OSX_ARCHITECTURES}")
-   # The LuaJIT build does not like being passed multiple `-arch` flags

[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/

[Conrad Kostecki]

commit:     9d7225c0fe2a38f36b9cdfb659f6a868255dfc1a
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Nov 24 16:57:27 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 18:14:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d7225c0

app-editors/neovim: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28415
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../neovim/files/neovim-0.4.4-cmake-darwin.patch   | 61 ----------------------
 1 file changed, 61 deletions(-)

diff --git a/app-editors/neovim/files/neovim-0.4.4-cmake-darwin.patch b/app-editors/neovim/files/neovim-0.4.4-cmake-darwin.patch
deleted file mode 100644
index 4fa8bf45bcbd..000000000000
--- a/app-editors/neovim/files/neovim-0.4.4-cmake-darwin.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 07928e3..08881ee 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -58,23 +58,6 @@ endif()
- # used for check_c_compiler_flag
- include(CheckCCompilerFlag)
- 
--if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
--  # CMake tries to treat /sw and /opt/local as extension of the system path, but
--  # that doesn't really work out very well.  Once you have a dependency that
--  # resides there and have to add it as an include directory, then any other
--  # dependency that could be satisfied from there must be--otherwise you can end
--  # up with conflicting versions.  So, let's make them more of a priority having
--  # them be included as one of the first places to look for dependencies.
--  list(APPEND CMAKE_PREFIX_PATH /sw /opt/local)
--
--  # Work around some old, broken detection by CMake for knowing when to use the
--  # isystem flag.  Apple's compilers have supported this for quite some time
--  # now.
--  if(CMAKE_COMPILER_IS_GNUCC)
--    set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
--  endif()
--endif()
--
- if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-   # Enable fixing case-insensitive filenames for Windows and Mac.
-   set(USE_FNAME_CASE TRUE)
-diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
-index aa81008..0570dc7 100644
---- a/src/nvim/CMakeLists.txt
-+++ b/src/nvim/CMakeLists.txt
-@@ -192,10 +192,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES)
- foreach(gen_include ${gen_includes} ${LUA_PREFERRED_INCLUDE_DIRS})
-   list(APPEND gen_cflags "-I${gen_include}")
- endforeach()
--if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT)
--  list(APPEND gen_cflags "-isysroot")
--  list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}")
--endif()
- string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type)
- separate_arguments(C_FLAGS_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS})
- separate_arguments(C_FLAGS_${build_type}_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS_${build_type}})
-diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
-index edd5882..e503434 100644
---- a/third-party/CMakeLists.txt
-+++ b/third-party/CMakeLists.txt
-@@ -105,13 +105,6 @@ if(CMAKE_CXX_COMPILER)
-   set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}")
- endif()
- 
--if(CMAKE_OSX_SYSROOT)
--  set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}")
--  if(DEPS_CXX_COMPILER)
--    set(DEPS_CXX_COMPILER "${DEPS_CXX_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}")
--  endif()
--endif()
--
- # Cross compiling: use these for dependencies built for the
- # HOST system, when not crosscompiling these should be the
- # same as DEPS_*. Except when targeting Unix in which case
\ No newline at end of file

[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/

[Sam James]

commit:     317d433897aa1ecb0138d97df6d9374ace4005b4
Author:     Bharath Saiguhan <bharathsaiguhan <AT> protonmail <DOT> com>
AuthorDate: Mon Oct 31 06:26:23 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov  2 20:02:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=317d4338

app-editors/neovim: fix cmake-release-type.patch

Upstream converted the (old) runtime/autoload/health/nvim.vim file into
the (new) runtime/lua/nvim/health.lua file. This causes patching to fail
during building, since the old file won't be found.

This commit modifies the patch file to work on the new file.

Signed-off-by: Bharath Saiguhan <bharathsaiguhan <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28048
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/neovim-9999-cmake-release-type.patch     | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app-editors/neovim/files/neovim-9999-cmake-release-type.patch b/app-editors/neovim/files/neovim-9999-cmake-release-type.patch
index 8114e2a92b74..8c24b6b6123f 100644
--- a/app-editors/neovim/files/neovim-9999-cmake-release-type.patch
+++ b/app-editors/neovim/files/neovim-9999-cmake-release-type.patch
@@ -1,16 +1,16 @@
 Ensure that :checkhealth is happy with the Gentoo build type.
 https://bugs.gentoo.org/757744
---- 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/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/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -137,12 +137,6 @@ else()

[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/

[Sam James]

commit:     86e675d722e7de6a3875f29bf8a68c2ae71a6692
Author:     Bharath Saiguhan <bharathsaiguhan <AT> protonmail <DOT> com>
AuthorDate: Mon Sep 12 07:03:53 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 25 01:27:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86e675d7

app-editors/neovim: remove unnecessary underscore

This fixes an extra underscore introduced by mistake in the previous
commit.

Fixes: 545106ff82c8c0795c08656235b0e1c235848d09
Signed-off-by: Bharath Saiguhan <bharathsaiguhan <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27218
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-editors/neovim/files/neovim-9999-cmake-darwin.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
index 571de0813ca6..ad47a46e1a7a 100644
--- a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
+++ b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
@@ -26,7 +26,7 @@
 -  # Work around some old, broken detection by CMake for knowing when to use the
 -  # isystem flag.  Apple's compilers have supported this for quite some time
 -  # now.
--  if(CMAKE_C_COMPILER_ID_MATCHES "GNU")
+-  if(CMAKE_C_COMPILER_ID MATCHES "GNU")
 -    set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
 -  endif()
 -endif()

[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/

[Sam James]

commit:     545106ff82c8c0795c08656235b0e1c235848d09
Author:     Bharath Saiguhan <bharathsaiguhan <AT> protonmail <DOT> com>
AuthorDate: Sat Sep 10 12:44:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 18:13:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=545106ff

app-editors/neovim: fix live ebuild patch file

Upstream has changed its CMakeLists.txt file, replacing the deprecated
variable CMAKE_COMPILER_IS_GNUCC, which causes the patch phase of the
live ebuild to fail.

This commit fixes this issue and with this in place, patching succeeds.

Signed-off-by: Bharath Saiguhan <bharathsaiguhan <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27198
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-editors/neovim/files/neovim-9999-cmake-darwin.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
index cf3e05716625..571de0813ca6 100644
--- a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
+++ b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
@@ -26,7 +26,7 @@
 -  # Work around some old, broken detection by CMake for knowing when to use the
 -  # isystem flag.  Apple's compilers have supported this for quite some time
 -  # now.
--  if(CMAKE_COMPILER_IS_GNUCC)
+-  if(CMAKE_C_COMPILER_ID_MATCHES "GNU")
 -    set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
 -  endif()
 -endif()

[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/

[Conrad Kostecki]

commit:     16115f664f759a07e3afd1ce2ca7f0e450527aac
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Feb 10 17:01:48 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Feb 11 20:28:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16115f66

app-editors/neovim: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/19408
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../neovim/files/neovim-0.4.3-gcc-10-fix.patch     | 225 ---------------------
 1 file changed, 225 deletions(-)

diff --git a/app-editors/neovim/files/neovim-0.4.3-gcc-10-fix.patch b/app-editors/neovim/files/neovim-0.4.3-gcc-10-fix.patch
deleted file mode 100644
index 5826d62ce6c..00000000000
--- a/app-editors/neovim/files/neovim-0.4.3-gcc-10-fix.patch
+++ /dev/null
@@ -1,225 +0,0 @@
-From ebcde1de42588e697e0f4eaed9f6f0ea6a77a2cd Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Mon, 17 Feb 2020 16:33:55 +0100
-Subject: [PATCH 1/6] nvim:eval: Fix enum declaration for ListLenSpecials
-
-Instead of declaring an enum, this creates a global variable. As gcc10
-uses -fno-common by default, global variables declared with the same
-name more than once is not allowed anymore revealing this issue.
-
-Each time this header is included, we define the enum name as a global
-variable.
-
-See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680
----
- src/nvim/eval/typval.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/nvim/eval/typval.h b/src/nvim/eval/typval.h
-index 008453b87f2f..5afdedff751b 100644
---- a/src/nvim/eval/typval.h
-+++ b/src/nvim/eval/typval.h
-@@ -33,7 +33,7 @@ typedef double float_T;
- enum { DO_NOT_FREE_CNT = (INT_MAX / 2) };
- 
- /// Additional values for tv_list_alloc() len argument
--enum {
-+enum ListLenSpecials {
-   /// List length is not known in advance
-   ///
-   /// To be used when there is neither a way to know how many elements will be
-@@ -49,7 +49,7 @@ enum {
-   ///
-   /// To be used when it looks impractical to determine list length.
-   kListLenMayKnow = -3,
--} ListLenSpecials;
-+};
- 
- /// Maximal possible value of varnumber_T variable
- #define VARNUMBER_MAX INT64_MAX
-
-From b87b4a61476bb65e9200bd2ee93b8a98ca4db84e Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Mon, 17 Feb 2020 17:17:37 +0100
-Subject: [PATCH 2/6] nvim:viml: Fix enum declaration of ExprParserFlags
-
-Instead of declaring an enum, this creates a global variable. As gcc10
-uses -fno-common by default, global variables declared with the same
-name more than once is not allowed anymore revealing this issue.
-
-Each time this header is included, we define the enum name as a global
-variable.
-
-See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680
----
- src/nvim/viml/parser/expressions.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/nvim/viml/parser/expressions.h b/src/nvim/viml/parser/expressions.h
-index 23e172da75b2..838a74227182 100644
---- a/src/nvim/viml/parser/expressions.h
-+++ b/src/nvim/viml/parser/expressions.h
-@@ -326,7 +326,7 @@ struct expr_ast_node {
-   } data;
- };
- 
--enum {
-+enum ExprParserFlags {
-   /// Allow multiple expressions in a row: e.g. for :echo
-   ///
-   /// Parser will still parse only one of them though.
-@@ -345,7 +345,7 @@ enum {
-   //     viml_expressions_parser.c, nvim_parse_expression() flags parsing
-   //     alongside with its documentation and flag sets in check_parsing()
-   //     function in expressions parser functional and unit tests.
--} ExprParserFlags;
-+};
- 
- /// AST error definition
- typedef struct {
-
-From 986db1adb491b5cb5936d2369816236847af26da Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Mon, 17 Feb 2020 16:36:21 +0100
-Subject: [PATCH 3/6] nvim: Fix enum declaration of RemapValues
-
-Instead of declaring an enum, this creates a global variable. As gcc10
-uses -fno-common by default, global variables declared with the same
-name more than once is not allowed anymore revealing this issue.
-
-Each time this header is included, we define the enum name as a global
-variable.
-
-See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680
----
- src/nvim/getchar.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/nvim/getchar.h b/src/nvim/getchar.h
-index 01f60ccf4945..f0b52079aad1 100644
---- a/src/nvim/getchar.h
-+++ b/src/nvim/getchar.h
-@@ -10,12 +10,12 @@
- /// Values for "noremap" argument of ins_typebuf()
- ///
- /// Also used for map->m_noremap and menu->noremap[].
--enum {
-+enum RemapValues {
-   REMAP_YES = 0,  ///< Allow remapping.
-   REMAP_NONE = -1,  ///< No remapping.
-   REMAP_SCRIPT = -2,  ///< Remap script-local mappings only.
-   REMAP_SKIP = -3,  ///< No remapping for first char.
--} RemapValues;
-+};
- 
- // Argument for flush_buffers().
- typedef enum {
-
-From 517bf15603aba37014b62553eb008e26f2a1db48 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Mon, 17 Feb 2020 16:40:37 +0100
-Subject: [PATCH 4/6] nvim:msgpack: Correctly set up global
- ch_before_blocking_events
-
-gcc10 builds with -fno-common by default. This mean you can't define
-a global variable with the same name twice.
-
-See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680
----
- src/nvim/msgpack_rpc/channel.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/nvim/msgpack_rpc/channel.h b/src/nvim/msgpack_rpc/channel.h
-index 9ff5abdc5f55..90e1c7d48b4c 100644
---- a/src/nvim/msgpack_rpc/channel.h
-+++ b/src/nvim/msgpack_rpc/channel.h
-@@ -15,7 +15,7 @@
- /// HACK: os/input.c drains this queue immediately before blocking for input.
- ///       Events on this queue are async-safe, but they need the resolved state
- ///       of os_inchar(), so they are processed "just-in-time".
--MultiQueue *ch_before_blocking_events;
-+EXTERN MultiQueue *ch_before_blocking_events INIT(= NULL);
- 
- 
- #ifdef INCLUDE_GENERATED_DECLARATIONS
-
-From 823b2104c3e579e8c3db8baab263dca0aa9d48bc Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Mon, 17 Feb 2020 17:29:12 +0100
-Subject: [PATCH 5/6] nvim: Correctly setup global channels
-
-As gcc10 uses -fno-common by default, global variables declared with the
-same name more than once is not allowed anymore revealing this issue.
-
-We need to define it as extern to access it.
-
-See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680
----
- src/nvim/channel.c | 1 -
- src/nvim/channel.h | 2 +-
- src/nvim/main.c    | 1 +
- 3 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/nvim/channel.c b/src/nvim/channel.c
-index c66a0682e351..5eb29a7290c2 100644
---- a/src/nvim/channel.c
-+++ b/src/nvim/channel.c
-@@ -19,7 +19,6 @@
- #include "nvim/ascii.h"
- 
- static bool did_stdio = false;
--PMap(uint64_t) *channels = NULL;
- 
- /// next free id for a job or rpc channel
- /// 1 is reserved for stdio channel
-diff --git a/src/nvim/channel.h b/src/nvim/channel.h
-index c733e276bef2..9d26852ce532 100644
---- a/src/nvim/channel.h
-+++ b/src/nvim/channel.h
-@@ -85,7 +85,7 @@ struct Channel {
-   bool callback_scheduled;
- };
- 
--EXTERN PMap(uint64_t) *channels;
-+EXTERN PMap(uint64_t) *channels INIT(= NULL);
- 
- #ifdef INCLUDE_GENERATED_DECLARATIONS
- # include "channel.h.generated.h"
-diff --git a/src/nvim/main.c b/src/nvim/main.c
-index 56d9030a7f42..4a9f2371a298 100644
---- a/src/nvim/main.c
-+++ b/src/nvim/main.c
-@@ -10,6 +10,7 @@
- #include <msgpack.h>
- 
- #include "nvim/ascii.h"
-+#include "nvim/channel.h"
- #include "nvim/vim.h"
- #include "nvim/main.h"
- #include "nvim/aucmd.h"
-
-From 0504f2f88dac9a4cf1fe1052a1e00ab203e9cf8e Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Mon, 17 Feb 2020 18:04:01 +0100
-Subject: [PATCH 6/6] cmake: Check for -fno-common and use it if available
-
----
- CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index de530bb4f7da..74e161d98907 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -308,6 +308,11 @@ if(UNIX)
-   endif()
- endif()
- 
-+check_c_compiler_flag(-fno-common HAVE_FNO_COMMON)
-+if (HAVE_FNO_COMMON)
-+  add_compile_options(-fno-common)
-+endif()
-+
- check_c_compiler_flag(-fdiagnostics-color=auto HAS_DIAG_COLOR_FLAG)
- if(HAS_DIAG_COLOR_FLAG)
-   if(CMAKE_GENERATOR MATCHES "Ninja")

[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/

[Ben de Groot]

commit:     e11e10747b61731a547e3389719a0d17e0962b91
Author:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 08:10:03 2015 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 09:36:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e11e1074

app-editors/neovim: refactor our default nvimrc

Since neovim sets many sensible deafults now (see [1]), we can drop most
general settings that were copied from app-editors/vim-core's vimrc.
Also apply stripping whitespace only to *.e{build,class} and give users an
easy way to turn that off (bug 557352).

1: https://github.com/neovim/neovim/issues/2676

Package-Manager: portage-2.2.20.1

 app-editors/neovim/files/nvimrc | 99 ++++++++---------------------------------
 1 file changed, 18 insertions(+), 81 deletions(-)

diff --git a/app-editors/neovim/files/nvimrc b/app-editors/neovim/files/nvimrc
index 316d867..635fc62 100644
--- a/app-editors/neovim/files/nvimrc
+++ b/app-editors/neovim/files/nvimrc
@@ -6,37 +6,10 @@
 " "/etc/vim/nvimrc.local" file, and on a per-user basis via "~/.nvimrc".
 " You may need to create these.
 
-" {{{ General settings
-" The following are some sensible defaults for Vim for most users.
-set bs=2                " Allow backspacing over everything in insert mode
-set ai                  " Always set auto-indenting on
-set history=50          " keep 50 lines of command history
-set ruler               " Show the cursor position all the time
-set formatoptions+=j    " Delete comment character when joining commented lines
-
-" Don't use Ex mode, use Q for formatting
-map Q gq
-
-" When doing tab completion, give the following files lower priority. You may
-" wish to set 'wildignore' to completely ignore files, and 'wildmenu' to enable
-" enhanced tab completion. These can be done in the user vimrc file.
-set suffixes+=.info,.aux,.log,.dvi,.bbl,.out,.o,.lo
-
-" When displaying line numbers, don't use an annoyingly wide number column. This
-" doesn't enable line numbers -- :set number will do that. The value given is a
-" minimum width to use for the number column, not a fixed size.
-set numberwidth=3
-
-" Use sensible whitespace indicators
-set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+
-" }}}
-
-" {{{ Modeline settings
-" We don't allow modelines by default. See bug #14088 and bug #73715.
-" If you're not concerned about these, you can enable them on a per-user
-" basis by adding "set modeline" to your ~/.vimrc file.
-set nomodeline
-" }}}
+" Neovim comes with sensible defaults, see:
+" https://github.com/neovim/neovim/issues/2676
+" Most of the general settings from Gentoo's vimrc have been dropped here.
+" We add only some necessary fixes and a few Gentoo specific settings.
 
 " {{{ Locale settings
 " If we have a BOM, always honour that rather than trying to guess.
@@ -52,44 +25,6 @@ if &fileencodings !~? "utf-8"
 endif
 " }}}
 
-" {{{ Syntax highlighting settings
-" Switch syntax highlighting on, when the terminal has colors
-" Also switch on highlighting the last used search pattern.
-if &t_Co > 2 || has("gui_running")
-  syntax on
-  set hlsearch
-endif
-" }}}
-
-" {{{ Terminal fixes
-if &term ==? "xterm"
-  set t_Sb=^[4%dm
-  set t_Sf=^[3%dm
-  set ttymouse=xterm2
-endif
-
-if &term ==? "gnome" && has("eval")
-  " Set useful keys that vim doesn't discover via termcap but are in the
-  " builtin xterm termcap. See bug #122562. We use exec to avoid having to
-  " include raw escapes in the file.
-  exec "set <C-Left>=\eO5D"
-  exec "set <C-Right>=\eO5C"
-endif
-" }}}
-
-" {{{ Filetype plugin settings
-" Enable plugin-provided filetype settings, but only if the ftplugin
-" directory exists (which it won't on livecds, for example).
-if isdirectory(expand("$VIMRUNTIME/ftplugin"))
-  filetype plugin on
-
-  " Uncomment the next line (or copy to your ~/.vimrc) for plugin-provided
-  " indent settings. Some people don't like these, so we won't turn them on by
-  " default.
-  " filetype indent on
-endif
-" }}}
-
 " {{{ Fix &shell, see bug #101665.
 if "" == &shell
   if executable("/bin/bash")
@@ -119,22 +54,21 @@ augroup gentoo
   " Note that the rules below are very minimal and don't cover everything.
   " Better to emerge app-vim/gentoo-syntax, which provides full syntax,
   " filetype and indent settings for all things Gentoo.
-  au BufRead,BufNewFile *.e{build,class} let is_bash=1|setfiletype sh
   au BufRead,BufNewFile *.e{build,class} set ts=4 sw=4 noexpandtab
 
   " In text files, limit the width of text to 78 characters, but be careful
   " that we don't override the user's setting.
   autocmd BufNewFile,BufRead *.txt
         \ if &tw == 0 && ! exists("g:leave_my_textwidth_alone") |
-        \     setlocal textwidth=78 |
+        \   setlocal textwidth=78 |
         \ endif
 
   " When editing a file, always jump to the last cursor position
   autocmd BufReadPost *
         \ if ! exists("g:leave_my_cursor_position_alone") |
-        \     if line("'\"") > 0 && line ("'\"") <= line("$") |
-        \         exe "normal g'\"" |
-        \     endif |
+        \   if line("'\"") > 0 && line ("'\"") <= line("$") |
+        \     exe "normal g'\"" |
+        \   endif |
         \ endif
 
   " When editing a crontab file, set backupcopy to yes rather than auto. See
@@ -147,22 +81,25 @@ augroup gentoo
   " Except of course if a byte-order mark is in effect.
   autocmd BufReadPost *
         \ if exists("g:added_fenc_utf8") && &fileencoding == "utf-8" &&
-        \    ! &bomb && search('[\x80-\xFF]','nw') == 0 && &modifiable |
-        \       set fileencoding= |
+        \   ! &bomb && search('[\x80-\xFF]','nw') == 0 && &modifiable |
+        \     set fileencoding= |
         \ endif
 
-augroup END
+  " Strip trailing spaces on write
+  autocmd BufWritePre *.e{build,class}
+        \ if ! exists("g:leave_my_trailing_space_alone") |
+        \   :%s/\s\+$//e |
+        \ endif
 
-" Strip trailing spaces on write
-autocmd BufWritePre * :%s/\s\+$//e
+augroup END
 
 endif " has("autocmd")
 " }}}
 
-" {{{ vimrc.local
+" {{{ nvimrc.local
 if filereadable("/etc/vim/nvimrc.local")
   source /etc/vim/nvimrc.local
 endif
 " }}}
 
-" vim: set fenc=utf-8 tw=80 sw=2 sts=2 et foldmethod=marker :
+" vim: set tw=80 sw=2 sts=2 et foldmethod=marker :