From: yaydn@protonmail.com
Subject: Re: [update] wayland/foot 1.23.0
To: yaydn@protonmail.com
Cc: "ports@openbsd.org" <ports@openbsd.org>
Date: Thu, 31 Jul 2025 06:42:47 +0000

På onsdag 30. juli 2025 kl. 22:40, <yaydn@protonmail.com> skrev:

> På onsdag 30. juli 2025 kl. 16:48, Matthieu Herrb
> matthieu@herrb.eu skrev:
> 
> > On Thu, Jul 17, 2025 at 06:21:05AM +0000, yaydn@protonmail.com wrote:
> > 
> > > Build and tested on current/amd64.
> > > 
> > > Changelog:
> > > 
> > > https://codeberg.org/dnkl/foot/releases/tag/1.23.0
> > 
> > Hi,
> > 
> > looks ok. In the mean time foot 1.23.1 was released.
> 
> 
> 
> Tested on current/amd64.
> 
> Changelogs:
> https://codeberg.org/dnkl/foot/releases/tag/1.23.0
> https://codeberg.org/dnkl/foot/releases/tag/1.23.1
> 
> Similar to swayimg I:
> 
> cd /usr/ports/wayland/foot && patch -l -p0 -E < /tmp/foot-1.23.1p0.patch
> cd /usr/ports/wayland/foot && make clean=all clean
> cd /usr/ports/wayland/foot && make update clean && make distclean
> 
> I also have been testing this since July 23rd.
> 
> I defer to your patch. Builds and runs fine on sway.
> 
> Looks okay to me. Thank you.
> 
> Have a good one, well wishes everyone, and merry porting!
> 
> 
> Postscript:
> 
> Are there plans to update pixman in base, so wlroots 0.19 can be built
> and update sway and labwc? That was where I got stuck as pixman moved to
> meson for building and beyond my current abilities to update well while
> assuring to not break userspace in case of a mistake or bug.
> 
> Wayfire is still stuck on wlroots 0.17 or wlroots 0.18 with patches so
> I think any update for wlroots would necessitate split packages
> (flavors?) for wlroots 0.18 and 0.19?
> 


Noticed some small whitespace nitpicks.

Not sure if important.


