From: Denis Fondras <denis@openbsd.org>
Subject: Re: update: editors/litexl to 2.1.8
To: Sebastien Marie <semarie@kapouay.eu.org>
Cc: Denis Fondras <denis@openbsd.org>, ports@openbsd.org
Date: Tue, 23 Sep 2025 10:48:30 +0200

Le Tue, Sep 23, 2025 at 10:43:10AM +0200, Sebastien Marie a écrit :
> ping.
> 
> Sebastien Marie <semarie@kapouay.eu.org> writes:
> 
> > Hi,
> >
> > The following diff updates editors/litexl to 2.1.8
> >
> > Release notes: https://github.com/lite-xl/lite-xl/releases/tag/v2.1.8
> >
> > With 2.1.8, litexl is using SDL3 (instead of SDL2).
> >
> > It builds and runs fine on amd64 (but only lightly tested for now).
> >
> > Comments or OK ?
> 

Sorry I thought I sent the OK denis@ :)

Denis

> -- 
> Sebastien Marie
> 
> 
> diff --git a/editors/litexl/Makefile b/editors/litexl/Makefile
> index b392e94721..da37887fbb 100644
> --- a/editors/litexl/Makefile
> +++ b/editors/litexl/Makefile
> @@ -1,6 +1,6 @@
>  COMMENT =	lightweight, simple, fast, extensible text editor
>  
> -V =		2.1.7
> +V =		2.1.8
>  GH_ACCOUNT =	lite-xl
>  GH_PROJECT =	lite-xl
>  GH_TAGNAME =	v$V
> @@ -17,14 +17,14 @@
>  COMPILER =	base-clang ports-gcc
>  COMPILER_LANGS =	c
>  
> -WANTLIB =	c freetype lua5.4 m pcre2-8 SDL2
> +WANTLIB =	c freetype lua5.4 m pcre2-8 SDL3
>  
>  MODULES =	devel/meson	\
>  		lang/lua
>  
>  MODLUA_VERSION =5.4
>  
> -LIB_DEPENDS =   devel/sdl2	\
> +LIB_DEPENDS =   devel/sdl3	\
>  		devel/pcre2
>  
>  RUN_DEPENDS =	devel/desktop-file-utils \
> @@ -34,6 +34,6 @@
>  			-Ddirmonitor_backend=kqueue
>  
>  pre-configure:
> -	${SUBST_CMD} ${WRKSRC}/{meson.build,src/main.c}
> +	${SUBST_CMD} ${WRKSRC}/{meson.build,src/main.c,src/meson.build}
>  
>  .include <bsd.port.mk>
> diff --git a/editors/litexl/distinfo b/editors/litexl/distinfo
> index 5574e1056e..e3758764ad 100644
> --- a/editors/litexl/distinfo
> +++ b/editors/litexl/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (lite-xl-2.1.7.tar.gz) = adHOTB0UjTgsywb0X+yiVlxcj+nQsbm8HL4BT2gmzms=
> -SIZE (lite-xl-2.1.7.tar.gz) = 3050138
> +SHA256 (lite-xl-2.1.8.tar.gz) = /K/7lGvGBYM2nLBA1TOkrBgHWm1HTUmipf9L+H4umhA=
> +SIZE (lite-xl-2.1.8.tar.gz) = 3072985
> diff --git a/editors/litexl/patches/patch-meson_build b/editors/litexl/patches/patch-meson_build
> index 4321acef5a..b55345a607 100644
> --- a/editors/litexl/patches/patch-meson_build
> +++ b/editors/litexl/patches/patch-meson_build
> @@ -1,15 +1,7 @@
>  Index: meson.build
>  --- meson.build.orig
>  +++ meson.build
> -@@ -78,6 +78,7 @@ if not get_option('source-only')
> -     # Lua has no official .pc file
> -     # so distros come up with their own names
> -     lua_names = [
> -+        'lua${MODLUA_DEP_VERSION}', # OpenBSD
> -         'lua5.4', # Debian
> -         'lua-5.4', # FreeBSD
> -         'lua',    # Fedora
> -@@ -210,7 +211,7 @@ else
> +@@ -99,7 +99,7 @@ else
>       lite_bindir = 'bin'
>       lite_docdir = get_option('datadir') / 'doc' / 'lite-xl'
>       lite_datadir = get_option('datadir') / 'lite-xl'
> diff --git a/editors/litexl/patches/patch-src_api_dirmonitor_kqueue_c b/editors/litexl/patches/patch-src_api_dirmonitor_kqueue_c
> index 4b63347547..1355106dc3 100644
> --- a/editors/litexl/patches/patch-src_api_dirmonitor_kqueue_c
> +++ b/editors/litexl/patches/patch-src_api_dirmonitor_kqueue_c
> @@ -3,7 +3,8 @@
>  Index: src/api/dirmonitor/kqueue.c
>  --- src/api/dirmonitor/kqueue.c.orig
>  +++ src/api/dirmonitor/kqueue.c
> -@@ -1,10 +1,10 @@
> +@@ -1,11 +1,11 @@
> + #include <SDL3/SDL.h>
>  -#include <sys/event.h>
>  -#include <sys/stat.h>
>   #include <stdlib.h>
> diff --git a/editors/litexl/patches/patch-src_main_c b/editors/litexl/patches/patch-src_main_c
> index c1bd616055..6f1549db81 100644
> --- a/editors/litexl/patches/patch-src_main_c
> +++ b/editors/litexl/patches/patch-src_main_c
> @@ -1,7 +1,7 @@
>  Index: src/main.c
>  --- src/main.c.orig
>  +++ src/main.c
> -@@ -199,7 +199,10 @@ init_lua:
> +@@ -188,7 +188,10 @@ init_lua:
>       lua_pushstring(L, exename);
>     } else {
>       // get_exe_filename failed
> diff --git a/editors/litexl/patches/patch-src_meson_build b/editors/litexl/patches/patch-src_meson_build
> new file mode 100644
> index 0000000000..1ad71e8496
> --- /dev/null
> +++ b/editors/litexl/patches/patch-src_meson_build
> @@ -0,0 +1,11 @@
> +Index: src/meson.build
> +--- src/meson.build.orig
> ++++ src/meson.build
> +@@ -23,6 +23,7 @@ default_fallback_options = ['warning_level=0', 'werror
> + # Lua has no official .pc file
> + # so distros come up with their own names
> + lua_names = [
> ++    'lua${MODLUA_DEP_VERSION}', # OpenBSD
> +     'lua5.4', # Debian
> +     'lua-5.4', # FreeBSD
> +     'lua',    # Fedora
>