From: Volker Schlecht <openbsd-ports@schlecht.dev>
Subject: Re: x11/dunst - add wayland FLAVOR?
To: Timo Myyrä <timo.myyra@bittivirhe.fi>, "ports@openbsd.org" <ports@openbsd.org>
Date: Mon, 2 Mar 2026 20:19:46 +0100

On 3/2/26 7:03 PM, Stuart Henderson wrote:
> On 2026/03/02 19:54, Timo Myyrä wrote:
>>
>> I'm not sure if it is worth the hassle to add wayland support as a
>> flavor if it supports X11 and wayland at the same time.
> 
> correct - if it supports both then this is the right way to go.
> 
>> Here's quick diff to update the dunst version and adding the wayland
>> support for it. Needed to patch few files under wayland for
>> input-events.

What about a BDEP on libinput-openbsd rather than the extra patch?
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/dunst/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile	31 Dec 2025 14:23:22 -0000	1.20
+++ Makefile	2 Mar 2026 19:07:39 -0000
@@ -2,7 +2,7 @@ COMMENT =	customizable and lightweight n
 
 GH_ACCOUNT =	dunst-project
 GH_PROJECT =	dunst
-GH_TAGNAME =	v1.13.0
+GH_TAGNAME =	v1.13.1
 
 CATEGORIES =	x11
 
@@ -16,6 +16,7 @@ PERMIT_PACKAGE =	Yes
 WANTLIB += X11 Xext Xinerama Xrandr Xss c cairo gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glib-2.0 gobject-2.0 harfbuzz intl m notify
 WANTLIB += pango-1.0 pangocairo-1.0 pthread
+WANTLIB += wayland-client wayland-cursor
 
 # C11 with GNU extensions
 COMPILER =	base-clang ports-gcc
@@ -25,6 +26,7 @@ CFLAGS +=	-std=gnu11
 USE_GMAKE =	Yes
 
 BUILD_DEPENDS =	graphics/png \
+		wayland/libinput-openbsd \
 		x11/dbus
 
 LIB_DEPENDS +=	devel/gettext,-runtime \
@@ -32,7 +34,8 @@ LIB_DEPENDS +=	devel/gettext,-runtime \
 		devel/libnotify \
 		devel/pango \
 		graphics/cairo \
-		graphics/gdk-pixbuf2
+		graphics/gdk-pixbuf2 \
+		wayland/wayland
 
 RUN_DEPENDS +=	x11/dbus
 
@@ -44,8 +47,7 @@ MAKE_FLAGS =	PREFIX="${PREFIX}" \
 		SYSCONFDIR="/etc" \
 		BASHCOMPLETIONDIR="${LOCALBASE}/share/bash-completion/completions" \
 		FISHCOMPLETIONDIR="${LOCALBASE}/share/fish/vendor_completions.d" \
-		ZSHCOMPLETIONDIR="${LOCALBASE}/share/zsh/site-functions" \
-		WAYLAND=0
+		ZSHCOMPLETIONDIR="${LOCALBASE}/share/zsh/site-functions"
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/docs/dunst.1.pod.in \
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/dunst/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo	31 Dec 2025 14:23:22 -0000	1.11
+++ distinfo	2 Mar 2026 19:07:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (dunst-1.13.0.tar.gz) = eooYE5d61ZQUiMZrkUUBcD/A9uEuYx3BhQatYXJC56A=
-SIZE (dunst-1.13.0.tar.gz) = 4664717
+SHA256 (dunst-1.13.1.tar.gz) = pXjlws21RhhzVccQ8aqExHLm4jgo5pL+HLDruWNbEaY=
+SIZE (dunst-1.13.1.tar.gz) = 4666210
Index: patches/patch-config_mk
===================================================================
RCS file: /cvs/ports/x11/dunst/patches/patch-config_mk,v
retrieving revision 1.10
diff -u -p -r1.10 patch-config_mk
--- patches/patch-config_mk	31 Dec 2025 14:23:22 -0000	1.10
+++ patches/patch-config_mk	2 Mar 2026 19:07:39 -0000
@@ -5,9 +5,9 @@ Index: config.mk
  
  # flags
  DEFAULT_CPPFLAGS = -Wno-gnu-zero-variadic-macro-arguments -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\" -DSYSCONFDIR=\"${SYSCONFDIR}\" ${ENABLE_WAYLAND} ${ENABLE_X11}
--DEFAULT_CFLAGS   = -g -std=gnu11 -pedantic -Wall -Wno-overlength-strings -Os ${EXTRA_CFLAGS}
+-DEFAULT_CFLAGS   = -g -std=gnu11 -pedantic -Wall -Wno-overlength-strings -Wno-expansion-to-defined -Os ${EXTRA_CFLAGS}
 -DEFAULT_LDFLAGS  = -lm -lrt
-+DEFAULT_CFLAGS   = -g -std=gnu11 -pedantic -Wall -Wno-overlength-strings ${EXTRA_CFLAGS}
++DEFAULT_CFLAGS   = -g -std=gnu11 -pedantic -Wall -Wno-overlength-strings -Wno-expansion-to-defined ${EXTRA_CFLAGS}
 +DEFAULT_LDFLAGS  = -lm
  
  CPPFLAGS_DEBUG :=
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/dunst/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST	15 Apr 2025 19:28:05 -0000	1.9
+++ pkg/PLIST	2 Mar 2026 19:07:39 -0000
@@ -7,6 +7,7 @@ bin/dunstctl
 @man man/man5/dunst.5
 share/bash-completion/completions/dunst
 share/bash-completion/completions/dunstctl
+share/bash-completion/completions/dunstify
 share/dunst/
 @sample ${SYSCONFDIR}/dunst/
 share/dunst/dunstrc
@@ -23,3 +24,4 @@ share/zsh/
 share/zsh/site-functions/
 share/zsh/site-functions/_dunst
 share/zsh/site-functions/_dunstctl
+share/zsh/site-functions/_dunstify