Bjorn Ketelaars wrote (2022-12-03 12:46 CET):
> spectrwm-3.4.1, which we currently have in ports, was released in June,
> 2020. In the mean time a couple of interesting changes have been
> committed:
> - Simplify use of pledge(2) on OpenBSD
> - Remove unused function
> - Switch from SIMPLEQ- to STAILQ-macros
> - Disable border for max windows if disable_border=always
> - Mention Control in the manual
> - Fix Java workaround.
> - The first line of iostat(8) displays the stats from the time of the
>   last reboot.  Show the current stats instead by grabbing and
>   displaying the second line.
> - Finish pr#360 (workspace Indicator and bar enhancments)
> - added printonlynames option to workspace_indicator
> - Fix handling when a window is lost immediately after ReparentWindow.
> - Add "wpath" pledge for sparc64 support
> - Fix ws cycle actions should all skip visible workspaces.
> - Fix iconified windows should not get focus when switching workspaces.
> - Fix `raise` unfocus handling and stacking.
> - Fix `raise` should be also be restacked.
> - Set WM_CLASS, WM_NAME and _NET_WM_NAME on the status bar window(s).
> 
> As an user of spectrwm I think several of these commits are nice to
> have, and would like to propose to update to HEAD. This allows us to
> drop at least one patch. FWIW, I'm not expecting upstream to provide a
> new release anytime soon.
> 
> Comments/OK?

Yes, please. Builds, port checks are fine and my setup is still running.
I have a similar diff in mystuff for a while.

OK sdk@

> diff --git Makefile Makefile
> index 617ac99f6dd..41599e4a5b5 100644
> --- Makefile
> +++ Makefile
> @@ -1,12 +1,9 @@
>  COMMENT=             small tiling window manager
>  
> -V=                   3.4.1
>  GH_ACCOUNT=          conformal
>  GH_PROJECT=          spectrwm
> -GH_TAGNAME=          SPECTRWM_${V:S/./_/g}
> -DISTNAME=            ${GH_PROJECT}-${V}
> -
> -REVISION=            2
> +GH_COMMIT=           5b7298872e00aa23ba9fe7eb9a219296a98760ac
> +DISTNAME=            ${GH_PROJECT}-3.4.1.20211013
>  
>  SHARED_LIBS=         swmhack 1.0
>  
> diff --git distinfo distinfo
> index b5a42aa3a24..5d1bfc6a059 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (spectrwm-3.4.1.tar.gz) = wDDvML0Ru9/OPUodr1HwwTWIIbqV69xM2zLTlEyM4Dw=
> -SIZE (spectrwm-3.4.1.tar.gz) = 164507
> +SHA256 (spectrwm-3.4.1.20211013-5b729887.tar.gz) = 
> dNCIMq7eexETAgJ/k9FeFE4Q4i10Kc9/EAEAMpLjLTQ=
> +SIZE (spectrwm-3.4.1.20211013-5b729887.tar.gz) = 161707
> diff --git patches/patch-baraction_sh patches/patch-baraction_sh
> deleted file mode 100644
> index fde47f538cc..00000000000
> --- patches/patch-baraction_sh
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -Index: baraction.sh
> ---- baraction.sh.orig
> -+++ baraction.sh
> -@@ -84,7 +84,7 @@ print_bat() {
> - APM_DATA=""
> - I=0
> - while :; do
> --    IOSTAT_DATA=`/usr/sbin/iostat -C | grep '[0-9]$'`
> -+    IOSTAT_DATA=`/usr/sbin/iostat -C -c 2 | tail -n 1 | grep '[0-9]$'`
> -     if [ $I -eq 0 ]; then
> -             APM_DATA=`/usr/sbin/apm -alb`
> -     fi
> diff --git patches/patch-spectrwm_1 patches/patch-spectrwm_1
> index e51ea5f92c1..a2748e15bd8 100644
> --- patches/patch-spectrwm_1
> +++ patches/patch-spectrwm_1
> @@ -1,7 +1,7 @@
>  Index: spectrwm.1
>  --- spectrwm.1.orig
>  +++ spectrwm.1
> -@@ -144,7 +144,7 @@ For example, starting
> +@@ -149,7 +149,7 @@ For example, starting
>   via
>   .Xr xinit 1 :
>   .Bd -literal -offset indent
> diff --git patches/patch-spectrwm_c patches/patch-spectrwm_c
> index 03d2f210d29..44a875e3cb1 100644
> --- patches/patch-spectrwm_c
> +++ patches/patch-spectrwm_c
> @@ -1,10 +1,9 @@
> -Needs wpath pledge. Tahen from https://github.com/conformal/spectrwm/pull/425
>  Let spectrwm quit when X dies. Taken from 
> https://github.com/conformal/spectrwm/pull/478
>  
>  Index: spectrwm.c
>  --- spectrwm.c.orig
>  +++ spectrwm.c
> -@@ -310,7 +310,7 @@ uint32_t         swm_debug = 0
> +@@ -332,7 +332,7 @@ uint32_t         swm_debug = 0
>   #define SWM_CONF_KEYMAPPING (1)
>   
>   #ifndef SWM_LIB
> @@ -13,34 +12,7 @@ Index: spectrwm.c
>   #endif
>   
>   char                        **start_argv;
> -@@ -13605,7 +13605,7 @@ main(int argc, char *argv[])
> -     if (setlocale(LC_CTYPE, "") == NULL || setlocale(LC_TIME, "") == NULL)
> -             warnx("no locale support");
> - 
> --    if (pledge("stdio proc exec rpath getpw dns inet unix", NULL) == -1)
> -+    if (pledge("stdio proc exec rpath getpw dns inet unix wpath", NULL) == 
> -1)
> -             err(1, "pledge");
> - 
> -     /* handle some signals */
> -@@ -13625,7 +13625,7 @@ main(int argc, char *argv[])
> -     if ((display = XOpenDisplay(0)) == NULL)
> -             errx(1, "unable to open display");
> - 
> --    if (pledge("stdio proc exec rpath getpw", NULL) == -1)
> -+    if (pledge("stdio proc exec rpath getpw wpath", NULL) == -1)
> -             err(1, "pledge");
> - 
> -     conn = XGetXCBConnection(display);
> -@@ -13680,7 +13680,7 @@ main(int argc, char *argv[])
> -     else
> -             scan_config();
> - 
> --    if (pledge("stdio proc exec rpath", NULL) == -1)
> -+    if (pledge("stdio proc exec rpath wpath", NULL) == -1)
> -             err(1, "pledge");
> - 
> -     validate_spawns();
> -@@ -13762,6 +13762,9 @@ main(int argc, char *argv[])
> +@@ -13931,6 +13931,9 @@ main(int argc, char *argv[])
>                       restart(NULL, NULL, NULL);
>   
>               if (!running)
> 

Reply via email to