dunst-git: add package tracking dunst git head

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: dunst-git: add package tracking dunst git head
From: Thomas Klausner <wiz%gatalith.at@localhost>
Date: Wed, 21 Feb 2024 12:55:38 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Wed Feb 21 13:55:38 2024 +0100
Changeset:	804abf8111fcd354f773d938db617abac6343475

Modified Files:
	Makefile
Added Files:
	dunst-git/DESCR
	dunst-git/Makefile
	dunst-git/PLIST
	dunst-git/distinfo
	dunst-git/patches/patch-Makefile
	dunst-git/patches/patch-src_input.c
	dunst-git/patches/patch-src_x11_x.c
	dunst-git/patches/patch-test_utils.c

Log Message:
dunst-git: add package tracking dunst git head

for testing patches

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=804abf8111fcd354f773d938db617abac6343475

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

diffstat:
 Makefile                             |  4 +++
 dunst-git/DESCR                      |  6 ++++
 dunst-git/Makefile                   | 58 ++++++++++++++++++++++++++++++++++++
 dunst-git/PLIST                      |  9 ++++++
 dunst-git/distinfo                   |  8 +++++
 dunst-git/patches/patch-Makefile     | 55 ++++++++++++++++++++++++++++++++++
 dunst-git/patches/patch-src_input.c  | 21 +++++++++++++
 dunst-git/patches/patch-src_x11_x.c  | 21 +++++++++++++
 dunst-git/patches/patch-test_utils.c | 11 +++++++
 9 files changed, 193 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 7899d62de6..836d9f6d18 100644
--- a/Makefile
+++ b/Makefile
@@ -729,6 +729,7 @@ SUBDIR+=	dumb
 SUBDIR+=	dune-common
 SUBDIR+=	dune-geometry
 SUBDIR+=	dune-istl
+SUBDIR+=	dunst-git
 SUBDIR+=	duplo
 SUBDIR+=	dvbsnoop
 SUBDIR+=	dvegas
@@ -2563,6 +2564,7 @@ SUBDIR+=	openmp
 SUBDIR+=	opennurbs
 SUBDIR+=	openra
 SUBDIR+=	openrw-git
+SUBDIR+=	openscad
 SUBDIR+=	openscep
 SUBDIR+=	openshot-qt
 SUBDIR+=	opensips
@@ -5194,6 +5196,7 @@ SUBDIR+=	spread4
 SUBDIR+=	spyder
 SUBDIR+=	sqlc
 SUBDIR+=	sqlux
+SUBDIR+=	squeak3
 SUBDIR+=	squeak5
 SUBDIR+=	squeak5-vm
 SUBDIR+=	squeak6
@@ -5630,6 +5633,7 @@ SUBDIR+=	vkeybd
 SUBDIR+=	vlang
 SUBDIR+=	vlevel
 SUBDIR+=	vm-pop3d
+SUBDIR+=	vmailmgr
 SUBDIR+=	vmsbackup
 SUBDIR+=	vmware-sercons
 SUBDIR+=	vncselector
