Attachment 250825 Details for Bug 279175 – Improved patch: builds in poudriere

[patch] Improved patch: builds in poudriere

0001++-editors-neovim-Upgrade-to-0.10.0.patch (text/plain), 4.71 KB, created by Laurent Chardon on 2024-05-20 04:36:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Laurent Chardon

Created: 2024-05-20 04:36:25 UTC

Size: 4.71 KB

patch

obsolete

>From d3822198abfd12b23059921663b0c14567e31568 Mon Sep 17 00:00:00 2001
>From: Laurent Chardon <laurent.chardon@gmail.com>
>Date: Sun, 19 May 2024 23:03:18 -0400
>Subject: [PATCH] editors/neovim: Upgrade to 0.10.0
>
>WIP
>
>TODO:
>- Add test target
>- Review Makefile
>  - Check that not too much was removed
>- Check why lua > 51 broken, fix if possible
>---
> editors/neovim/Makefile                   | 30 ++++++++---------------
> editors/neovim/distinfo                   | 10 ++++----
> editors/neovim/files/patch-CMakeLists.txt | 14 -----------
> 3 files changed, 15 insertions(+), 39 deletions(-)
> delete mode 100644 editors/neovim/files/patch-CMakeLists.txt
>
>diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile
>index c48981a236a5..4a104e564b67 100644
>--- a/editors/neovim/Makefile
>+++ b/editors/neovim/Makefile
>@@ -1,7 +1,6 @@
> PORTNAME=	neovim
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	0.9.5
>-PORTREVISION=	1
>+DISTVERSION=	0.10.0
> CATEGORIES=	editors
> 
> MAINTAINER=	adamw@FreeBSD.org
>@@ -11,8 +10,8 @@ WWW=		https://neovim.io/
> LICENSE=	APACHE20
> 
> BUILD_DEPENDS=	gperf:devel/gperf \
>-		${LUA_MODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \
>-		${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR}
>+		${LUA_REFMODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \
>+		${LUA_REFMODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR}
> LIB_DEPENDS=	libluv.so:devel/luv \
> 		libmsgpack-c.so:devel/msgpack-c \
> 		libtermkey.so:devel/libtermkey \
>@@ -21,15 +20,17 @@ LIB_DEPENDS=	libluv.so:devel/luv \
> 		libuv.so:devel/libuv \
> 		libvterm.so:devel/libvterm
> 
>-USES=		cmake cpe gettext iconv lua:52,build luajit pathfix pkgconfig
>+USES=		cmake cpe gettext iconv lua:51,build luajit \
>+		desktop-file-utils pathfix pkgconfig
> USE_GITHUB=	yes
> GH_TUPLE=	libmpack:libmpack:1.0.5:libmpack \
>-		libmpack:libmpack-lua:1.0.9:libmpack_lua
>+		libmpack:libmpack-lua:1.0.12:libmpack_lua
> PORTSCOUT=	limit:^[0-9\.v]+$$
> 
> CMAKE_ARGS=	-DLUA_PRG:FILEPATH="${LUA_CMD}" \
>-		-DCMAKE_INSTALL_MANDIR:PATH="${PREFIX}/share/man" \
>-		-DDEPS_PREFIX:PATH="${LOCALBASE}"
>+ 		-DCMAKE_INSTALL_MANDIR:PATH="${PREFIX}/share/man" \
>+ 		-DDEPS_PREFIX:PATH="${LOCALBASE}" \
>+		-DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib/lua/${LUA_VER}"
> CFLAGS+=	-I${LOCALBASE}/include
> 
> DATADIR=	${PREFIX}/share/nvim
>@@ -41,19 +42,8 @@ OPTIONS_SUB=	yes
> PYNVIM_DESC=	Enable support for plugins written in python
> 
> NLS_CMAKE_BOOL=		ENABLE_LIBINTL
>+
> PYNVIM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pynvim>=0.3.0:editors/py-pynvim@${PY_FLAVOR}
> PYNVIM_USES=		python:run
> 
>-post-patch-NLS-off:
>-	${REINPLACE_CMD} -e '/add_subdirectory(po)/d' ${WRKSRC}/src/nvim/CMakeLists.txt
>-
>-pre-build:
>-	${LN} -s ${WRKSRC_libmpack} ${WRKSRC_libmpack_lua}/mpack-src
>-	${MKDIR} ${BUILD_WRKSRC}/src/nvim
>-	(cd ${WRKSRC_libmpack_lua} && ${CC} ${CFLAGS} -fPIC \
>-		-I${LUA_INCDIR} -shared lmpack.c -o \
>-		${BUILD_WRKSRC}/src/nvim/mpack.so \
>-		${LUA_LIBDIR}/liblua-${LUA_VER}.so)
>-	${LN} -s ${BUILD_WRKSRC}/src/nvim/mpack.so ${BUILD_WRKSRC}/runtime/mpack.so
>-
> .include <bsd.port.mk>
>diff --git a/editors/neovim/distinfo b/editors/neovim/distinfo
>index afddae974869..b420957ace97 100644
>--- a/editors/neovim/distinfo
>+++ b/editors/neovim/distinfo
>@@ -1,7 +1,7 @@
>-TIMESTAMP = 1703948840
>-SHA256 (neovim-neovim-v0.9.5_GH0.tar.gz) = fe74369fc30a32ec7a086b1013acd0eacd674e7570eb1acc520a66180c9e9719
>-SIZE (neovim-neovim-v0.9.5_GH0.tar.gz) = 11590180
>+TIMESTAMP = 1716160663
>+SHA256 (neovim-neovim-v0.10.0_GH0.tar.gz) = 372ea2584b0ea2a5a765844d95206bda9e4a57eaa1a2412a9a0726bab750f828
>+SIZE (neovim-neovim-v0.10.0_GH0.tar.gz) = 12792034
> SHA256 (libmpack-libmpack-1.0.5_GH0.tar.gz) = 4ce91395d81ccea97d3ad4cb962f8540d166e59d3e2ddce8a22979b49f108956
> SIZE (libmpack-libmpack-1.0.5_GH0.tar.gz) = 32966
>-SHA256 (libmpack-libmpack-lua-1.0.9_GH0.tar.gz) = e94d5cf95d7479dca00ff23755fe05a440f11f9d203635e862ad8842de95f40a
>-SIZE (libmpack-libmpack-lua-1.0.9_GH0.tar.gz) = 16087
>+SHA256 (libmpack-libmpack-lua-1.0.12_GH0.tar.gz) = 7c3f0a5fcd0d7c169fd7bc95978412628d8f59eb9da1d32cf3e8a864b741ec92
>+SIZE (libmpack-libmpack-lua-1.0.12_GH0.tar.gz) = 16524
>diff --git a/editors/neovim/files/patch-CMakeLists.txt b/editors/neovim/files/patch-CMakeLists.txt
>deleted file mode 100644
>index 564ac85f400b..000000000000
>--- a/editors/neovim/files/patch-CMakeLists.txt
>+++ /dev/null
>@@ -1,14 +0,0 @@
>---- CMakeLists.txt.orig	2023-04-07 16:52:01 UTC
>-+++ CMakeLists.txt
>-@@ -163,9 +163,9 @@ foreach(CFGNAME ${CMAKE_CONFIGURATION_TYPES})
>-   set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFGNAME} ${CMAKE_BINARY_DIR}/lib)
>- endforeach()
>- 
>--set(LUA_DEPENDENCIES lpeg mpack bit)
>-+set(LUA_DEPENDENCIES lpeg bit)
>- if(NOT LUA_PRG)
>--  foreach(CURRENT_LUA_PRG luajit lua5.1 lua5.2 lua)
>-+  foreach(CURRENT_LUA_PRG luajit)
>-     unset(_CHECK_LUA_PRG CACHE)
>-     unset(LUA_PRG_WORKS)
>-     find_program(_CHECK_LUA_PRG ${CURRENT_LUA_PRG})
>-- 
>2.43.2
>

Actions: View | Diff

Attachments on bug 279175: 250823 | 250825 | 250828