From: David Uhden Collado Subject: [update] x11/dwm 6.4 -> 6.5 To: ports@openbsd.org Cc: jung@openbsd.org Date: Tue, 3 Sep 2024 07:41:34 +0200 In this email, I have attached a diff to update x11/dwm to version 6.5. OK? Comments? Additionally, I would like to suggest adding x11/st as a dependency in this window manager, as well as x11/dmenu, this window manager is intended to be used with this terminal emulator, and I do not understand why it is replaced by xterm in this port. On the other hand, we could remove the man page patch this way. I have also attached a diff with these proposed changes and look forward to your comments. Index: x11/dwm/Makefile =================================================================== RCS file: /cvs/ports/x11/dwm/Makefile,v retrieving revision 1.40 diff -u -p -u -r1.40 Makefile --- x11/dwm/Makefile 27 Sep 2023 20:37:03 -0000 1.40 +++ x11/dwm/Makefile 3 Sep 2024 05:17:48 -0000 @@ -1,6 +1,6 @@ COMMENT= dynamic window manager -V= 6.4 +V= 6.5 DISTNAME= dwm-${V} CATEGORIES= x11 Index: x11/dwm/distinfo =================================================================== RCS file: /cvs/ports/x11/dwm/distinfo,v retrieving revision 1.22 diff -u -p -u -r1.22 distinfo --- x11/dwm/distinfo 13 Oct 2022 18:15:36 -0000 1.22 +++ x11/dwm/distinfo 3 Sep 2024 05:17:54 -0000 @@ -1,2 +1,2 @@ -SHA256 (dwm-6.4.tar.gz) = +pwNaaWESFB2z8GICf1wXlwggNr7E9XnKaNkbKdwOm4= -SIZE (dwm-6.4.tar.gz) = 25321 +SHA256 (dwm-6.5.tar.gz) = Ideev6ny+5MUGDbCZmy4H0eExp1k5/GyNS+blwuglyk= +SIZE (dwm-6.5.tar.gz) = 25588 Index: x11/dwm/patches/patch-config_def_h =================================================================== RCS file: /cvs/ports/x11/dwm/patches/patch-config_def_h,v retrieving revision 1.18 diff -u -p -u -r1.18 patch-config_def_h --- x11/dwm/patches/patch-config_def_h 13 Oct 2022 18:15:36 -0000 1.18 +++ x11/dwm/patches/patch-config_def_h 3 Sep 2024 05:18:02 -0000 @@ -1,7 +1,8 @@ Index: config.def.h ---- config.def.h.orig +--- config.def.h +++ config.def.h -@@ -5,17 +5,17 @@ static const unsigned int borderpx = 1; /* bor +@@ -6,17 +6,17 @@ + static const unsigned int borderpx = 1; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ @@ -27,7 +28,7 @@ Index: config.def.h }; /* tagging */ -@@ -29,6 +29,9 @@ static const Rule rules[] = { +@@ -31,6 +31,9 @@ /* class instance title tags mask isfloating monitor */ { "Gimp", NULL, NULL, 0, 1, -1 }, { "Firefox", NULL, NULL, 1 << 8, 0, -1 }, @@ -37,16 +38,17 @@ Index: config.def.h }; /* layout(s) */ -@@ -57,7 +60,7 @@ static const Layout layouts[] = { +@@ -60,7 +63,7 @@ /* commands */ - static const char *dmenucmd[] = { "dmenu_run", "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; + static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ + static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; -static const char *termcmd[] = { "st", NULL }; +static const char *termcmd[] = { "xterm", NULL }; static const Key keys[] = { /* modifier key function argument */ -@@ -65,7 +68,9 @@ static const Key keys[] = { +@@ -68,7 +71,9 @@ { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstack, {.i = +1 } }, Index: x11/dwm/Makefile =================================================================== RCS file: /cvs/ports/x11/dwm/Makefile,v retrieving revision 1.40 diff -u -p -u -r1.40 Makefile --- x11/dwm/Makefile 27 Sep 2023 20:37:03 -0000 1.40 +++ x11/dwm/Makefile 3 Sep 2024 05:22:32 -0000 @@ -1,6 +1,6 @@ COMMENT= dynamic window manager -V= 6.4 +V= 6.5 DISTNAME= dwm-${V} CATEGORIES= x11 @@ -17,7 +17,8 @@ WANTLIB= X11 Xinerama Xft c fontconfig SITES= https://dl.suckless.org/dwm/ -RUN_DEPENDS= x11/dmenu>=4.6 \ +RUN_DEPENDS= x11/dmenu \ + x11/st \ fonts/terminus-font MAKE_ENV= LDFLAGS="${LDFLAGS}" \ Index: x11/dwm/distinfo =================================================================== RCS file: /cvs/ports/x11/dwm/distinfo,v retrieving revision 1.22 diff -u -p -u -r1.22 distinfo --- x11/dwm/distinfo 13 Oct 2022 18:15:36 -0000 1.22 +++ x11/dwm/distinfo 3 Sep 2024 05:23:10 -0000 @@ -1,2 +1,2 @@ -SHA256 (dwm-6.4.tar.gz) = +pwNaaWESFB2z8GICf1wXlwggNr7E9XnKaNkbKdwOm4= -SIZE (dwm-6.4.tar.gz) = 25321 +SHA256 (dwm-6.5.tar.gz) = Ideev6ny+5MUGDbCZmy4H0eExp1k5/GyNS+blwuglyk= +SIZE (dwm-6.5.tar.gz) = 25588 Index: x11/dwm/patches/patch-config_def_h =================================================================== RCS file: /cvs/ports/x11/dwm/patches/patch-config_def_h,v retrieving revision 1.18 diff -u -p -u -r1.18 patch-config_def_h --- x11/dwm/patches/patch-config_def_h 13 Oct 2022 18:15:36 -0000 1.18 +++ x11/dwm/patches/patch-config_def_h 3 Sep 2024 05:23:23 -0000 @@ -1,7 +1,8 @@ Index: config.def.h ---- config.def.h.orig +--- config.def.h +++ config.def.h -@@ -5,17 +5,17 @@ static const unsigned int borderpx = 1; /* bor +@@ -6,17 +6,17 @@ + static const unsigned int borderpx = 1; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ @@ -27,7 +28,7 @@ Index: config.def.h }; /* tagging */ -@@ -29,6 +29,9 @@ static const Rule rules[] = { +@@ -31,6 +31,9 @@ /* class instance title tags mask isfloating monitor */ { "Gimp", NULL, NULL, 0, 1, -1 }, { "Firefox", NULL, NULL, 1 << 8, 0, -1 }, @@ -37,16 +38,7 @@ Index: config.def.h }; /* layout(s) */ -@@ -57,7 +60,7 @@ static const Layout layouts[] = { - - /* commands */ - static const char *dmenucmd[] = { "dmenu_run", "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; --static const char *termcmd[] = { "st", NULL }; -+static const char *termcmd[] = { "xterm", NULL }; - - static const Key keys[] = { - /* modifier key function argument */ -@@ -65,7 +68,9 @@ static const Key keys[] = { +@@ -68,7 +71,9 @@ { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstack, {.i = +1 } },