diff --git a/dunst-git/DESCR b/dunst-git/DESCR
new file mode 100644
index 0000000000..24dcd55102
--- /dev/null
+++ b/dunst-git/DESCR
@@ -0,0 +1,6 @@
+Dunst is a lightweight replacement for the notification-daemons
+provided by most desktop environments. It's very customizable,
+doesn't depend on any toolkits and therefore fits in those window
+manager centric setups we all love to customize to perfection.
+
+Dunst is a part of the j4tools tools set.
diff --git a/dunst-git/Makefile b/dunst-git/Makefile
new file mode 100644
index 0000000000..7a15bd1163
--- /dev/null
+++ b/dunst-git/Makefile
@@ -0,0 +1,58 @@
+# $NetBSD: Makefile,v 1.32 2023/11/14 14:03:07 wiz Exp $
+
+DISTNAME=	dunst-1.9.2
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_GITHUB:=dunst-project/}
+GIT_REPO=	https://github.com/dunst-project/dunst.git
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://dunst-project.org/
+COMMENT=	Customizable and lightweight notification-daemon
+LICENSE=	modified-bsd
+
+USE_TOOLS+=	bash:test gmake pod2man pkg-config
+
+# PASS test_notification_referencing:  (0 ticks, 0.000 sec)
+# bash: line 2: 14069 Segmentation fault      (core dumped) ./test/test -v
+#      11348 Done                    | ./test/greenest.awk
+# gmake: *** [Makefile:76: test] Error 139
+TEST_TARGET=	test
+
+MAKE_FLAGS+=	SYSTEMD=0
+MAKE_FLAGS+=	WAYLAND=0
+
+REPLACE_SH+=	contrib/progress-notify.sh
+REPLACE_BASH+=	contrib/dunst_xr_theme_changer.sh
+REPLACE_BASH+=	test/test-install.sh
+
+SUBST_CLASSES+=			fix-paths
+SUBST_STAGE.fix-paths=		pre-configure
+SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
+SUBST_FILES.fix-paths=		dunstrc docs/dunst.1.pod
+SUBST_FILES.fix-paths+=		docs/dunst.5.pod
+SUBST_FILES.fix-paths+=		src/icon-lookup.c
+SUBST_FILES.fix-paths+=		src/settings_data.h
+SUBST_SED.fix-paths+=		-e 's,/usr/local/share/:/usr/share/,${PREFIX}/share,g'
+SUBST_SED.fix-paths+=		-e 's,/usr/bin,${PREFIX}/bin,g'
+SUBST_SED.fix-paths+=		-e 's,/usr/share,${PREFIX}/share,g'
+
+INSTALL_ENV+=	MANPREFIX=${PREFIX}/${PKGMANDIR}
+INSTALL_ENV+=	SYSCONFDIR=${PREFIX}/share
+
+INSTALLATION_DIRS+=	bin
+INSTALLATION_DIRS+=	${PKGMANDIR}/man1
+INSTALLATION_DIRS+=	${PKGMANDIR}/man5
+INSTALLATION_DIRS+=	share/dbus-1/services
+INSTALLATION_DIRS+=	share/dunst
+
+.include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXScrnSaver/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../wip/mk/git-package.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/dunst-git/PLIST b/dunst-git/PLIST
new file mode 100644
index 0000000000..5feefa9c67
--- /dev/null
+++ b/dunst-git/PLIST
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST,v 1.3 2023/01/09 18:44:17 vins Exp $
+bin/dunst
+bin/dunstctl
+bin/dunstify
+man/man1/dunst.1
+man/man1/dunstctl.1
+man/man5/dunst.5
+share/dbus-1/services/org.knopwob.dunst.service
+share/dunst/dunstrc
diff --git a/dunst-git/distinfo b/dunst-git/distinfo
new file mode 100644
index 0000000000..a71779c382
--- /dev/null
+++ b/dunst-git/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.13 2023/04/24 08:29:25 wiz Exp $
+
+BLAKE2s (dunst-1.9.2.tar.gz) = bd64bbe477f2f40170133ec3658e8b8b43cbc509bf3e2b0ad8fceaac41cb0097
+SHA512 (dunst-1.9.2.tar.gz) = fab14212dc41e8deed97320c18b88e0be576f0404406691dcedb9620a1382dfdfc501e4ff2005b1ce8b4a61b52f1a9cf161f20a1eae15aa2382f3fedc99a2dbc
+Size (dunst-1.9.2.tar.gz) = 4614703 bytes
+SHA1 (patch-Makefile) = 0b7f5e4526e4021ac142d9e481c51403654b2419
+SHA1 (patch-src_input.c) = 5f5da708c7419c1fa94da9c3cc82b90c8abe8e3f
+SHA1 (patch-src_x11_x.c) = e3f7ce8e0522c258154f9be8e19221536e039c8b
diff --git a/dunst-git/patches/patch-Makefile b/dunst-git/patches/patch-Makefile
new file mode 100644
index 0000000000..a2241b5751
--- /dev/null
+++ b/dunst-git/patches/patch-Makefile
@@ -0,0 +1,55 @@
+$NetBSD: patch-Makefile,v 1.8 2023/04/24 08:29:26 wiz Exp $
+
+Use BSD_INSTALL.
+Fix find(1) usage on non-GNU systems.
+
+--- Makefile.orig	2024-02-21 12:45:52.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 
+ 
+ install-dunst: dunst doc
+-	install -Dm755 dunst ${DESTDIR}${BINDIR}/dunst
+-	install -Dm644 docs/dunst.1 ${DESTDIR}${MANPREFIX}/man1/dunst.1
+-	install -Dm644 docs/dunst.5 ${DESTDIR}${MANPREFIX}/man5/dunst.5
+-	install -Dm644 docs/dunstctl.1 ${DESTDIR}${MANPREFIX}/man1/dunstctl.1
++	${BSD_INSTALL_PROGRAM} dunst ${DESTDIR}${BINDIR}/dunst
++	${BSD_INSTALL_DATA} docs/dunst.1 ${DESTDIR}${MANPREFIX}/man1/dunst.1
++	${BSD_INSTALL_DATA} docs/dunst.5 ${DESTDIR}${MANPREFIX}/man5/dunst.5
++	${BSD_INSTALL_DATA} docs/dunstctl.1 ${DESTDIR}${MANPREFIX}/man1/dunstctl.1
+ 
+ install-dunstctl: dunstctl
+-	install -Dm755 dunstctl ${DESTDIR}${BINDIR}/dunstctl
++	${BSD_INSTALL_SCRIPT} dunstctl ${DESTDIR}${BINDIR}/dunstctl
+ 
+ ifeq (1,${SYSCONF_FORCE_NEW})
+ install-dunstrc:
+-	install -Dm644 dunstrc ${DESTDIR}${SYSCONFFILE}
++	${BSD_INSTALL_DATA} dunstrc ${DESTDIR}${SYSCONFFILE}
+ endif
+ 
+ install-service: install-service-dbus
+ install-service-dbus: service-dbus
+-	install -Dm644 org.knopwob.dunst.service ${DESTDIR}${SERVICEDIR_DBUS}/org.knopwob.dunst.service
++	${BSD_INSTALL_DATA} org.knopwob.dunst.service ${DESTDIR}${SERVICEDIR_DBUS}/org.knopwob.dunst.service
+ ifneq (0,${SYSTEMD})
+ install-service: install-service-systemd
+ install-service-systemd: service-systemd
+@@ -223,7 +223,7 @@ endif
+ ifneq (0,${DUNSTIFY})
+ install: install-dunstify
+ install-dunstify: dunstify
+-	install -Dm755 dunstify ${DESTDIR}${BINDIR}/dunstify
++	${BSD_INSTALL_PROGRAM} dunstify ${DESTDIR}${BINDIR}/dunstify
+ endif
+ 
+ uninstall: uninstall-keepconf
diff --git a/dunst-git/patches/patch-src_input.c b/dunst-git/patches/patch-src_input.c
new file mode 100644
index 0000000000..93a520365b
--- /dev/null
+++ b/dunst-git/patches/patch-src_input.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_input.c,v 1.1 2023/01/09 18:44:17 vins Exp $
+
+Allow building on systems without evdev.
+
+--- src/input.c.orig	2022-06-27 12:43:39.000000000 +0000
++++ src/input.c
+@@ -4,7 +4,14 @@
+ #include "settings.h"
+ #include "queues.h"
+ #include <stddef.h>
++#if defined(__linux__) || defined(__FreeBSD__)
+ #include <linux/input-event-codes.h>
++#else
++#define BTN_LEFT	(0x110)
++#define BTN_RIGHT	(0x111)
++#define BTN_MIDDLE	(0x112)
++#define BTN_TOUCH	(0x14a)
++#endif
+ 
+ int get_notification_clickable_height(struct notification *n, bool first, bool last)
+ {
diff --git a/dunst-git/patches/patch-src_x11_x.c b/dunst-git/patches/patch-src_x11_x.c
new file mode 100644
index 0000000000..9c3fb81143
--- /dev/null
+++ b/dunst-git/patches/patch-src_x11_x.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_x11_x.c,v 1.1 2023/01/09 18:44:17 vins Exp $
+
+Allow building on systems without evdev.
+
+--- src/x11/x.c.orig	2022-06-27 12:43:39.000000000 +0000
++++ src/x11/x.c
+@@ -19,7 +19,14 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xresource.h>
+ #include <X11/Xutil.h>
++#if defined(__linux__) || defined(__FreeBSD__)
+ #include <linux/input-event-codes.h>
++#else
++#define BTN_LEFT    (0x110)
++#define BTN_RIGHT   (0x111)
++#define BTN_MIDDLE  (0x112)
++#define BTN_TOUCH   (0x14a)
++#endif
+ 
+ #include "../dbus.h"
+ #include "../draw.h"
diff --git a/dunst-git/patches/patch-test_utils.c b/dunst-git/patches/patch-test_utils.c
new file mode 100644
index 0000000000..acfddc1f9a
--- /dev/null
+++ b/dunst-git/patches/patch-test_utils.c
@@ -0,0 +1,11 @@
+$NetBSD$
+
+--- test/utils.c.orig	2024-02-21 12:52:50.623620603 +0000
++++ test/utils.c
+@@ -1,4 +1,6 @@
++#if defined(__linux__)
+ #include <features.h>
++#endif
+ 
+ #include "../src/utils.c"
+ #include "greatest.h"
Prev by Date: vmailmgr: Avoid "warning: ignoring prerequisites on suffix rule definition"
Next by Date: dunst-git: add patch comments, add missed patch to distinfo
Previous by Thread: vmailmgr: Avoid "warning: ignoring prerequisites on suffix rule definition"
Next by Thread: dunst-git: add patch comments, add missed patch to distinfo
Indexes:
Home | Main Index | Thread Index | Old Index