* [gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/, app-editors/neovim/
@ 2015-10-25 19:38 Ole Reifschneider
0 siblings, 0 replies; 11+ messages in thread
From: Ole Reifschneider @ 2015-10-25 19:38 UTC (permalink / raw
To: gentoo-commits
commit: 9274f23ab2d62a055f7987f35d00d64d375a6c41
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 25 19:35:27 2015 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sun Oct 25 19:38:43 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9274f23a
app-editors/neovim: Add new snapshot and patch automagic jemalloc dep
Package-Manager: portage-2.2.23
app-editors/neovim/Manifest | 1 +
app-editors/neovim/files/automagic-jemalloc.patch | 35 ++++++++++
app-editors/neovim/metadata.xml | 1 +
app-editors/neovim/neovim-0.0.0_pre20151025.ebuild | 80 ++++++++++++++++++++++
4 files changed, 117 insertions(+)
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 8ea700a..1dbc37f 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -2,3 +2,4 @@ DIST neovim-0.0.0_pre20150627.tar.xz 4715400 SHA256 5e5769c81a60637b731dc13e7584
DIST neovim-0.0.0_pre20150727.tar.xz 4703336 SHA256 da9bd3070ac60691be4e033947548c13b0ede86b2422d66bd207ac2310b735c1 SHA512 db225fff860d730d4514a33c363ed7748949aaeb3a5fb31c0775120d31219a9fad154ff6f457c4ea25aff666e34dc0e7c8ab1acbc3bbe73bed17d01c67d13627 WHIRLPOOL 23b553f6be136f42c7279d332e1c917083d48aa0ae27df949972ce4eae93d07ea301f9b5853d3d320cc4a6366a483f3f9d43e016607d500646c71ea33e5ffdb8
DIST neovim-0.0.0_pre20150814.tar.xz 4718836 SHA256 e7abdb0b3a44ec3c312b06aa825caca4520f1b857045c45c925e8005e2bf3ada SHA512 638e6807929880c2648bd2d0efde509842423488272926bb3ae89a6681144b86fe5137ef313ae102fe8c2fa82819fe96e0dcc0a8d45e3ccaf18b207cf9c1aad1 WHIRLPOOL f1ca40e0bef46da63c466e0fcc51bcf37c57f64009a680f6e51cb1cf3b0d481011dff33957b5da38dfe8d55978c368efe9d905d4f26a272e915470fab239dcff
DIST neovim-0.0.0_pre20151022.tar.xz 4947140 SHA256 8b090b130f6eb47021d872e8e33691cbd6169f7f0650389cfd0a3bfc194bafc5 SHA512 262b37d1937982bd86f436ecc9c055fdbd650a227c7da77d203e26c9a885b32dc584b4b098f7f2bcea31e7fdb40b51c5a7d337ca4b794b0114c1115e642406ea WHIRLPOOL ca6e50a0225bfea9161c2b7432886377e6a9962fdde3f35f8a091fc26b35fb44d87d4a327b56b428dbcee9d91f66fe2365a33b158b92bf1b5cff08d326e91320
+DIST neovim-0.0.0_pre20151025.tar.xz 4947384 SHA256 62b3bd93e0395c3f2d1f829a1e4e444ac081de1acc99114f6ceba7d61a7055a3 SHA512 a0390097cc0cfae401779ddd229a6237fa63522caaa6515dfff025b506b83e2597a10711bae0a1a60770d2a244963aa56af58f734885ce73091a19865a420bf0 WHIRLPOOL becfec39f4aa1a22f48991f17dbca003f38dfa6b085ed6043e34ed7e852217dddd3e4fce4d33873b0385e1b46754ae11db21ce47cbecd12822e5073d38a5fda1
diff --git a/app-editors/neovim/files/automagic-jemalloc.patch b/app-editors/neovim/files/automagic-jemalloc.patch
new file mode 100644
index 0000000..a08fc07
--- /dev/null
+++ b/app-editors/neovim/files/automagic-jemalloc.patch
@@ -0,0 +1,35 @@
+commit bb3c3cbee65ef42b2b3048afae008c719bc2056a
+Author: Ole Reifschneider <mail@ole-reifschneider.de>
+Date: Sat Oct 24 18:48:01 2015 +0200
+
+ Make jemalloc optional
+
+ Don't enable it automagically if it exists
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 348e138..53e3873 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -260,12 +260,16 @@ if((CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN) AND NOT CMAKE_C_COMPILER_ID MA
+ message(FATAL_ERROR "Sanitizers are only supported for Clang.")
+ endif()
+
+-if(CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN)
+- message(STATUS "Sanitizers have been enabled; don't use jemalloc.")
+-else()
+- find_package(JeMalloc)
+- if(JEMALLOC_FOUND)
+- include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIRS})
++option(ENABLE_JEMALLOC "enable jemalloc" OFF)
++
++if (ENABLE_JEMALLOC)
++ if(CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN)
++ message(STATUS "Sanitizers have been enabled; don't use jemalloc.")
++ else()
++ find_package(JeMalloc)
++ if(JEMALLOC_FOUND)
++ include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIRS})
++ endif()
+ endif()
+ endif()
+
diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml
index 4ead8c2..c15da2e 100644
--- a/app-editors/neovim/metadata.xml
+++ b/app-editors/neovim/metadata.xml
@@ -4,6 +4,7 @@
<herd>vim</herd>
<use>
<flag name='nvimpager'>Install nvimpager symlink to less.sh macro</flag>
+ <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
</use>
<upstream>
<remote-id type="github">neovim/neovim</remote-id>
diff --git a/app-editors/neovim/neovim-0.0.0_pre20151025.ebuild b/app-editors/neovim/neovim-0.0.0_pre20151025.ebuild
new file mode 100644
index 0000000..c202ad7
--- /dev/null
+++ b/app-editors/neovim/neovim-0.0.0_pre20151025.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Vim-fork focused on extensibility and agility."
+HOMEPAGE="https://github.com/neovim/neovim"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://github.com/neovim/neovim.git"
+else
+ SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+nvimpager perl python jemalloc"
+
+CDEPEND="dev-lang/luajit:2
+ >=dev-libs/libtermkey-0.17
+ >=dev-libs/libuv-1.2.0
+ >=dev-libs/msgpack-0.6.0_pre20150220
+ >=dev-libs/unibilium-1.1.1
+ dev-libs/libvterm
+ dev-lua/lpeg
+ dev-lua/messagepack
+ jemalloc? ( dev-libs/jemalloc )
+"
+DEPEND="${CDEPEND}
+ virtual/libiconv
+ virtual/libintl"
+RDEPEND="${CDEPEND}
+ perl? ( dev-lang/perl )
+ python? ( dev-python/neovim-python-client )"
+
+src_prepare() {
+ # use our system vim dir
+ sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
+ -i src/nvim/os/unix_defs.h || die
+
+ # add eclass to bash filetypes
+ sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
+
+ # make less.sh macro actually work with neovim
+ sed -e 's|vim |nvim |g' -i runtime/macros/less.sh || die
+
+ # make sure the jemalloc dependency is not automagic
+ epatch "${FILESDIR}"/automagic-jemalloc.patch
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ export USE_BUNDLED_DEPS=OFF
+ append-cflags "-Wno-error"
+ local mycmakeargs=(
+ $(cmake-utils_use_enable jemalloc JEMALLOC)
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
+ -DLIBUNIBILIUM_USE_STATIC=OFF
+ -DLIBTERMKEY_USE_STATIC=OFF
+ -DLIBVTERM_USE_STATIC=OFF
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # install a default configuration file
+ insinto /etc/vim
+ doins "${FILESDIR}"/nvimrc
+
+ # conditionally install a symlink for nvimpager
+ if use nvimpager; then
+ dosym /usr/share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+ fi
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/, app-editors/neovim/
@ 2022-06-01 2:15 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-06-01 2:15 UTC (permalink / raw
To: gentoo-commits
commit: 2f06c41edaa2b6454f430ca85511f25af26c314b
Author: Tianyang Zhou <qsdrqs <AT> gmail <DOT> com>
AuthorDate: Wed Jun 1 01:25:56 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 1 02:15:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f06c41e
app-editors/neovim: fix lua patch for neovim git
Signed-off-by: Tianyang Zhou <qsdrqs <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25714
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-editors/neovim/files/neovim-9999-cmake_lua_version.patch | 11 +++++++++++
app-editors/neovim/neovim-9999.ebuild | 6 +++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch b/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch
new file mode 100644
index 000000000000..d7e01275fb02
--- /dev/null
+++ b/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- 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 EXACT 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/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index f23e7434577b..4316da6d93cc 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -67,10 +67,14 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
"${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")
+else
+ PATCHES+=("${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch")
+fi
src_prepare() {
# Use our system vim dir
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/, app-editors/neovim/
@ 2022-07-05 0:37 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-07-05 0:37 UTC (permalink / raw
To: gentoo-commits
commit: 3601fb65d0a06dbd5f19820609461085532ef9a3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 5 00:37:10 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 5 00:37:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3601fb65
app-editors/neovim: backport Darwin patch to 0.7.2
Closes: https://github.com/gentoo/gentoo/pull/25889
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../neovim/files/neovim-0.7.2-cmake-darwin.patch | 55 ++++++++++++++++++++++
app-editors/neovim/neovim-0.7.2.ebuild | 1 +
app-editors/neovim/neovim-9999.ebuild | 2 +-
3 files changed, 57 insertions(+), 1 deletion(-)
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
new file mode 100644
index 000000000000..a8404bd4a97a
--- /dev/null
+++ b/app-editors/neovim/files/neovim-0.7.2-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/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
diff --git a/app-editors/neovim/neovim-0.7.2.ebuild b/app-editors/neovim/neovim-0.7.2.ebuild
index a340a82ba6a5..0c951d155648 100644
--- a/app-editors/neovim/neovim-0.7.2.ebuild
+++ b/app-editors/neovim/neovim-0.7.2.ebuild
@@ -69,6 +69,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
+ "${FILESDIR}/${PN}-0.7.2-cmake-darwin.patch"
)
src_prepare() {
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 5f18e490acbb..dc40449cb307 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -78,7 +78,7 @@ if [[ ${PV} == 9999 ]]; then
else
PATCHES+=(
"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
- "${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch"
+ "${FILESDIR}/${PN}-0.7.2-cmake-darwin.patch"
)
fi
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/, app-editors/neovim/
@ 2022-10-01 6:33 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-10-01 6:33 UTC (permalink / raw
To: gentoo-commits
commit: 737b23a0af4224a9d02d23ede7f41ab6dbd97319
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 1 06:32:31 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 1 06:33:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=737b23a0
app-editors/neovim: fix respecting CFLAGS; try avoid sandbox violation
- RelWithDebInfo sets -Og -g after our flags. (Made a local hook for now
to try catch these in future, along with -ffast-math, although that wasn't
being set here.)
- Use xdg_environment_reset to try avoid sandbox issues (see
https://forums.gentoo.org/viewtopic-p-8750050.html).
Also sent a patch to gentoo-dev ML for adding XDG_STATE_HOME to
the unset/reset list for the eclass.
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../neovim/files/neovim-9999-cmake-release-type.patch | 15 +++++++++++++++
.../{neovim-0.8.0.ebuild => neovim-0.8.0-r1.ebuild} | 5 ++++-
app-editors/neovim/neovim-9999.ebuild | 5 ++++-
3 files changed, 23 insertions(+), 2 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 1d7fb56b51c8..8114e2a92b74 100644
--- a/app-editors/neovim/files/neovim-9999-cmake-release-type.patch
+++ b/app-editors/neovim/files/neovim-9999-cmake-release-type.patch
@@ -11,3 +11,18 @@ https://bugs.gentoo.org/757744
call health#report_ok(buildtype)
else
call health#report_info(buildtype)
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -137,12 +137,6 @@ else()
+ message(STATUS "MIN_LOG_LEVEL=${MIN_LOG_LEVEL}")
+ endif()
+
+-# Default to -O2 on release builds.
+-if(CMAKE_C_FLAGS_RELEASE MATCHES "-O3")
+- message(STATUS "Replacing -O3 in CMAKE_C_FLAGS_RELEASE with -O2")
+- string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+-endif()
+-
+ if(CMAKE_C_COMPILER_ID MATCHES "GNU")
+ check_c_compiler_flag(-Og HAS_OG_FLAG)
+ else()
diff --git a/app-editors/neovim/neovim-0.8.0.ebuild b/app-editors/neovim/neovim-0.8.0-r1.ebuild
similarity index 96%
rename from app-editors/neovim/neovim-0.8.0.ebuild
rename to app-editors/neovim/neovim-0.8.0-r1.ebuild
index 2e5948e10f45..fe675b291f83 100644
--- a/app-editors/neovim/neovim-0.8.0.ebuild
+++ b/app-editors/neovim/neovim-0.8.0-r1.ebuild
@@ -3,8 +3,9 @@
EAPI=8
+# RelWithDebInfo sets -Og -g
+CMAKE_BUILD_TYPE=Release
LUA_COMPAT=( lua5-{1..2} luajit )
-
inherit cmake lua-single optfeature xdg
DESCRIPTION="Vim-fork focused on extensibility and agility"
@@ -88,6 +89,8 @@ src_prepare() {
sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
-i src/nvim/globals.h || die
+ # https://forums.gentoo.org/viewtopic-p-8750050.html
+ xdg_environment_reset
cmake_src_prepare
}
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 2e5948e10f45..fe675b291f83 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -3,8 +3,9 @@
EAPI=8
+# RelWithDebInfo sets -Og -g
+CMAKE_BUILD_TYPE=Release
LUA_COMPAT=( lua5-{1..2} luajit )
-
inherit cmake lua-single optfeature xdg
DESCRIPTION="Vim-fork focused on extensibility and agility"
@@ -88,6 +89,8 @@ src_prepare() {
sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
-i src/nvim/globals.h || die
+ # https://forums.gentoo.org/viewtopic-p-8750050.html
+ xdg_environment_reset
cmake_src_prepare
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/, app-editors/neovim/
@ 2023-02-10 6:55 Vadim Misbakh-Soloviov
0 siblings, 0 replies; 11+ messages in thread
From: Vadim Misbakh-Soloviov @ 2023-02-10 6:55 UTC (permalink / raw
To: gentoo-commits
commit: 830936a8e77ec7e9ffd2692a54cfc01fd806987f
Author: Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 10 06:03:49 2023 +0000
Commit: Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 06:52:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=830936a8
app-editors/neovim: fixes for 9999 (see details)
1) lua-version and darwin patches for 9999 are fixed to not fail
2) no more tui confirguration option on 9999, see
https://github.com/neovim/neovim/commit/9fdcbbb4063daa125e420e0ffe9dae6801c264bc
3) ebuilds for 0.8 versions fixed to use their own copy of patches,
instead of using 9999 patches (see commit 726e8ac1afe)
Signed-off-by: Vadim Misbakh-Soloviov <mva <AT> gentoo.org>
...-darwin.patch => neovim-0.8-cmake-darwin.patch} | 0
...on.patch => neovim-0.8-cmake_lua_version.patch} | 0
.../neovim/files/neovim-9999-cmake-darwin.patch | 62 ++--------------------
.../files/neovim-9999-cmake_lua_version.patch | 12 ++---
app-editors/neovim/neovim-0.8.2.ebuild | 4 +-
app-editors/neovim/neovim-0.8.3.ebuild | 4 +-
6 files changed, 15 insertions(+), 67 deletions(-)
diff --git a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch b/app-editors/neovim/files/neovim-0.8-cmake-darwin.patch
similarity index 100%
copy from app-editors/neovim/files/neovim-9999-cmake-darwin.patch
copy to app-editors/neovim/files/neovim-0.8-cmake-darwin.patch
diff --git a/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch b/app-editors/neovim/files/neovim-0.8-cmake_lua_version.patch
similarity index 100%
copy from app-editors/neovim/files/neovim-9999-cmake_lua_version.patch
copy to app-editors/neovim/files/neovim-0.8-cmake_lua_version.patch
diff --git a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
index ad47a46e1a7a..b2920451743d 100644
--- a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
+++ b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
@@ -1,65 +1,13 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,33 +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)
--
-- # If the macOS deployment target is not set manually (via $MACOSX_DEPLOYMENT_TARGET),
-- # fall back to local system version. Needs to be done both here and in cmake.deps.
-- if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-- execute_process(COMMAND sw_vers -productVersion
-- OUTPUT_VARIABLE MACOS_VERSION
-- OUTPUT_STRIP_TRAILING_WHITESPACE)
-- set(CMAKE_OSX_DEPLOYMENT_TARGET "${MACOS_VERSION}")
-- endif()
-- message("Using deployment target ${CMAKE_OSX_DEPLOYMENT_TARGET}")
--
-- # 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")
-- 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
-@@ -181,10 +181,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES)
- foreach(gen_include ${gen_includes} ${LUA_PREFERRED_INCLUDE_DIRS})
+@@ -440,10 +440,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES)
+ foreach(gen_include ${prop})
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}})
+ set(gen_cflags ${gen_cflags} -O2)
+
+ set(NVIM_VERSION_GIT_H ${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef_git.h)
diff --git a/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch b/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch
index 87a898032493..b14b3b992349 100644
--- a/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch
+++ b/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch
@@ -1,11 +1,11 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
+--- a/src/nvim/CMakeLists.txt
++++ b/src/nvim/CMakeLists.txt
@@ -464,7 +464,7 @@ endif()
+ # The unit test lib requires LuaJIT; it will be skipped if LuaJIT is missing.
option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF)
-
if(PREFER_LUA)
- find_package(Lua 5.1 EXACT 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.
+ target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LUA_INCLUDE_DIR})
+ target_link_libraries(main_lib INTERFACE ${LUA_LIBRARIES})
+ # Passive (not REQUIRED): if LUAJIT_FOUND is not set, fixtures for unittests is skipped.
diff --git a/app-editors/neovim/neovim-0.8.2.ebuild b/app-editors/neovim/neovim-0.8.2.ebuild
index 46c61e58ef5a..30a9cc0855a1 100644
--- a/app-editors/neovim/neovim-0.8.2.ebuild
+++ b/app-editors/neovim/neovim-0.8.2.ebuild
@@ -69,8 +69,8 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
- "${FILESDIR}/${PN}-9999-cmake-darwin.patch"
+ "${FILESDIR}/${PN}-0.8-cmake_lua_version.patch"
+ "${FILESDIR}/${PN}-0.8-cmake-darwin.patch"
)
if [[ ${PV} != 9999 ]]; then
diff --git a/app-editors/neovim/neovim-0.8.3.ebuild b/app-editors/neovim/neovim-0.8.3.ebuild
index 3b3878d8fc9c..f8fb77103051 100644
--- a/app-editors/neovim/neovim-0.8.3.ebuild
+++ b/app-editors/neovim/neovim-0.8.3.ebuild
@@ -69,8 +69,8 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
- "${FILESDIR}/${PN}-9999-cmake-darwin.patch"
+ "${FILESDIR}/${PN}-0.8-cmake_lua_version.patch"
+ "${FILESDIR}/${PN}-0.8-cmake-darwin.patch"
)
if [[ ${PV} != 9999 ]]; then
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/, app-editors/neovim/
@ 2023-03-31 18:05 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-03-31 18:05 UTC (permalink / raw
To: gentoo-commits
commit: 5770020d8b47aa058d907686f75b4d1680815b30
Author: brahmajit das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Fri Mar 31 17:07:20 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 18:04:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5770020d
app-editors/neovim: Fix build failure with msgpack-6.0.0
Closes: https://bugs.gentoo.org/903629
Signed-off-by: brahmajit das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30422
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/neovim-0.8-msgpack-6.0.0-fix.patch | 26 ++++++++++++++++++++++
app-editors/neovim/neovim-0.8.2.ebuild | 1 +
app-editors/neovim/neovim-0.8.3.ebuild | 1 +
3 files changed, 28 insertions(+)
diff --git a/app-editors/neovim/files/neovim-0.8-msgpack-6.0.0-fix.patch b/app-editors/neovim/files/neovim-0.8-msgpack-6.0.0-fix.patch
new file mode 100644
index 000000000000..ce5f7bb86dc4
--- /dev/null
+++ b/app-editors/neovim/files/neovim-0.8-msgpack-6.0.0-fix.patch
@@ -0,0 +1,26 @@
+# https://github.com/neovim/neovim/commit/46c4cbced567f5f05f2c95b91cd90084ea8b5528
+# Closes: https://bugs.gentoo.org/903629
+# Contributed by Olivier Huber <oli.huber@gmail.com>
+--- a/cmake/FindMsgpack.cmake
++++ b/cmake/FindMsgpack.cmake
+@@ -26,18 +26,8 @@
+ set(MSGPACK_VERSION_STRING)
+ endif()
+
+-if(MSVC)
+- # The import library for the msgpack DLL has a different name
+- list(APPEND MSGPACK_NAMES msgpackc_import)
+-else()
+- list(APPEND MSGPACK_NAMES msgpackc msgpack)
+-endif()
+-
+-find_library(MSGPACK_LIBRARY NAMES ${MSGPACK_NAMES}
+- # Check each directory for all names to avoid using headers/libraries from
+- # different places.
+- NAMES_PER_DIR
+- HINTS ${PC_MSGPACK_LIBDIR} ${PC_MSGPACK_LIBRARY_DIRS})
++find_library(MSGPACK_LIBRARY NAMES msgpackc msgpack msgpackc_import msgpack-c
++ NAMES_PER_DIR)
+
+ mark_as_advanced(MSGPACK_INCLUDE_DIR MSGPACK_LIBRARY)
+
diff --git a/app-editors/neovim/neovim-0.8.2.ebuild b/app-editors/neovim/neovim-0.8.2.ebuild
index 30a9cc0855a1..68e7c6e9f33e 100644
--- a/app-editors/neovim/neovim-0.8.2.ebuild
+++ b/app-editors/neovim/neovim-0.8.2.ebuild
@@ -71,6 +71,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-0.8-cmake_lua_version.patch"
"${FILESDIR}/${PN}-0.8-cmake-darwin.patch"
+ "${FILESDIR}/${PN}-0.8-msgpack-6.0.0-fix.patch"
)
if [[ ${PV} != 9999 ]]; then
diff --git a/app-editors/neovim/neovim-0.8.3.ebuild b/app-editors/neovim/neovim-0.8.3.ebuild
index 7accf336c721..4a155f092263 100644
--- a/app-editors/neovim/neovim-0.8.3.ebuild
+++ b/app-editors/neovim/neovim-0.8.3.ebuild
@@ -71,6 +71,7 @@ BDEPEND+="
PATCHES=(
"${FILESDIR}/${PN}-0.8-cmake_lua_version.patch"
"${FILESDIR}/${PN}-0.8-cmake-darwin.patch"
+ "${FILESDIR}/${PN}-0.8-msgpack-6.0.0-fix.patch"
)
if [[ ${PV} != 9999 ]]; then
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/, app-editors/neovim/
@ 2023-04-10 2:50 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-04-10 2:50 UTC (permalink / raw
To: gentoo-commits
commit: 16878a79858814d50abfddb4e4668005d162dc2e
Author: brahmajit das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Fri Apr 7 16:20:26 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 02:50:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16878a79
app-editors/neovim: Using 0.9.0 patches for live ebuild
This also removes older 9999 patches to remove rudundancy.
Signed-off-by: brahmajit das <brahmajit.xyz <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-editors/neovim/files/neovim-9999-cmake-darwin.patch | 13 -------------
.../neovim/files/neovim-9999-cmake_lua_version.patch | 11 -----------
app-editors/neovim/neovim-9999.ebuild | 11 +++--------
3 files changed, 3 insertions(+), 32 deletions(-)
diff --git a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
deleted file mode 100644
index cba966a4ebfa..000000000000
--- a/app-editors/neovim/files/neovim-9999-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)
diff --git a/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch b/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch
deleted file mode 100644
index b14b3b992349..000000000000
--- a/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/nvim/CMakeLists.txt
-+++ b/src/nvim/CMakeLists.txt
-@@ -464,7 +464,7 @@ endif()
- # The unit test lib requires LuaJIT; it will be skipped if LuaJIT is missing.
- option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF)
- if(PREFER_LUA)
-- find_package(Lua 5.1 EXACT REQUIRED)
-+ find_package(Lua ${PREFER_LUA} EXACT REQUIRED)
- target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LUA_INCLUDE_DIR})
- target_link_libraries(main_lib INTERFACE ${LUA_LIBRARIES})
- # Passive (not REQUIRED): if LUAJIT_FOUND is not set, fixtures for unittests is skipped.
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 75c83337a13a..74754842445c 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -69,16 +69,11 @@ BDEPEND+="
"
PATCHES=(
- "${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
- "${FILESDIR}/${PN}-9999-cmake-darwin.patch"
+ "${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch"
+ "${FILESDIR}/${PN}-0.9.0-cmake-darwin.patch"
+ "${FILESDIR}/${PN}-0.9.0-cmake-release-type.patch"
)
-if [[ ${PV} != 9999 ]]; then
- PATCHES+=(
- "${FILESDIR}/${PN}-0.8.0-cmake-release-type.patch"
- )
-fi
-
src_prepare() {
# Use our system vim dir
sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/, app-editors/neovim/
@ 2023-04-10 2:50 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-04-10 2:50 UTC (permalink / raw
To: gentoo-commits
commit: 979e5e38c70d6e57429a205dfe80c6872b64bbde
Author: brahmajit das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Fri Apr 7 16:17:21 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 02:50:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=979e5e38
app-editors/neovim: Version bump to 0.9.0
Signed-off-by: brahmajit das <brahmajit.xyz <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-editors/neovim/Manifest | 1 +
.../neovim/files/neovim-0.9.0-cmake-darwin.patch | 13 +++
.../files/neovim-0.9.0-cmake-release-type.patch | 17 +++
.../files/neovim-0.9.0-cmake_lua_version.patch | 11 ++
app-editors/neovim/neovim-0.9.0.ebuild | 124 +++++++++++++++++++++
5 files changed, 166 insertions(+)
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 6120b89fc034..79f0bc75cae0 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,2 +1,3 @@
DIST neovim-0.8.2.tar.gz 11401444 BLAKE2B 2b652e98fa68c64f547777396726b80c28493841f2ec5acc01ef5dd659f0babce0baf3d5575cec1d08dd924b1855b21f13b75d2de9d117fcc125b1ec7945376e SHA512 f6c9ad09618c9f8ebb4fe522f55fd3381cc4b6d079d912a0d2ef6ca5f48ed6c4c66805c14695469e2b3d2be2266a9b60e5fc698116cd655fd92ef0f4705fdbb2
DIST neovim-0.8.3.tar.gz 11406282 BLAKE2B 67f4d4d1857e4c0416639dd0986f34b3842883ef48b68d90704472b40f1f064798f1f5f3c29e485f04ef8b2ed387132549442e86624b43f2ababff05bc477312 SHA512 0ecf60b564a323eb95eb2e67f7dc7e1c1e7bfc70b08466a66eb668d1b75a7362ca42901cd5a64fda22292375e2921ba61c299ac846f820ac146dc55426813eb8
+DIST neovim-0.9.0.tar.gz 11549103 BLAKE2B f07b61f02a11acf678358999ea364b6a64724451a9a75f2d6ca436edc5ead9c6422f1c7e99c4322dc0bb92daacf306e32e214ab34d10f78f28d4ffad17b878c7 SHA512 e42f09f408b83fc34e8f169321e0349d1f851e67a998265c53d2ddb1a4792c3f4777fabe32baf2c7eff7d3745ff60d4a07da542ccd272883f7f4e080b2c9c1bf
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
new file mode 100644
index 000000000000..cba966a4ebfa
--- /dev/null
+++ b/app-editors/neovim/files/neovim-0.9.0-cmake-darwin.patch
@@ -0,0 +1,13 @@
+--- 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)
diff --git a/app-editors/neovim/files/neovim-0.9.0-cmake-release-type.patch b/app-editors/neovim/files/neovim-0.9.0-cmake-release-type.patch
new file mode 100644
index 000000000000..b6026437f7bf
--- /dev/null
+++ b/app-editors/neovim/files/neovim-0.9.0-cmake-release-type.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 521ef93..a637866 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -114,12 +114,6 @@ set(NVIM_API_LEVEL 11) # Bump this after any API change.
+ set(NVIM_API_LEVEL_COMPAT 0) # Adjust this after a _breaking_ API change.
+ set(NVIM_API_PRERELEASE false)
+
+-# Default to -O2 on release builds.
+-if(CMAKE_C_FLAGS_RELEASE MATCHES "-O3")
+- message(STATUS "Replacing -O3 in CMAKE_C_FLAGS_RELEASE with -O2")
+- string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+-endif()
+-
+ # Build-type: RelWithDebInfo
+
+ # /Og means something different in MSVC
diff --git a/app-editors/neovim/files/neovim-0.9.0-cmake_lua_version.patch b/app-editors/neovim/files/neovim-0.9.0-cmake_lua_version.patch
new file mode 100644
index 000000000000..b14b3b992349
--- /dev/null
+++ b/app-editors/neovim/files/neovim-0.9.0-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- a/src/nvim/CMakeLists.txt
++++ b/src/nvim/CMakeLists.txt
+@@ -464,7 +464,7 @@ endif()
+ # The unit test lib requires LuaJIT; it will be skipped if LuaJIT is missing.
+ option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF)
+ if(PREFER_LUA)
+- find_package(Lua 5.1 EXACT REQUIRED)
++ find_package(Lua ${PREFER_LUA} EXACT REQUIRED)
+ target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LUA_INCLUDE_DIR})
+ target_link_libraries(main_lib INTERFACE ${LUA_LIBRARIES})
+ # Passive (not REQUIRED): if LUAJIT_FOUND is not set, fixtures for unittests is skipped.
diff --git a/app-editors/neovim/neovim-0.9.0.ebuild b/app-editors/neovim/neovim-0.9.0.ebuild
new file mode 100644
index 000000000000..74754842445c
--- /dev/null
+++ b/app-editors/neovim/neovim-0.9.0.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# RelWithDebInfo sets -Og -g
+CMAKE_BUILD_TYPE=Release
+LUA_COMPAT=( lua5-{1..2} luajit )
+inherit cmake lua-single optfeature xdg
+
+DESCRIPTION="Vim-fork focused on extensibility and agility"
+HOMEPAGE="https://neovim.io"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/neovim/neovim.git"
+else
+ SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+lto +nvimpager test +tui"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+# Upstream say the test library needs LuaJIT
+# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
+REQUIRED_USE="test? ( lua_single_target_luajit )"
+# TODO: Get tests running
+RESTRICT="!test? ( test ) test"
+
+# Upstream build scripts invoke the Lua interpreter
+BDEPEND="${LUA_DEPS}
+ >=dev-util/gperf-3.1
+ >=sys-devel/gettext-0.20.1
+ virtual/libiconv
+ virtual/libintl
+ virtual/pkgconfig
+"
+# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for
+# new dependency bounds and so on on bumps (obviously adjust for right branch/tag).
+DEPEND="${LUA_DEPS}
+ >=dev-lua/luv-1.44.2[${LUA_SINGLE_USEDEP}]
+ $(lua_gen_cond_dep '
+ dev-lua/lpeg[${LUA_USEDEP}]
+ dev-lua/mpack[${LUA_USEDEP}]
+ ')
+ $(lua_gen_cond_dep '
+ dev-lua/LuaBitOp[${LUA_USEDEP}]
+ ' lua5-{1,2})
+ >=dev-libs/libuv-1.44.2:=
+ >=dev-libs/libvterm-0.3
+ >=dev-libs/msgpack-3.0.0:=
+ >=dev-libs/tree-sitter-0.20.8:=
+ tui? (
+ >=dev-libs/libtermkey-0.22
+ >=dev-libs/unibilium-2.0.0:0=
+ )
+"
+RDEPEND="
+ ${DEPEND}
+ app-eselect/eselect-vi
+"
+BDEPEND+="
+ test? (
+ $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch"
+ "${FILESDIR}/${PN}-0.9.0-cmake-darwin.patch"
+ "${FILESDIR}/${PN}-0.9.0-cmake-release-type.patch"
+)
+
+src_prepare() {
+ # Use our system vim dir
+ sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
+ -i src/nvim/globals.h || die
+
+ # https://forums.gentoo.org/viewtopic-p-8750050.html
+ xdg_environment_reset
+ cmake_src_prepare
+}
+
+src_configure() {
+ # Upstream default to LTO on non-debug builds
+ # Let's expose it as a USE flag because upstream
+ # have preferences for how we should use LTO
+ # if we want it on (not just -flto)
+ # ... but allow turning it off.
+ # TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
+ local mycmakeargs=(
+ -DENABLE_LTO=$(usex lto)
+ -DFEAT_TUI=$(usex tui)
+ -DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
+ -DLUA_PRG="${ELUA}"
+ -DMIN_LOG_LEVEL=3
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # install a default configuration file
+ insinto /etc/vim
+ doins "${FILESDIR}"/sysinit.vim
+
+ # conditionally install a symlink for nvimpager
+ if use nvimpager; then
+ dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
+ optfeature "Python plugin support" dev-python/pynvim
+ optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
+ optfeature "remote/nvr support" dev-python/neovim-remote
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/, app-editors/neovim/
@ 2023-05-31 5:49 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-05-31 5:49 UTC (permalink / raw
To: gentoo-commits
commit: b858300166fa8248eda22416387c8d0b0d182a11
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Mon May 29 11:48:30 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 31 05:49:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8583001
app-editors/neovim: add 0.9.1
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-editors/neovim/Manifest | 1 +
.../neovim/files/neovim-0.9.1-cmake-darwin.patch | 14 +++
app-editors/neovim/neovim-0.9.1.ebuild | 120 +++++++++++++++++++++
3 files changed, 135 insertions(+)
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 19932048a1de..e17ae435cf0f 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,2 +1,3 @@
DIST neovim-0.8.3.tar.gz 11406282 BLAKE2B 67f4d4d1857e4c0416639dd0986f34b3842883ef48b68d90704472b40f1f064798f1f5f3c29e485f04ef8b2ed387132549442e86624b43f2ababff05bc477312 SHA512 0ecf60b564a323eb95eb2e67f7dc7e1c1e7bfc70b08466a66eb668d1b75a7362ca42901cd5a64fda22292375e2921ba61c299ac846f820ac146dc55426813eb8
DIST neovim-0.9.0.tar.gz 11549103 BLAKE2B f07b61f02a11acf678358999ea364b6a64724451a9a75f2d6ca436edc5ead9c6422f1c7e99c4322dc0bb92daacf306e32e214ab34d10f78f28d4ffad17b878c7 SHA512 e42f09f408b83fc34e8f169321e0349d1f851e67a998265c53d2ddb1a4792c3f4777fabe32baf2c7eff7d3745ff60d4a07da542ccd272883f7f4e080b2c9c1bf
+DIST neovim-0.9.1.tar.gz 11567358 BLAKE2B 7aa56c672f7d26db7d47df39941487de32008b9e78921d71860281e8319b30dc6cd889a029c83b61814baecac947f39a950245ed7e51c35509b30e9b39046a58 SHA512 339efd3d8c1a73aa3b43e8770d6943aeba9e4ce6a3598c0424e388f80759d50b14aa7c60fd435bf2d17997476e06d28b79e7e98670d02ca9ceec031841e8b9b8
diff --git a/app-editors/neovim/files/neovim-0.9.1-cmake-darwin.patch b/app-editors/neovim/files/neovim-0.9.1-cmake-darwin.patch
new file mode 100644
index 000000000000..1488148298bd
--- /dev/null
+++ b/app-editors/neovim/files/neovim-0.9.1-cmake-darwin.patch
@@ -0,0 +1,14 @@
+--- a/src/nvim/CMakeLists.txt
++++ b/src/nvim/CMakeLists.txt
+@@ -415,11 +415,7 @@ foreach(gen_include ${prop})
+ list(APPEND gen_cflags "-I${gen_include}")
+ endforeach()
+ endforeach()
+
+-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)
diff --git a/app-editors/neovim/neovim-0.9.1.ebuild b/app-editors/neovim/neovim-0.9.1.ebuild
new file mode 100644
index 000000000000..36905669dd9e
--- /dev/null
+++ b/app-editors/neovim/neovim-0.9.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# RelWithDebInfo sets -Og -g
+CMAKE_BUILD_TYPE=Release
+LUA_COMPAT=( lua5-{1..2} luajit )
+inherit cmake lua-single optfeature xdg
+
+DESCRIPTION="Vim-fork focused on extensibility and agility"
+HOMEPAGE="https://neovim.io"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/neovim/neovim.git"
+else
+ SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+lto +nvimpager test"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+# Upstream say the test library needs LuaJIT
+# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
+REQUIRED_USE="test? ( lua_single_target_luajit )"
+# TODO: Get tests running
+RESTRICT="!test? ( test ) test"
+
+# Upstream build scripts invoke the Lua interpreter
+BDEPEND="${LUA_DEPS}
+ >=dev-util/gperf-3.1
+ >=sys-devel/gettext-0.20.1
+ virtual/libiconv
+ virtual/libintl
+ virtual/pkgconfig
+"
+# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for
+# new dependency bounds and so on on bumps (obviously adjust for right branch/tag).
+DEPEND="${LUA_DEPS}
+ >=dev-lua/luv-1.44.2[${LUA_SINGLE_USEDEP}]
+ $(lua_gen_cond_dep '
+ dev-lua/lpeg[${LUA_USEDEP}]
+ dev-lua/mpack[${LUA_USEDEP}]
+ ')
+ $(lua_gen_cond_dep '
+ dev-lua/LuaBitOp[${LUA_USEDEP}]
+ ' lua5-{1,2})
+ >=dev-libs/libuv-1.44.2:=
+ >=dev-libs/libvterm-0.3
+ >=dev-libs/msgpack-3.0.0:=
+ >=dev-libs/tree-sitter-0.20.8:=
+ >=dev-libs/libtermkey-0.22
+ >=dev-libs/unibilium-2.0.0:0=
+"
+RDEPEND="
+ ${DEPEND}
+ app-eselect/eselect-vi
+"
+BDEPEND+="
+ test? (
+ $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch"
+ "${FILESDIR}/${PN}-0.9.1-cmake-darwin.patch"
+ "${FILESDIR}/${PN}-0.9.0-cmake-release-type.patch"
+)
+
+src_prepare() {
+ # Use our system vim dir
+ sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
+ -i src/nvim/globals.h || die
+
+ # https://forums.gentoo.org/viewtopic-p-8750050.html
+ xdg_environment_reset
+ cmake_src_prepare
+}
+
+src_configure() {
+ # Upstream default to LTO on non-debug builds
+ # Let's expose it as a USE flag because upstream
+ # have preferences for how we should use LTO
+ # if we want it on (not just -flto)
+ # ... but allow turning it off.
+ # TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
+ local mycmakeargs=(
+ -DENABLE_LTO=$(usex lto)
+ -DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
+ -DLUA_PRG="${ELUA}"
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # install a default configuration file
+ insinto /etc/vim
+ doins "${FILESDIR}"/sysinit.vim
+
+ # conditionally install a symlink for nvimpager
+ if use nvimpager; then
+ dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
+ optfeature "Python plugin support" dev-python/pynvim
+ optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
+ optfeature "remote/nvr support" dev-python/neovim-remote
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/, app-editors/neovim/
@ 2023-05-31 5:50 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-05-31 5:50 UTC (permalink / raw
To: gentoo-commits
commit: 6ace49a07d09eacae4ff87b9b254c967c2d0f546
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 31 05:50:40 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 31 05:50:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ace49a0
app-editors/neovim: fix DuplicateFiles
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-editors/neovim/files/neovim-9999-cmake-darwin.patch | 14 --------------
app-editors/neovim/neovim-9999.ebuild | 2 +-
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
deleted file mode 100644
index 1488148298bd..000000000000
--- a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/nvim/CMakeLists.txt
-+++ b/src/nvim/CMakeLists.txt
-@@ -415,11 +415,7 @@ foreach(gen_include ${prop})
- list(APPEND gen_cflags "-I${gen_include}")
- endforeach()
- endforeach()
-
--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)
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 0bae751e05f7..154062cd1320 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -68,7 +68,7 @@ BDEPEND+="
PATCHES=(
"${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch"
- "${FILESDIR}/${PN}-9999-cmake-darwin.patch"
+ "${FILESDIR}/${PN}-0.9.1-cmake-darwin.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/, app-editors/neovim/
@ 2023-11-21 21:11 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-11-21 21:11 UTC (permalink / raw
To: gentoo-commits
commit: 974e1883f6ad1d910a4778850a3378c327dadeec
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Tue Nov 21 06:20:57 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 21:09:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=974e1883
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/33924
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-editors/neovim/files/neovim-9999-cmake-darwin.patch | 13 +++++++++++++
app-editors/neovim/neovim-9999.ebuild | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
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() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-11-21 21:11 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-10 2:50 [gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/, app-editors/neovim/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-11-21 21:11 Sam James
2023-05-31 5:50 Sam James
2023-05-31 5:49 Sam James
2023-04-10 2:50 Sam James
2023-03-31 18:05 Sam James
2023-02-10 6:55 Vadim Misbakh-Soloviov
2022-10-01 6:33 Sam James
2022-07-05 0:37 Sam James
2022-06-01 2:15 Sam James
2015-10-25 19:38 Ole Reifschneider
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox