Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1713713392234780"
MIME-Version: 1.0
Date: Sun, 21 Apr 2024 15:29:52 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/x11/dunst
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20240421152952.F3BA1FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1713713392234780
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Sun Apr 21 15:29:52 UTC 2024

Modified Files:
	pkgsrc/x11/dunst: Makefile PLIST distinfo
	pkgsrc/x11/dunst/patches: patch-Makefile
Removed Files:
	pkgsrc/x11/dunst/patches: patch-src_input.c patch-src_x11_x.c

Log Message:
dunst: update to 1.11.0.

===================================================================================
Release Notes For v1.11.0
===================================================================================

This release hopefully marks the start of a new period of active development and
contributions and a shift away from the previous lower maintenance mode.

For users:

This is the perfect time to engage with the project and other dunst users.
Some of the features and changes to include in the v2 release are starting to
be proposed or implemented. Everyone's opinion is important, so feel free
to participate in the issues proposing new features (or redesigns of the old ones).

This version mainly contains bug fixes and QoL improvements, and can be considered
a preparatory release for the various things that will come in the future
(overhaul of the rule syntax, multiple windows support, aesthetic and customization
options, refactor of the drawing system, etc).

For maintainers:

X11 support is now optional and can be disabled in build by setting the `X11` make
flag to 0. This means that you can offer Wayland-only builds.

Shell completions are now considered official and can be installed/uninstalled from
the Makefile. By default they are installed and can be disabled by setting the
`COMPLETIONS` flag to 0.

Take a look at the changelog for all the bug fixes and improvements.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/x11/dunst/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/dunst/PLIST
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/dunst/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/dunst/patches/patch-Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/dunst/patches/patch-src_input.c \
    pkgsrc/x11/dunst/patches/patch-src_x11_x.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1713713392234780
Content-Disposition: inline
Content-Length: 5905
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/x11/dunst/Makefile
diff -u pkgsrc/x11/dunst/Makefile:1.35 pkgsrc/x11/dunst/Makefile:1.36
--- pkgsrc/x11/dunst/Makefile:1.35	Sun Apr  7 07:35:15 2024
+++ pkgsrc/x11/dunst/Makefile	Sun Apr 21 15:29:52 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2024/04/07 07:35:15 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2024/04/21 15:29:52 wiz Exp $
 
-DISTNAME=	dunst-1.10.0
-PKGREVISION=	1
+DISTNAME=	dunst-1.11.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=dunst-project/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -45,6 +44,9 @@ INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 INSTALLATION_DIRS+=	${PKGMANDIR}/man5
 INSTALLATION_DIRS+=	share/dbus-1/services
 INSTALLATION_DIRS+=	share/dunst
+INSTALLATION_DIRS+=	share/bash-completion/completions
+INSTALLATION_DIRS+=	share/zsh/site-functions
+INSTALLATION_DIRS+=	share/fish/vendor_completions.d
 
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"

Index: pkgsrc/x11/dunst/PLIST
diff -u pkgsrc/x11/dunst/PLIST:1.3 pkgsrc/x11/dunst/PLIST:1.4
--- pkgsrc/x11/dunst/PLIST:1.3	Mon Jan  9 18:44:17 2023
+++ pkgsrc/x11/dunst/PLIST	Sun Apr 21 15:29:52 2024
@@ -1,9 +1,16 @@
-@comment $NetBSD: PLIST,v 1.3 2023/01/09 18:44:17 vins Exp $
+@comment $NetBSD: PLIST,v 1.4 2024/04/21 15:29:52 wiz Exp $
 bin/dunst
 bin/dunstctl
 bin/dunstify
 man/man1/dunst.1
 man/man1/dunstctl.1
 man/man5/dunst.5
+share/bash-completion/completions/dunst
+share/bash-completion/completions/dunstctl
 share/dbus-1/services/org.knopwob.dunst.service
 share/dunst/dunstrc
+share/fish/vendor_completions.d/dunst
+share/fish/vendor_completions.d/dunstctl
+share/fish/vendor_completions.d/dunstify
+share/zsh/site-functions/_dunst
+share/zsh/site-functions/_dunstctl

Index: pkgsrc/x11/dunst/distinfo
diff -u pkgsrc/x11/dunst/distinfo:1.16 pkgsrc/x11/dunst/distinfo:1.17
--- pkgsrc/x11/dunst/distinfo:1.16	Sun Apr 14 15:42:44 2024
+++ pkgsrc/x11/dunst/distinfo	Sun Apr 21 15:29:52 2024
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.16 2024/04/14 15:42:44 wiz Exp $
+$NetBSD: distinfo,v 1.17 2024/04/21 15:29:52 wiz Exp $
 
