commit: 782858d054b00b6bfa1d42e46790afc1fb497326 Author: Brahmajit Das <listout <AT> listout <DOT> xyz> AuthorDate: Sun Apr 13 15:42:24 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Apr 13 20:59:07 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=782858d0
app-editors/neovim: Fix garbled display, error messages from plugins Make neovim >= 0.11.0 dependen on dev-libs/libutf8proc[-cjk] Neovim uses the newly added ambiguous_width property[0] and utf8proc_charwidth_ambiguous[1] function from dev-libs/libutf8proc. This conflicts with the current modifications for cjk we have in ::gentoo for dev-libs/libutf8proc resulting in the garbled display and error messages from plugins. [0]: https://github.com/neovim/neovim/blob/v0.11.0/src/nvim/mbyte.c#L474-L487 [1]: https://github.com/neovim/neovim/blob/v0.11.0/src/nvim/mbyte.c#L1355-L1358 Also update live ebuild to match most recent ebuild i.e. 0.11.0 Closes: https://bugs.gentoo.org/952944 Signed-off-by: Brahmajit Das <listout <AT> listout.xyz> Closes: https://github.com/gentoo/gentoo/pull/41576 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{neovim-9999.ebuild => neovim-0.11.0-r1.ebuild} | 20 ++++++++++---------- app-editors/neovim/neovim-9999.ebuild | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-0.11.0-r1.ebuild similarity index 90% copy from app-editors/neovim/neovim-9999.ebuild copy to app-editors/neovim/neovim-0.11.0-r1.ebuild index 53c660946d05..92ad4e2b9aa0 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-0.11.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -41,7 +41,7 @@ BDEPEND="${LUA_DEPS} # new dependency bounds and so on on bumps (obviously adjust for right branch/tag). # List of required tree-sitter parsers is taken from cmake.deps/deps.txt DEPEND="${LUA_DEPS} - >=dev-lua/luv-1.45.0[${LUA_SINGLE_USEDEP}] + >=dev-lua/luv-1.50.0[${LUA_SINGLE_USEDEP}] $(lua_gen_cond_dep ' dev-lua/lpeg[${LUA_USEDEP}] dev-lua/mpack[${LUA_USEDEP}] @@ -49,18 +49,18 @@ DEPEND="${LUA_DEPS} $(lua_gen_cond_dep ' dev-lua/LuaBitOp[${LUA_USEDEP}] ' lua5-{1,2}) - >=dev-libs/libutf8proc-2.9.0:= - >=dev-libs/libuv-1.46.0:= + >=dev-libs/libutf8proc-2.10.0:=[-cjk] + >=dev-libs/libuv-1.50.0:= >=dev-libs/libvterm-0.3.3 >=dev-libs/msgpack-3.0.0:= - >=dev-libs/tree-sitter-0.24.3:= + >=dev-libs/tree-sitter-0.25.3:= =dev-libs/tree-sitter-c-0.23* - =dev-libs/tree-sitter-lua-0.2* - =dev-libs/tree-sitter-markdown-0.3* - =dev-libs/tree-sitter-query-0.4* - =dev-libs/tree-sitter-vim-0.4* + =dev-libs/tree-sitter-lua-0.3* + =dev-libs/tree-sitter-markdown-0.4* + =dev-libs/tree-sitter-query-0.5* + =dev-libs/tree-sitter-vim-0.5* =dev-libs/tree-sitter-vimdoc-3* - >=dev-libs/unibilium-2.0.0:0= + >=dev-libs/unibilium-2.1.2:0= " RDEPEND=" ${DEPEND} diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild index 53c660946d05..92ad4e2b9aa0 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -41,7 +41,7 @@ BDEPEND="${LUA_DEPS} # new dependency bounds and so on on bumps (obviously adjust for right branch/tag). # List of required tree-sitter parsers is taken from cmake.deps/deps.txt DEPEND="${LUA_DEPS} - >=dev-lua/luv-1.45.0[${LUA_SINGLE_USEDEP}] + >=dev-lua/luv-1.50.0[${LUA_SINGLE_USEDEP}] $(lua_gen_cond_dep ' dev-lua/lpeg[${LUA_USEDEP}] dev-lua/mpack[${LUA_USEDEP}] @@ -49,18 +49,18 @@ DEPEND="${LUA_DEPS} $(lua_gen_cond_dep ' dev-lua/LuaBitOp[${LUA_USEDEP}] ' lua5-{1,2}) - >=dev-libs/libutf8proc-2.9.0:= - >=dev-libs/libuv-1.46.0:= + >=dev-libs/libutf8proc-2.10.0:=[-cjk] + >=dev-libs/libuv-1.50.0:= >=dev-libs/libvterm-0.3.3 >=dev-libs/msgpack-3.0.0:= - >=dev-libs/tree-sitter-0.24.3:= + >=dev-libs/tree-sitter-0.25.3:= =dev-libs/tree-sitter-c-0.23* - =dev-libs/tree-sitter-lua-0.2* - =dev-libs/tree-sitter-markdown-0.3* - =dev-libs/tree-sitter-query-0.4* - =dev-libs/tree-sitter-vim-0.4* + =dev-libs/tree-sitter-lua-0.3* + =dev-libs/tree-sitter-markdown-0.4* + =dev-libs/tree-sitter-query-0.5* + =dev-libs/tree-sitter-vim-0.5* =dev-libs/tree-sitter-vimdoc-3* - >=dev-libs/unibilium-2.0.0:0= + >=dev-libs/unibilium-2.1.2:0= " RDEPEND=" ${DEPEND}
