On Thu, 11 Jul 2024 05:34:04 +0200
Bjorn Ketelaars <bket@openbsd.org> wrote:

> Diff below brings spectrwm to 3.6.0. Changes:
> https://github.com/conformal/spectrwm/releases/tag/SPECTRWM_3_6_0
> 
> Major of shared library requires a major bump because of removal of
> symbols.
> 
> Run tested on amd64.
> 
> Comments/OK?
> 
> 
> diff --git Makefile Makefile
> index fae035a6dde..d367f579d23 100644
> --- Makefile
> +++ Makefile
> @@ -1,10 +1,10 @@
>  COMMENT=		small tiling window manager
>  
> -V=			3.5.1
> +V=			3.6.0
>  DIST_TUPLE=		github conformal spectrwm
> SPECTRWM_${V:S/./_/g} / DISTNAME=		spectrwm-${V}
>  
> -SHARED_LIBS=		swmhack 1.0
> +SHARED_LIBS=		swmhack	2.0
>  
>  CATEGORIES=		x11
>  
> diff --git distinfo distinfo
> index 2e0f3b923c5..a8df3db4586 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (conformal-spectrwm-SPECTRWM_3_5_1.tar.gz) =
> f+QmAgilLZ+4RCkdCv5q8YiHxUUt8Lkh7XgK97kiPw8= -SIZE
> (conformal-spectrwm-SPECTRWM_3_5_1.tar.gz) = 196431 +SHA256
> (conformal-spectrwm-SPECTRWM_3_6_0.tar.gz) =
> SYVMUhVHXSRQ0lWNoSo6/pAZhhFwup1VbItAPU1m8NE= +SIZE
> (conformal-spectrwm-SPECTRWM_3_6_0.tar.gz) = 205957 diff --git
> patches/patch-lib_Makefile patches/patch-lib_Makefile index
> b7f9931e564..d91b6f1efee 100644 --- patches/patch-lib_Makefile +++
> patches/patch-lib_Makefile @@ -9,4 +9,4 @@ Index: lib/Makefile
>  +CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow
> -Wno-uninitialized CFLAGS+= -fPIC
>   CFLAGS+= -I${X11BASE}/include
> - LDADD+= -L${X11BASE}/lib -lX11
> + 
> diff --git patches/patch-spectrwm_1 patches/patch-spectrwm_1
> index 08dc93fa75b..6e76f33c3ae 100644
> --- patches/patch-spectrwm_1
> +++ patches/patch-spectrwm_1
> @@ -1,7 +1,7 @@
>  Index: spectrwm.1
>  --- spectrwm.1.orig
>  +++ spectrwm.1
> -@@ -1990,7 +1990,7 @@ via
> +@@ -2295,7 +2295,7 @@ via
>   .Pa LD_PRELOAD
>   must be specified.
>   .Bd -literal -offset indent
> diff --git patches/patch-spectrwm_c patches/patch-spectrwm_c
> index 6fc372bca93..2f0c886a260 100644
> --- patches/patch-spectrwm_c
> +++ patches/patch-spectrwm_c
> @@ -1,7 +1,7 @@
>  Index: spectrwm.c
>  --- spectrwm.c.orig
>  +++ spectrwm.c
> -@@ -379,7 +379,7 @@ uint32_t		swm_debug = 0
> +@@ -380,7 +380,7 @@ uint32_t		swm_debug = 0
>   #define SWM_CONF_WHITESPACE	" \t\n"
>   
>   #ifndef SWM_LIB
> 

Thanks!

Been running this for a few hours on -current on amd64. No regressions
noticed. Happily, it fixes an issue in VLC where the cursor could not
interact with the window after the first click.