On 2023/09/28 09:11, Laurent Cheylus wrote:
> Hi Edd,
>
> On Sat, 23 Sep 2023 12:06:22 +0100, Edd Barrett wrote:
>
> > Relatively simple update to neovim.
> >
> > Only lightly tested. Please try it out.
>
> I also did an update for Neovim 0.9.2 and yours is almost similar to mine.
>
> OK, build and tests on current/amd64.
>
> I tested your Neovim port update with my Lua configuration (more than 20
> plugins used ; LSP servers for Go, Lua, Python with lspconfig plugin...) :
> no issue detected :)
>
> In Makefile, could you make the following changes?
>
> - remove DISTFILES variable => no longer necessary
already done in a tree sweep
> - replace SITES.{a,b,c} and DISTFILES.{a,b,c} with more understandable
> values
>
> SITES.luv = https://github.com/luvit/luv/archive/
> DISTFILES.luv = luv-{}${LUV_VER}${EXTRACT_SUFX}
>
> SITES.LuaJIT = https://github.com/LuaJIT/LuaJIT/archive/
> DISTFILES.LuaJIT = luajit-{}${LUAJIT_VER}${EXTRACT_SUFX}
>
> SITES.lua-compat-5.3 = https://github.com/keplerproject/lua-
> compat-5.3/archive/
> DISTFILES.lua-compat-5.3 = lua-compat-5.3-{}${LUACOMPAT_VER}$
> {EXTRACT_SUFX}
DIST_TUPLE is exactly made for this situation, diff using that below
no big opinion on before/after 7.4, though I would tend not to unless
it fixes something important, given that there are some fairly machine-
dependent parts to the build which have changed i.e. new luajit version,
and we probably won't learn about breakage on some archs until it's
too late to fix
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/neovim/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile 26 Sep 2023 17:58:06 -0000 1.39
+++ Makefile 28 Sep 2023 10:13:35 -0000
@@ -11,10 +11,7 @@ EMBED_LUAJIT = No
COMMENT = continuation and extension of Vim
-GH_ACCOUNT = neovim
-GH_PROJECT = neovim
-GH_TAGNAME = v0.9.1
-REVISION = 0
+DIST_TUPLE = github neovim neovim v0.9.2 .
# embedded luajit
USE_NOBTCFI = Yes
@@ -24,16 +21,10 @@ HOMEPAGE = https://neovim.io
MAINTAINER = Edd Barrett <e...@openbsd.org>
# The versions listed here must match those in cmake.deps/CMakeLists.txt.
-LUV_VER = 093a977b82077591baefe1e880d37dfa2730bd54
-LUAJIT_VER = 505e2c03de35e2718eef0d2d3660712e06dadf1f
-LUACOMPAT_VER = v0.9
-
-SITES.a = https://github.com/luvit/luv/archive/
-SITES.b = https://github.com/LuaJIT/LuaJIT/archive/
-SITES.c = https://github.com/keplerproject/lua-compat-5.3/archive/
-DISTFILES.a = luv-{}${LUV_VER}${EXTRACT_SUFX}
-DISTFILES.b = luajit-{}${LUAJIT_VER}${EXTRACT_SUFX}
-DISTFILES.c = lua-compat-5.3-{}${LUACOMPAT_VER}${EXTRACT_SUFX}
+STATIC_DEPS_WRKSRC = ${WRKDIST}/static-deps/
+DIST_TUPLE += github luvit luv 1.45.0-0 ${STATIC_DEPS_WRKSRC}/luv
+DIST_TUPLE += github LuaJIT LuaJIT 03c31124cc3b521ef54fe398e10fa55660a5057d
${STATIC_DEPS_WRKSRC}/luajit
+DIST_TUPLE += github keplerproject lua-compat-5.3 v0.9
${STATIC_DEPS_WRKSRC}/lua-compat-5.3
# Neovim: Apache 2.0 + Vim License
# LuaJIT: MIT + public domain
@@ -84,7 +75,7 @@ CONFIGURE_ARGS += -DUSE_BUNDLED=OFF \
-DLIBLUV_INCLUDE_DIR=${STATIC_DEPS_INST}/include \
-DLIBLUV_LIBRARY=${STATIC_DEPS_INST}/lib/libluv.a
.if ${EMBED_LUAJIT} == "Yes"
-CONFIGURE_ARGS += -DLUA_PRG=${STATIC_DEPS_INST}/bin/luajit-2.1.0-beta3 \
+CONFIGURE_ARGS += -DLUA_PRG=${STATIC_DEPS_INST}/bin/luajit \
-DLUAJIT_INCLUDE_DIR=${STATIC_DEPS_INST}/include/luajit-2.1 \
-DLUAJIT_LIBRARY=${STATIC_DEPS_INST}/lib/libluajit-5.1.a
.else
@@ -104,15 +95,6 @@ MODPY_BUILDDEP =No
TEST_DEPENDS = shells/bash \
editors/py-neovim \
editors/py-neovim${MODPY_FLAVOR}
-
-# Move static deps source code under WRKDIST so that they can be patched.
-STATIC_DEPS_WRKSRC=${WRKDIST}/static-deps/
-post-extract:
- mkdir ${STATIC_DEPS_WRKSRC}
- mv ${WRKDIR}/LuaJIT-${LUAJIT_VER} ${STATIC_DEPS_WRKSRC}/luajit
- mv ${WRKDIR}/luv-${LUV_VER} ${STATIC_DEPS_WRKSRC}/luv
- mv ${WRKDIR}/lua-compat-5.3-${LUACOMPAT_VER:C/^v//} \
- ${STATIC_DEPS_WRKSRC}/lua-compat-5.3
# Build LuaJIT (if required) and libluv as static libraries.
#
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/neovim/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo 5 Jun 2023 13:22:15 -0000 1.20
+++ distinfo 28 Sep 2023 10:13:35 -0000
@@ -1,8 +1,8 @@
-SHA256 (lua-compat-5.3-v0.9.tar.gz) =
rQVUDS2WpIclu3mh3vNc9mUqTi7CY3biYXyM4rqm9BY=
-SHA256 (luajit-505e2c03de35e2718eef0d2d3660712e06dadf1f.tar.gz) =
Z8iDmbkBoi6aI29Ld+b+Oa8A9rcUTOndb1EUHZIfEHY=
-SHA256 (luv-093a977b82077591baefe1e880d37dfa2730bd54.tar.gz) =
Iis4tkJfCSYhjhTn2oFIH93m+WYMH+rCWlPm+1LohuY=
-SHA256 (neovim-0.9.1.tar.gz) = jbF8Kh9HdtzaAOWUieoNmLqC99Go6gMoHWQOWNijoA4=
-SIZE (lua-compat-5.3-v0.9.tar.gz) = 53599
-SIZE (luajit-505e2c03de35e2718eef0d2d3660712e06dadf1f.tar.gz) = 1075264
-SIZE (luv-093a977b82077591baefe1e880d37dfa2730bd54.tar.gz) = 127241
-SIZE (neovim-0.9.1.tar.gz) = 11567358
+SHA256 (LuaJIT-LuaJIT-03c31124cc3b521ef54fe398e10fa55660a5057d.tar.gz) =
YdzHrj9UOuPMMOZtsGDjHip35L407mXjcMlT0RK01gw=
+SHA256 (keplerproject-lua-compat-5.3-v0.9.tar.gz) =
rQVUDS2WpIclu3mh3vNc9mUqTi7CY3biYXyM4rqm9BY=
+SHA256 (luvit-luv-1.45.0-0.tar.gz) =
l+iZQPnuqo37NPHBn4DdNzKZxCcZ0VIo7HkPQV1OSWU=
+SHA256 (neovim-neovim-v0.9.2.tar.gz) =
BrhRi61CN6KKZ6T7wW7DJYHzXyFrJ/TJg0es7n9fs2k=
+SIZE (LuaJIT-LuaJIT-03c31124cc3b521ef54fe398e10fa55660a5057d.tar.gz) = 1073919
+SIZE (keplerproject-lua-compat-5.3-v0.9.tar.gz) = 53599
+SIZE (luvit-luv-1.45.0-0.tar.gz) = 130334
+SIZE (neovim-neovim-v0.9.2.tar.gz) = 11580390
Index: patches/patch-static-deps_luajit_src_host_buildvm_asm_c
===================================================================
RCS file:
/cvs/ports/editors/neovim/patches/patch-static-deps_luajit_src_host_buildvm_asm_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-static-deps_luajit_src_host_buildvm_asm_c
--- patches/patch-static-deps_luajit_src_host_buildvm_asm_c 11 Mar 2022
18:58:33 -0000 1.2
+++ patches/patch-static-deps_luajit_src_host_buildvm_asm_c 28 Sep 2023
10:13:35 -0000
@@ -3,7 +3,7 @@
Index: static-deps/luajit/src/host/buildvm_asm.c
--- static-deps/luajit/src/host/buildvm_asm.c.orig
+++ static-deps/luajit/src/host/buildvm_asm.c
-@@ -327,7 +327,7 @@ void emit_asm(BuildCtx *ctx)
+@@ -330,7 +330,7 @@ void emit_asm(BuildCtx *ctx)
#if !(LJ_TARGET_PS3 || LJ_TARGET_PSVITA)
fprintf(ctx->fp, "\t.section .note.GNU-stack,\"\"," ELFASM_PX
"progbits\n");
#endif
Index: patches/patch-static-deps_luajit_src_lj_arch_h
===================================================================
RCS file:
/cvs/ports/editors/neovim/patches/patch-static-deps_luajit_src_lj_arch_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-static-deps_luajit_src_lj_arch_h
--- patches/patch-static-deps_luajit_src_lj_arch_h 4 Jul 2022 14:49:03
-0000 1.3
+++ patches/patch-static-deps_luajit_src_lj_arch_h 28 Sep 2023 10:13:35
-0000
@@ -5,7 +5,7 @@ ignore the gcc version check ifdef hell
Index: static-deps/luajit/src/lj_arch.h
--- static-deps/luajit/src/lj_arch.h.orig
+++ static-deps/luajit/src/lj_arch.h
-@@ -432,7 +432,7 @@
+@@ -445,7 +445,7 @@
/* -- Checks for requirements --------------------------------------------- */
/* Check for minimum required compiler versions. */
