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

[Sam James]

commit:     bd47d534eab9e010022944bf9f9e98aa198a6860
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 00:32:52 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 00:32:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd47d534

app-editors/neovim: rebase Darwin patch

Closes: https://github.com/gentoo/gentoo/pull/25889
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../neovim/files/neovim-9999-cmake-darwin.patch    | 55 ++++++++++++++++++++++
 app-editors/neovim/neovim-9999.ebuild              | 12 +++--
 2 files changed, 64 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
new file mode 100644
index 000000000000..5b829904a13e
--- /dev/null
+++ b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
@@ -0,0 +1,55 @@
+--- 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/cmake.deps/CMakeLists.txt
++++ b/cmake.deps/CMakeLists.txt
+@@ -112,13 +112,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
+--- 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}})

diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 4316da6d93cc..5f18e490acbb 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -68,12 +68,18 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
-	"${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch"
 )
+
 if [[ ${PV} == 9999 ]]; then
-	PATCHES+=("${FILESDIR}/${PN}-9999-cmake_lua_version.patch")
+	PATCHES+=(
+		"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
+		"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
+	)
 else
-	PATCHES+=("${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch")
+	PATCHES+=(
+		"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
+		"${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch"
+	)
 fi
 
 src_prepare() {