On Tue, 14 Dec 2021, Paco Esteban wrote: > On Mon, 13 Dec 2021, Laurence Tratt wrote: > > > On Sat, Dec 11, 2021 at 07:06:46PM -0700, Evan Fiddes wrote: > > > > Hello Evan, > > > > > This bumps the neovim version to 0.6.0 the most current release. See patch > > > notes[0] for a detailed breakdown. > > > > > > [0] https://github.com/neovim/neovim/releases/tag/v0.6.0 > > > > I had a small leading whitespace issue with your patch, which might be a > > MIME encoding thing. Otherwise, the update looks good, applies, and neovim > > 0.6.0 so far seems to be working well! > > On the port Makefile, edd@ states that the versions of LuaJIT and luv > have to be pinned to specific versions listed on the source code. > > This patch does not update those. I'm not sure of the consequences of > this, but I guess strange runtime errors would be common. > > My attempts until now hit a linker issue, I'll send a patch when I fix > that unless somebody beats me to it.
Here's that patch. It depends on the update of devel/libuv that edd@ just sent. Regression tests are enabled again as they are back on the distribution tarball. Most of them pass, but 10 fail because they cannot create a swap file. Works fine for me on amd64 for general editing and some coding using the LSP and tree-sitter integration. More tests are very welcome. OK to commit ? diff 234135364fd9eff064d2b361e4079f5f3f61cb1d /usr/ports blob - 40f0cf2257530fecc2591d18c1d962e6cac550a4 file + editors/neovim/Makefile --- editors/neovim/Makefile +++ editors/neovim/Makefile @@ -15,15 +15,15 @@ COMMENT = continuation and extension of Vim GH_ACCOUNT = neovim GH_PROJECT = neovim -GH_TAGNAME = v0.5.1 +GH_TAGNAME = v0.6.0 CATEGORIES = editors devel HOMEPAGE = https://neovim.io MAINTAINER = Edd Barrett <e...@openbsd.org> # The versions listed here must match those in third-party/CMakeLists.txt. -LUV_VER = 1.30.1-1 -LUAJIT_VER = 787736990ac3b7d5ceaba2697c7d0f58f77bb782 +LUV_VER = 1.42.0-1 +LUAJIT_VER = b4b2dce9fc3ffaaaede39b36d06415311e2aa516 MASTER_SITES0 = https://github.com/luvit/luv/releases/download/${LUV_VER}/ MASTER_SITES1 = https://github.com/LuaJIT/LuaJIT/archive/ @@ -38,7 +38,7 @@ PERMIT_PACKAGE = Yes DEBUG_PACKAGES = ${BUILD_PACKAGES} -WANTLIB += ${COMPILER_LIBCXX} c iconv intl m msgpackc pthread termkey +WANTLIB += c iconv intl m msgpackc pthread termkey WANTLIB += tree-sitter unibilium util uv vterm .if ${EMBED_LUAJIT} != "Yes" @@ -78,7 +78,7 @@ RUN_DEPENDS += devel/libmpack/lua \ SEPARATE_BUILD = Yes CONFIGURE_ARGS += -DUSE_BUNDLED=OFF \ -DLIBLUV_INCLUDE_DIR=${STATIC_DEPS_INST}/include \ - -DLIBLUV_LIBRARY=${STATIC_DEPS_INST}/lib/libluv.a + -DLIBLUV_LIBRARY=${STATIC_DEPS_INST}/lib/libluv_a.a .if ${EMBED_LUAJIT} == "Yes" CONFIGURE_ARGS += -DLUA_PRG=${STATIC_DEPS_INST}/bin/luajit-2.1.0-beta3 \ -DLUAJIT_INCLUDE_DIR=${STATIC_DEPS_INST}/include/luajit-2.1 \ @@ -155,6 +155,7 @@ pre-configure: ${CONFIGURE_ENV} \ ${LOCALBASE}/bin/cmake \ -DBUILD_MODULE=OFF \ + -DBUILD_STATIC_LIBS=ON \ -DCMAKE_COLOR_MAKEFILE=OFF \ -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON \ -DCMAKE_SUPPRESS_REGENERATION=ON \ @@ -177,13 +178,9 @@ pre-configure: # If cscope is installed, one test fails: # https://github.com/neovim/neovim/issues/12744 # -# XXX: This is broken. The tarball doesn't contain the necessary 'ci' -# directory. Will be fixed for the next release though: -# https://github.com/neovim/neovim/issues/15856 -NO_TEST = Yes -#do-test: -# true -# cd ${WRKSRC}/src/nvim/testdir && ${SETENV} LC_CTYPE=en_US.UTF-8 \ -# ${MAKE_PROGRAM} NVIM_PRG=${WRKBUILD}/bin/nvim ${MAKE_FLAGS} +do-test: + true + cd ${WRKSRC}/src/nvim/testdir && ${SETENV} LC_CTYPE=en_US.UTF-8 \ + ${MAKE_PROGRAM} NVIM_PRG=${WRKBUILD}/bin/nvim ${MAKE_FLAGS} .include <bsd.port.mk> blob - f92a6be221828e8dc92249c9e2d99065981a23c5 file + editors/neovim/distinfo --- editors/neovim/distinfo +++ editors/neovim/distinfo @@ -1,6 +1,6 @@ -SHA256 (luajit-787736990ac3b7d5ceaba2697c7d0f58f77bb782.tar.gz) = Lj90vCefRsxGOr/Gezbmn6rwNmI3AEdx9MrEvyqfXvs= -SHA256 (luv-1.30.1-1.tar.gz) = Tih77W9R/VDOA7p/qMwz2E4bnLhpEcSBK7H0eh4+0So= -SHA256 (neovim-0.5.1.tar.gz) = qkSXleXMab3S7u1wlfILnAhsbs/N4Ktiq5ep0EJD7IQ= -SIZE (luajit-787736990ac3b7d5ceaba2697c7d0f58f77bb782.tar.gz) = 1037727 -SIZE (luv-1.30.1-1.tar.gz) = 1354232 -SIZE (neovim-0.5.1.tar.gz) = 10349190 +SHA256 (luajit-b4b2dce9fc3ffaaaede39b36d06415311e2aa516.tar.gz) = bJ5Gh32y3xbKD6dttAQ+0woa5gyJ2bosPk016yNgzU0= +SHA256 (luv-1.42.0-1.tar.gz) = S2+6qJ0kIO32BwrZ5SKZPhMr1+slQP91TCufFJd0TbI= +SHA256 (neovim-0.6.0.tar.gz) = LP1gDPpbtXVkzCL/u7yyyRUxBT/D3pkt8zZWYUOE+kw= +SIZE (luajit-b4b2dce9fc3ffaaaede39b36d06415311e2aa516.tar.gz) = 1072160 +SIZE (luv-1.42.0-1.tar.gz) = 1444368 +SIZE (neovim-0.6.0.tar.gz) = 10592213 blob - 4aa2121c815f5f1a04046ed92fb430f4f9f1ca60 file + editors/neovim/pkg/PLIST --- editors/neovim/pkg/PLIST +++ editors/neovim/pkg/PLIST @@ -70,7 +70,6 @@ share/nvim/runtime/autoload/health/ share/nvim/runtime/autoload/health.vim share/nvim/runtime/autoload/health/nvim.vim share/nvim/runtime/autoload/health/provider.vim -share/nvim/runtime/autoload/health/treesitter.vim share/nvim/runtime/autoload/htmlcomplete.vim share/nvim/runtime/autoload/javascriptcomplete.vim share/nvim/runtime/autoload/man.vim @@ -220,9 +219,11 @@ share/nvim/runtime/compiler/ruby.vim share/nvim/runtime/compiler/rubyunit.vim share/nvim/runtime/compiler/rustc.vim share/nvim/runtime/compiler/sass.vim +share/nvim/runtime/compiler/scdoc.vim share/nvim/runtime/compiler/se.vim share/nvim/runtime/compiler/shellcheck.vim share/nvim/runtime/compiler/sml.vim +share/nvim/runtime/compiler/spectral.vim share/nvim/runtime/compiler/splint.vim share/nvim/runtime/compiler/stack.vim share/nvim/runtime/compiler/standard.vim @@ -237,6 +238,7 @@ share/nvim/runtime/compiler/xbuild.vim share/nvim/runtime/compiler/xmllint.vim share/nvim/runtime/compiler/xmlwf.vim share/nvim/runtime/compiler/xo.vim +share/nvim/runtime/compiler/yamllint.vim share/nvim/runtime/compiler/zsh.vim share/nvim/runtime/delmenu.vim share/nvim/runtime/doc/ @@ -248,7 +250,9 @@ share/nvim/runtime/doc/channel.txt share/nvim/runtime/doc/cmdline.txt share/nvim/runtime/doc/debug.txt share/nvim/runtime/doc/deprecated.txt +share/nvim/runtime/doc/dev_style.txt share/nvim/runtime/doc/develop.txt +share/nvim/runtime/doc/diagnostic.txt share/nvim/runtime/doc/diff.txt share/nvim/runtime/doc/digraph.txt share/nvim/runtime/doc/editing.txt @@ -303,7 +307,6 @@ share/nvim/runtime/doc/provider.txt share/nvim/runtime/doc/quickfix.txt share/nvim/runtime/doc/quickref.txt share/nvim/runtime/doc/recover.txt -share/nvim/runtime/doc/remote.txt share/nvim/runtime/doc/remote_plugin.txt share/nvim/runtime/doc/repeat.txt share/nvim/runtime/doc/rileft.txt @@ -465,7 +468,9 @@ share/nvim/runtime/ftplugin/javascript.vim share/nvim/runtime/ftplugin/javascriptreact.vim share/nvim/runtime/ftplugin/jproperties.vim share/nvim/runtime/ftplugin/json.vim +share/nvim/runtime/ftplugin/jsonc.vim share/nvim/runtime/ftplugin/jsp.vim +share/nvim/runtime/ftplugin/julia.vim share/nvim/runtime/ftplugin/kconfig.vim share/nvim/runtime/ftplugin/kwt.vim share/nvim/runtime/ftplugin/ld.vim @@ -508,11 +513,13 @@ share/nvim/runtime/ftplugin/muttrc.vim share/nvim/runtime/ftplugin/nanorc.vim share/nvim/runtime/ftplugin/neomuttrc.vim share/nvim/runtime/ftplugin/netrc.vim +share/nvim/runtime/ftplugin/nginx.vim share/nvim/runtime/ftplugin/nroff.vim share/nvim/runtime/ftplugin/nsis.vim share/nvim/runtime/ftplugin/objc.vim share/nvim/runtime/ftplugin/ocaml.vim share/nvim/runtime/ftplugin/occam.vim +share/nvim/runtime/ftplugin/octave.vim share/nvim/runtime/ftplugin/pamconf.vim share/nvim/runtime/ftplugin/pascal.vim share/nvim/runtime/ftplugin/passwd.vim @@ -543,6 +550,7 @@ share/nvim/runtime/ftplugin/rhelp.vim share/nvim/runtime/ftplugin/rmd.vim share/nvim/runtime/ftplugin/rnc.vim share/nvim/runtime/ftplugin/rnoweb.vim +share/nvim/runtime/ftplugin/routeros.vim share/nvim/runtime/ftplugin/rpl.vim share/nvim/runtime/ftplugin/rrst.vim share/nvim/runtime/ftplugin/rst.vim @@ -551,6 +559,7 @@ share/nvim/runtime/ftplugin/rust.vim share/nvim/runtime/ftplugin/sass.vim share/nvim/runtime/ftplugin/sbt.vim share/nvim/runtime/ftplugin/scala.vim +share/nvim/runtime/ftplugin/scdoc.vim share/nvim/runtime/ftplugin/scheme.vim share/nvim/runtime/ftplugin/screen.vim share/nvim/runtime/ftplugin/scss.vim @@ -582,6 +591,7 @@ share/nvim/runtime/ftplugin/tex.vim share/nvim/runtime/ftplugin/text.vim share/nvim/runtime/ftplugin/tidy.vim share/nvim/runtime/ftplugin/tmux.vim +share/nvim/runtime/ftplugin/toml.vim share/nvim/runtime/ftplugin/treetop.vim share/nvim/runtime/ftplugin/tt2html.vim share/nvim/runtime/ftplugin/tutor.vim @@ -668,7 +678,9 @@ share/nvim/runtime/indent/java.vim share/nvim/runtime/indent/javascript.vim share/nvim/runtime/indent/javascriptreact.vim share/nvim/runtime/indent/json.vim +share/nvim/runtime/indent/jsonc.vim share/nvim/runtime/indent/jsp.vim +share/nvim/runtime/indent/julia.vim share/nvim/runtime/indent/ld.vim share/nvim/runtime/indent/less.vim share/nvim/runtime/indent/lifelines.vim @@ -683,6 +695,7 @@ share/nvim/runtime/indent/meson.vim share/nvim/runtime/indent/mf.vim share/nvim/runtime/indent/mma.vim share/nvim/runtime/indent/mp.vim +share/nvim/runtime/indent/nginx.vim share/nvim/runtime/indent/nsis.vim share/nvim/runtime/indent/objc.vim share/nvim/runtime/indent/ocaml.vim @@ -831,11 +844,13 @@ share/nvim/runtime/keymap/vietnamese-telex_utf-8.vim share/nvim/runtime/keymap/vietnamese-viqr_utf-8.vim share/nvim/runtime/keymap/vietnamese-vni_utf-8.vim share/nvim/runtime/lua/ +share/nvim/runtime/lua/health.lua share/nvim/runtime/lua/man.lua share/nvim/runtime/lua/vim/ share/nvim/runtime/lua/vim/F.lua share/nvim/runtime/lua/vim/_meta.lua share/nvim/runtime/lua/vim/compat.lua +share/nvim/runtime/lua/vim/diagnostic.lua share/nvim/runtime/lua/vim/highlight.lua share/nvim/runtime/lua/vim/inspect.lua share/nvim/runtime/lua/vim/lsp/ @@ -845,9 +860,12 @@ share/nvim/runtime/lua/vim/lsp/buf.lua share/nvim/runtime/lua/vim/lsp/codelens.lua share/nvim/runtime/lua/vim/lsp/diagnostic.lua share/nvim/runtime/lua/vim/lsp/handlers.lua +share/nvim/runtime/lua/vim/lsp/health.lua share/nvim/runtime/lua/vim/lsp/log.lua share/nvim/runtime/lua/vim/lsp/protocol.lua share/nvim/runtime/lua/vim/lsp/rpc.lua +share/nvim/runtime/lua/vim/lsp/sync.lua +share/nvim/runtime/lua/vim/lsp/tagfunc.lua share/nvim/runtime/lua/vim/lsp/util.lua share/nvim/runtime/lua/vim/shared.lua share/nvim/runtime/lua/vim/treesitter/ @@ -857,6 +875,7 @@ share/nvim/runtime/lua/vim/treesitter/highlighter.lua share/nvim/runtime/lua/vim/treesitter/language.lua share/nvim/runtime/lua/vim/treesitter/languagetree.lua share/nvim/runtime/lua/vim/treesitter/query.lua +share/nvim/runtime/lua/vim/ui.lua share/nvim/runtime/lua/vim/uri.lua share/nvim/runtime/macmap.vim share/nvim/runtime/macros/ @@ -952,7 +971,6 @@ share/nvim/runtime/print/ks_roman.ps share/nvim/runtime/print/latin1.ps share/nvim/runtime/print/mac-roman.ps share/nvim/runtime/print/prolog.ps -share/nvim/runtime/rgb.txt share/nvim/runtime/scripts.vim share/nvim/runtime/spell/ share/nvim/runtime/spell/en.utf-8.spl @@ -1150,6 +1168,7 @@ share/nvim/runtime/syntax/fvwm2m4.vim share/nvim/runtime/syntax/gdb.vim share/nvim/runtime/syntax/gdmo.vim share/nvim/runtime/syntax/gedcom.vim +share/nvim/runtime/syntax/gemtext.vim share/nvim/runtime/syntax/gift.vim share/nvim/runtime/syntax/git.vim share/nvim/runtime/syntax/gitcommit.vim @@ -1173,6 +1192,7 @@ share/nvim/runtime/syntax/group.vim share/nvim/runtime/syntax/grub.vim share/nvim/runtime/syntax/gsp.vim share/nvim/runtime/syntax/gtkrc.vim +share/nvim/runtime/syntax/gvpr.vim share/nvim/runtime/syntax/haml.vim share/nvim/runtime/syntax/hamster.vim share/nvim/runtime/syntax/haskell.vim @@ -1222,7 +1242,9 @@ share/nvim/runtime/syntax/jgraph.vim share/nvim/runtime/syntax/jovial.vim share/nvim/runtime/syntax/jproperties.vim share/nvim/runtime/syntax/json.vim +share/nvim/runtime/syntax/jsonc.vim share/nvim/runtime/syntax/jsp.vim +share/nvim/runtime/syntax/julia.vim share/nvim/runtime/syntax/kconfig.vim share/nvim/runtime/syntax/kivy.vim share/nvim/runtime/syntax/kix.vim @@ -1315,6 +1337,7 @@ share/nvim/runtime/syntax/ncf.vim share/nvim/runtime/syntax/neomuttrc.vim share/nvim/runtime/syntax/netrc.vim share/nvim/runtime/syntax/netrw.vim +share/nvim/runtime/syntax/nginx.vim share/nvim/runtime/syntax/ninja.vim share/nvim/runtime/syntax/nosyntax.vim share/nvim/runtime/syntax/nqc.vim @@ -1405,6 +1428,7 @@ share/nvim/runtime/syntax/rnc.vim share/nvim/runtime/syntax/rng.vim share/nvim/runtime/syntax/rnoweb.vim share/nvim/runtime/syntax/robots.vim +share/nvim/runtime/syntax/routeros.vim share/nvim/runtime/syntax/rpcgen.vim share/nvim/runtime/syntax/rpl.vim share/nvim/runtime/syntax/rrst.vim @@ -1418,6 +1442,7 @@ share/nvim/runtime/syntax/sass.vim share/nvim/runtime/syntax/sather.vim share/nvim/runtime/syntax/sbt.vim share/nvim/runtime/syntax/scala.vim +share/nvim/runtime/syntax/scdoc.vim share/nvim/runtime/syntax/scheme.vim share/nvim/runtime/syntax/scilab.vim share/nvim/runtime/syntax/screen.vim @@ -1485,12 +1510,12 @@ share/nvim/runtime/syntax/st.vim share/nvim/runtime/syntax/stata.vim share/nvim/runtime/syntax/stp.vim share/nvim/runtime/syntax/strace.vim +share/nvim/runtime/syntax/structurizr.vim share/nvim/runtime/syntax/sudoers.vim share/nvim/runtime/syntax/svg.vim share/nvim/runtime/syntax/svn.vim share/nvim/runtime/syntax/swift.vim share/nvim/runtime/syntax/swiftgyb.vim -share/nvim/runtime/syntax/syncolor.vim share/nvim/runtime/syntax/synload.vim share/nvim/runtime/syntax/syntax.vim share/nvim/runtime/syntax/sysctl.vim @@ -1519,6 +1544,7 @@ share/nvim/runtime/syntax/tidy.vim share/nvim/runtime/syntax/tilde.vim share/nvim/runtime/syntax/tli.vim share/nvim/runtime/syntax/tmux.vim +share/nvim/runtime/syntax/toml.vim share/nvim/runtime/syntax/tpp.vim share/nvim/runtime/syntax/trasys.vim share/nvim/runtime/syntax/treetop.vim -- Paco Esteban. 0x5818130B8A6DBC03
