summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrahmajit Das <brahmajit.xyz@gmail.com>2023-11-21 11:50:57 +0530
committerSam James <sam@gentoo.org>2023-11-21 21:09:55 +0000
commit974e1883f6ad1d910a4778850a3378c327dadeec (patch)
tree6a9935c56cd982dc6eb30b4de83523ea304e7857 /app-editors
parentdev-libs/tree-sitter-meta: tree-sitter-meta is not a grammar (diff)
downloadgentoo-974e1883f6ad1d910a4778850a3378c327dadeec.tar.gz
gentoo-974e1883f6ad1d910a4778850a3378c327dadeec.tar.bz2
gentoo-974e1883f6ad1d910a4778850a3378c327dadeec.zip
app-editors/neovim: Rebase patch from upstream
Closes: https://bugs.gentoo.org/917665 Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/33924 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/neovim/files/neovim-9999-cmake-darwin.patch13
-rw-r--r--app-editors/neovim/neovim-9999.ebuild2
2 files changed, 14 insertions, 1 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..892d349b7e1c
--- /dev/null
+++ b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
@@ -0,0 +1,13 @@
+--- a/src/nvim/CMakeLists.txt
++++ b/src/nvim/CMakeLists.txt
+@@ -416,10 +416,6 @@ foreach(target ${targets})
+ endforeach()
+ endforeach()
+
+-if(APPLE AND CMAKE_OSX_SYSROOT)
+- list(APPEND gen_cflags "-isysroot")
+- list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}")
+-endif()
+ if(MSVC)
+ list(APPEND gen_cflags -wd4003)
+ endif()
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 7af8db556a56..41b10f5d0a92 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -67,7 +67,7 @@ BDEPEND+="
PATCHES=(
"${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch"
- "${FILESDIR}/${PN}-0.9.1-cmake-darwin.patch"
+ "${FILESDIR}/${PN}-9999-cmake-darwin.patch"
)
src_prepare() {