> > Index: Makefile
> > ===================================================================
> > RCS file: /local/cvs/ports/wayland/foot/Makefile,v
> > diff -u -p -u -r1.11 Makefile
> > --- Makefile 9 May 2025 14:19:32 -0000 1.11
> > +++ Makefile 30 Jul 2025 14:46:24 -0000
> > @@ -1,7 +1,7 @@
> > COMMENT = fast, lightweight and minimalistic Wayland terminal emulator
> > 
> > DISTNAME = foot-${V}
> > -V = 1.22.3
> > +V = 1.23.1
> > 
> > SITES = https://codeberg.org/dnkl/foot/archive/
> > DISTFILES = foot-{}${V}${EXTRACT_SUFX}
> > Index: distinfo
> > ===================================================================
> > RCS file: /local/cvs/ports/wayland/foot/distinfo,v
> > diff -u -p -u -r1.6 distinfo
> > --- distinfo 9 May 2025 14:19:32 -0000 1.6
> > +++ distinfo 30 Jul 2025 14:46:24 -0000
> > @@ -1,2 +1,2 @@
> > -SHA256 (foot-1.22.3.tar.gz) = HJ8JwRnFskvRk0zlFecPQCt9GyxV+CGKFu3aom4/b7A=
> > -SIZE (foot-1.22.3.tar.gz) = 608285
> > +SHA256 (foot-1.23.1.tar.gz) = AgcrjwqvJpB7awIpPIdVOc5S/FkHk0Tnz4EasDOUz6M=
> > +SIZE (foot-1.23.1.tar.gz) = 614201
> > Index: patches/patch-fdm_c
> > ===================================================================
> > RCS file: /local/cvs/ports/wayland/foot/patches/patch-fdm_c,v
> > diff -u -p -u -r1.1.1.1 patch-fdm_c
> > --- patches/patch-fdm_c 2 Sep 2023 08:34:31 -0000 1.1.1.1
> > +++ patches/patch-fdm_c 30 Jul 2025 14:46:24 -0000
> > @@ -3,7 +3,7 @@ use NSIG for signals table
> > Index: fdm.c
> > --- fdm.c.orig
> > +++ fdm.c
> > -@@ -71,7 +71,7 @@ fdm_init(void)
> > +@@ -83,7 +83,7 @@ fdm_init(void)
> > }
> > 
> > xassert(received_signals == NULL); /* Only one FDM instance supported */
> > @@ -12,7 +12,7 @@ Index: fdm.c
> > got_signal = false;
> > 
> > struct fdm *fdm = malloc(sizeof(*fdm));
> > -@@ -80,7 +80,7 @@ fdm_init(void)
> > +@@ -92,7 +92,7 @@ fdm_init(void)
> > return NULL;
> > }
> > 
> > @@ -21,16 +21,16 @@ Index: fdm.c
> > 
> > if (sig_handlers == NULL) {
> > LOG_ERRNO("failed to allocate signal handler array");
> > -@@ -111,7 +111,7 @@ fdm_destroy(struct fdm *fdm)
> > +@@ -123,7 +123,7 @@ fdm_destroy(struct fdm *fdm)
> > if (tll_length(fdm->fds) > 0)
> > 
> > LOG_WARN("FD list not empty");
> > 
> > - for (int i = 0; i < SIGRTMAX; i++) {
> > + for (int i = 0; i < NSIG; i++) {
> > if (fdm->signal_handlers[i].callback != NULL)
> > 
> > - LOG_WARN("handler for signal %d not removed", i);
> > - }
> > -@@ -434,7 +434,7 @@ fdm_poll(struct fdm *fdm)
> > + LOG_WARN("handler for signal %d (SIG%s) not removed",
> > + i, sigabbrev_np(i));
> > +@@ -452,7 +452,7 @@ fdm_poll(struct fdm *fdm)
> > if (unlikely(got_signal)) {
> > got_signal = false;
> > 
> > Index: patches/patch-main_c
> > ===================================================================
> > RCS file: /local/cvs/ports/wayland/foot/patches/patch-main_c,v
> > diff -u -p -u -r1.4 patch-main_c
> > --- patches/patch-main_c 24 Mar 2025 20:10:46 -0000 1.4
> > +++ patches/patch-main_c 30 Jul 2025 14:46:24 -0000
> > @@ -3,7 +3,7 @@ use NSIG for signal table
> > Index: main.c
> > --- main.c.orig
> > +++ main.c
> > -@@ -152,7 +152,7 @@ sanitize_signals(void)
> > +@@ -174,7 +174,7 @@ sanitize_signals(void)
> > struct sigaction dfl = {.sa_handler = SIG_DFL};
> > sigemptyset(&dfl.sa_mask);
> > 
> > Index: patches/patch-meson_build
> > ===================================================================
> > RCS file: /local/cvs/ports/wayland/foot/patches/patch-meson_build,v
> > diff -u -p -u -r1.5 patch-meson_build
> > --- patches/patch-meson_build 9 May 2025 14:19:35 -0000 1.5
> > +++ patches/patch-meson_build 30 Jul 2025 14:46:24 -0000
> > @@ -3,7 +3,7 @@ Use libstdthreads
> > Index: meson.build
> > --- meson.build.orig
> > +++ meson.build
> > -@@ -129,7 +129,7 @@ if cc.has_argument('-fmacro-prefix-map=/foo=')
> > +@@ -135,7 +135,7 @@ if cc.has_argument('-fmacro-prefix-map=/foo=')
> > endif
> > 
> > math = cc.find_library('m')
> > @@ -12,7 +12,7 @@ Index: meson.build
> > libepoll = dependency('epoll-shim', required: false)
> > pixman = dependency('pixman-1')
> > wayland_protocols = dependency('wayland-protocols', version: '>=1.41',
> > 
> > -@@ -229,7 +229,8 @@ common = static_library(
> > +@@ -239,7 +239,8 @@ common = static_library(
> > 'macros.h',
> > 'xmalloc.c', 'xmalloc.h',
> > 'xsnprintf.c', 'xsnprintf.h',
> > @@ -22,7 +22,7 @@ Index: meson.build
> > )
> > 
> > misc = static_library(
> > -@@ -239,6 +240,7 @@ misc = static_library(
> > +@@ -249,6 +250,7 @@ misc = static_library(
> > 'misc.c', 'misc.h',
> > 'uri.c', 'uri.h',
> > dependencies: [utf8proc],
> > @@ -30,7 +30,7 @@ Index: meson.build
> > link_with: [common]
> > )
> > 
> > -@@ -283,7 +285,7 @@ if get_option('b_pgo') == 'generate'
> > +@@ -293,7 +295,7 @@ if get_option('b_pgo') == 'generate'
> > 'pgo',
> > 'pgo/pgo.c',
> > wl_proto_src + wl_proto_headers,
> > @@ -39,9 +39,9 @@ Index: meson.build
> > link_with: pgolib,
> > )
> > endif
> > -@@ -316,7 +318,7 @@ executable(
> > - 'user-notification.c', 'user-notification.h',
> > +@@ -327,7 +329,7 @@ executable(
> > 'wayland.c', 'wayland.h', 'shm-formats.h',
> > + 'xkbcommon-vmod.h',
> > srgb_funcs, wl_proto_src + wl_proto_headers, version,
> > - dependencies: [math, threads, libepoll, pixman, wayland_client, wayland_cursor, xkb, fontconfig, utf8proc,
> > + dependencies: [math, stdthreads, libepoll, pixman, wayland_client, wayland_cursor, xkb, fontconfig, utf8proc,
> > Index: pkg/PLIST
> > ===================================================================
> > RCS file: /local/cvs/ports/wayland/foot/pkg/PLIST,v
> > diff -u -p -u -r1.6 PLIST
> > --- pkg/PLIST 9 May 2025 14:19:37 -0000 1.6
> > +++ pkg/PLIST 30 Jul 2025 14:46:24 -0000
> > @@ -38,6 +38,7 @@ share/foot/themes/deus
> > share/foot/themes/dracula
> > share/foot/themes/dracula-iterm
> > share/foot/themes/electrophoretic
> > +share/foot/themes/gruvbox
> > share/foot/themes/gruvbox-dark
> > share/foot/themes/gruvbox-light
> > share/foot/themes/hacktober
> > @@ -57,11 +58,13 @@ share/foot/themes/nightfly
> > share/foot/themes/noirblaze
> > share/foot/themes/nord
> > share/foot/themes/nordiq
> > +share/foot/themes/nvim
> > share/foot/themes/nvim-dark
> > share/foot/themes/nvim-light
> > share/foot/themes/onedark
> > share/foot/themes/onehalf-dark
> > share/foot/themes/panda
> > +share/foot/themes/paper-color
> > share/foot/themes/paper-color-dark
> > share/foot/themes/paper-color-light
> > share/foot/themes/poimandres
> > @@ -69,13 +72,16 @@ share/foot/themes/rezza
> > share/foot/themes/rose-pine
> > share/foot/themes/rose-pine-dawn
> > share/foot/themes/rose-pine-moon
> > +share/foot/themes/selenized
> > share/foot/themes/selenized-black
> > share/foot/themes/selenized-dark
> > share/foot/themes/selenized-light
> > share/foot/themes/selenized-white
> > +share/foot/themes/solarized
> > share/foot/themes/solarized-dark
> > share/foot/themes/solarized-dark-normal-brights
> > share/foot/themes/solarized-light
> > +share/foot/themes/solarized-normal-brights
> > share/foot/themes/srcery
> > share/foot/themes/starlight
> > share/foot/themes/tango
> > 
> > --
> > Matthieu Herrb