-BLAKE2s (dunst-1.10.0.tar.gz) = a997fc8a451540a5d38f1bb7a885cfed55c5f814e5a73fa7929666d03d593530
-SHA512 (dunst-1.10.0.tar.gz) = e7e453c9470a063cdee4602315b22c1c8bcbf1405d3c295bccf01ae4e1b535e11b7323313b63cfc510e38ea8243117d550e6057df15924bbd4efb7e0b7f9a709
-Size (dunst-1.10.0.tar.gz) = 4639084 bytes
-SHA1 (patch-Makefile) = d289510c2e722f7dc418dcaf25cd814b4b8c5c69
-SHA1 (patch-src_input.c) = dbc9294cccb37048972ac7c0d01bbe65362a9111
-SHA1 (patch-src_x11_x.c) = 94a4b65bde1a0e4325a0fe76939b4ce4112f2a58
+BLAKE2s (dunst-1.11.0.tar.gz) = 46f78bea47ed40a9a30a251661e1b9b2f5dcf5b107fa1a6e8608b29eaab7d192
+SHA512 (dunst-1.11.0.tar.gz) = 84c9edccddd183fb867233cb5377115d96735f4c1be84007194ac39dd48d913e5bb021d2952057aecdb978564c2471a8974c4ee4eeccfb188e5345527007a5c4
+Size (dunst-1.11.0.tar.gz) = 4645279 bytes
+SHA1 (patch-Makefile) = 27d091bc7e734dcc519e90745814075e5873b83f

Index: pkgsrc/x11/dunst/patches/patch-Makefile
diff -u pkgsrc/x11/dunst/patches/patch-Makefile:1.11 pkgsrc/x11/dunst/patches/patch-Makefile:1.12
--- pkgsrc/x11/dunst/patches/patch-Makefile:1.11	Sun Apr 14 15:42:44 2024
+++ pkgsrc/x11/dunst/patches/patch-Makefile	Sun Apr 21 15:29:52 2024
@@ -1,21 +1,12 @@
-$NetBSD: patch-Makefile,v 1.11 2024/04/14 15:42:44 wiz Exp $
+$NetBSD: patch-Makefile,v 1.12 2024/04/21 15:29:52 wiz Exp $
 
 Use more portable find options.
 Use BSD_INSTALL.
 
---- Makefile.orig	2024-02-19 20:44:18.000000000 +0000
+--- Makefile.orig	2024-04-15 20:20:32.000000000 +0000
 +++ Makefile
-@@ -35,7 +35,7 @@ LDFLAGS := ${DEFAULT_LDFLAGS} ${LDFLAGS}
- 
- ifeq (0,${WAYLAND})
- # without wayland support
--SRC := $(sort $(shell ${FIND} src/ -not \( -path src/wayland -prune \) -name '*.c'))
-+SRC := $(sort $(shell ${FIND} src/ ! \( -path src/wayland -prune \) -name '*.c'))
- else
- # with Wayland support
- CFLAGS += -DHAVE_WL_CURSOR_SHAPE -DHAVE_WL_EXT_IDLE_NOTIFY
-@@ -198,22 +198,22 @@ clean-wayland-protocols:
- install: install-dunst install-dunstctl install-dunstrc install-service 
+@@ -207,22 +207,22 @@ clean-wayland-protocols:
+ install: install-dunst install-dunstctl install-dunstrc install-service
  
  install-dunst: dunst doc
 -	install -Dm755 dunst ${DESTDIR}${BINDIR}/dunst
@@ -44,7 +35,7 @@ Use BSD_INSTALL.
  ifneq (0,${SYSTEMD})
  install-service: install-service-systemd
  install-service-systemd: service-systemd
-@@ -223,7 +223,7 @@ endif
+@@ -232,18 +232,18 @@ endif
  ifneq (0,${DUNSTIFY})
  install: install-dunstify
  install-dunstify: dunstify
@@ -52,4 +43,21 @@ Use BSD_INSTALL.
 +	${BSD_INSTALL_PROGRAM} dunstify ${DESTDIR}${BINDIR}/dunstify
  endif
  
- uninstall: uninstall-keepconf
+ ifneq (0,${COMPLETIONS})
+ install: install-completions
+ install-completions:
+-	install -Dm644 completions/dunst.bashcomp ${DESTDIR}${BASHCOMPLETIONDIR}/dunst
+-	install -Dm644 completions/dunstctl.bashcomp ${DESTDIR}${BASHCOMPLETIONDIR}/dunstctl
+-	install -Dm644 completions/_dunst.zshcomp ${DESTDIR}${ZSHCOMPLETIONDIR}/_dunst
+-	install -Dm644 completions/_dunstctl.zshcomp ${DESTDIR}${ZSHCOMPLETIONDIR}/_dunstctl
+-	install -Dm644 completions/dunst.fishcomp ${DESTDIR}${FISHCOMPLETIONDIR}/dunst
+-	install -Dm644 completions/dunstctl.fishcomp ${DESTDIR}${FISHCOMPLETIONDIR}/dunstctl
++	${BSD_INSTALL_DATA} completions/dunst.bashcomp ${DESTDIR}${BASHCOMPLETIONDIR}/dunst
++	${BSD_INSTALL_DATA} completions/dunstctl.bashcomp ${DESTDIR}${BASHCOMPLETIONDIR}/dunstctl
++	${BSD_INSTALL_DATA} completions/_dunst.zshcomp ${DESTDIR}${ZSHCOMPLETIONDIR}/_dunst
++	${BSD_INSTALL_DATA} completions/_dunstctl.zshcomp ${DESTDIR}${ZSHCOMPLETIONDIR}/_dunstctl
++	${BSD_INSTALL_DATA} completions/dunst.fishcomp ${DESTDIR}${FISHCOMPLETIONDIR}/dunst
++	${BSD_INSTALL_DATA} completions/dunstctl.fishcomp ${DESTDIR}${FISHCOMPLETIONDIR}/dunstctl
+ 
+ ifneq (0,${DUNSTIFY})
+ install: install-completions-dunstify


--_----------=_1713713392234780--