Bjorn Ketelaars wrote (2023-04-23 11:26 CEST):
> Upstream of spectrwm has not released an update for over more than 2
> years, but has fixed numerous issues, and added useful features. Because
> of these fixes/additions our port was moved to HEAD in December of 2022.
> Proposal is to once more update to HEAD. Relevant changes:
[snip]
> I have been using this as my daily driver.
>
> Comments/OK?
I'm using the same diff since mid of March.
ok sdk@
> diff --git Makefile Makefile
> index 41599e4a5b5..ba6fbafe1bd 100644
> --- Makefile
> +++ Makefile
> @@ -2,8 +2,8 @@ COMMENT= small tiling window manager
>
> GH_ACCOUNT= conformal
> GH_PROJECT= spectrwm
> -GH_COMMIT= 5b7298872e00aa23ba9fe7eb9a219296a98760ac
> -DISTNAME= ${GH_PROJECT}-3.4.1.20211013
> +GH_COMMIT= efc458efa5730680a5ff3805f6cf9d88dc88748b
> +DISTNAME= ${GH_PROJECT}-3.4.1.20230310
>
> SHARED_LIBS= swmhack 1.0
>
> diff --git distinfo distinfo
> index 5d1bfc6a059..6323c9aba13 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (spectrwm-3.4.1.20211013-5b729887.tar.gz) =
> dNCIMq7eexETAgJ/k9FeFE4Q4i10Kc9/EAEAMpLjLTQ=
> -SIZE (spectrwm-3.4.1.20211013-5b729887.tar.gz) = 161707
> +SHA256 (spectrwm-3.4.1.20230310-efc458ef.tar.gz) =
> 8hjhkgcC+mA+PlGZxDIRmNXAOMMWLPLCtPuGlF2ghyw=
> +SIZE (spectrwm-3.4.1.20230310-efc458ef.tar.gz) = 172141
> diff --git patches/patch-spectrwm_c patches/patch-spectrwm_c
> index 44a875e3cb1..c6b86658164 100644
> --- patches/patch-spectrwm_c
> +++ patches/patch-spectrwm_c
> @@ -1,9 +1,7 @@
> -Let spectrwm quit when X dies. Taken from
> https://github.com/conformal/spectrwm/pull/478
> -
> Index: spectrwm.c
> --- spectrwm.c.orig
> +++ spectrwm.c
> -@@ -332,7 +332,7 @@ uint32_t swm_debug = 0
> +@@ -331,7 +331,7 @@ uint32_t swm_debug = 0
> #define SWM_CONF_KEYMAPPING (1)
>
> #ifndef SWM_LIB
> @@ -12,13 +10,3 @@ Index: spectrwm.c
> #endif
>
> char **start_argv;
> -@@ -13931,6 +13931,9 @@ main(int argc, char *argv[])
> - restart(NULL, NULL, NULL);
> -
> - if (!running)
> -+ goto done;
> -+
> -+ if(xcb_connection_has_error(conn))
> - goto done;
> -
> - if (stdin_ready) {
>
