Re: [update] x11/dwm 6.4 -> 6.5

David Uhden Collado wrote (2024-09-03 07:41 CEST):
> 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.

Please don't. People are using dwm with other terminal emulators. And
more important, people use dwm with patched versions of st, which would
create a conflict when the ports vanilla st is installed as well.

The same goes for dmenu. People use rofi, or patched versions of dmenu.

You didn't regen the patches properly. The config.def.h patch doesn't
apply and the config.mk patch needs a slight change in the context.

I fixed that below. OK sdk@ for the update without st/dmenu changes.

Thanks for the update.

Best regards,
Stefan

Index: x11/dwm/Makefile
===================================================================
RCS file: /cvs/ports/x11/dwm/Makefile,v
diff -u -p -u -p -r1.40 Makefile
--- x11/dwm/Makefile 27 Sep 2023 20:37:03 -0000 1.40
+++ x11/dwm/Makefile 3 Sep 2024 06:14:53 -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
diff -u -p -u -p -r1.22 distinfo
--- x11/dwm/distinfo 13 Oct 2022 18:15:36 -0000 1.22
+++ x11/dwm/distinfo 3 Sep 2024 06:14:53 -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
diff -u -p -u -p -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 06:14:53 -0000
@@ -37,16 +37,16 @@ Index: config.def.h
};

/* layout(s) */
-@@ -57,7 +60,7 @@ static const Layout layouts[] = {
-
+@@ -58,7 +61,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 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[] = {
+@@ -66,7 +69,9 @@ static const Key keys[] = {
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
{ MODKEY, XK_b, togglebar, {0} },
{ MODKEY, XK_j, focusstack, {.i = +1 } },
Index: x11/dwm/patches/patch-config_mk
===================================================================
RCS file: /cvs/ports/x11/dwm/patches/patch-config_mk,v
diff -u -p -u -p -r1.16 patch-config_mk
--- x11/dwm/patches/patch-config_mk 13 Oct 2022 18:15:36 -0000 1.16
+++ x11/dwm/patches/patch-config_mk 3 Sep 2024 06:14:53 -0000
@@ -14,7 +14,7 @@ Index: config.mk
INCS = -I${X11INC} -I${FREETYPEINC}
@@ -28,8 +28,8 @@ LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIB
# flags
- CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+ CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
-CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = ${LIBS}