Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_169577017765310"
MIME-Version: 1.0
Date: Tue, 26 Sep 2023 23:16:17 +0000
From: "David H. Gutteridge" <gutteridge@netbsd.org>
Subject: CVS commit: pkgsrc/x11/xfce4-notifyd
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: gutteridge@netbsd.org
Message-Id: <20230926231617.C177EFBDB@cvs.NetBSD.org>

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	gutteridge
Date:		Tue Sep 26 23:16:17 UTC 2023

Modified Files:
	pkgsrc/x11/xfce4-notifyd: Makefile distinfo
	pkgsrc/x11/xfce4-notifyd/patches: patch-xfce4-notifyd_Makefile.in

Log Message:
xfce4-notifyd: update to 0.9.2

systemd support is not enabled for pkgsrc purposes (effectively not
supported), so some of these changes are not relevant.

Change log:

0.9.2 (2023-09-24)
=====
- (Hopefully) actually fix settings migration code
- (Hopefully) fix enum setting migration code

0.9.1 (2023-09-19)
=====
- Make the XDG autostart file attempt a systemd start first
- Only include the SystemdService= line if systemd support is enabled
- Clean up some conditionals in configure.ac
- Go back to installing the XDG autostart file by default
- Allow installing systemd service file even if systemd is not installed


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/x11/xfce4-notifyd/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/xfce4-notifyd/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/x11/xfce4-notifyd/patches/patch-xfce4-notifyd_Makefile.in

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


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

Modified files:

Index: pkgsrc/x11/xfce4-notifyd/Makefile
diff -u pkgsrc/x11/xfce4-notifyd/Makefile:1.46 pkgsrc/x11/xfce4-notifyd/Makefile:1.47
--- pkgsrc/x11/xfce4-notifyd/Makefile:1.46	Tue Sep 19 01:58:46 2023
+++ pkgsrc/x11/xfce4-notifyd/Makefile	Tue Sep 26 23:16:17 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2023/09/19 01:58:46 gutteridge Exp $
+# $NetBSD: Makefile,v 1.47 2023/09/26 23:16:17 gutteridge Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-VERSION=	0.9.0
+VERSION=	0.9.2
 DISTNAME=	xfce4-notifyd-${VERSION}
 CATEGORIES=	x11
 MASTER_SITES=	https://archive.xfce.org/src/apps/xfce4-notifyd/${VERSION:R}/
@@ -12,6 +12,7 @@ COMMENT=	Xfce Notify daemon
 
 USE_TOOLS+=	gdbus-codegen
 
+CONFIGURE_ARGS+=	--disable-systemd
 CONFIGURE_ARGS+=	--enable-xdg-autostart
 
 DESKTOP_FILE=	xfce4-notifyd.desktop

Index: pkgsrc/x11/xfce4-notifyd/distinfo
diff -u pkgsrc/x11/xfce4-notifyd/distinfo:1.20 pkgsrc/x11/xfce4-notifyd/distinfo:1.21
--- pkgsrc/x11/xfce4-notifyd/distinfo:1.20	Tue Sep 19 01:58:46 2023
+++ pkgsrc/x11/xfce4-notifyd/distinfo	Tue Sep 26 23:16:17 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.20 2023/09/19 01:58:46 gutteridge Exp $
+$NetBSD: distinfo,v 1.21 2023/09/26 23:16:17 gutteridge Exp $
 
-BLAKE2s (xfce4-notifyd-0.9.0.tar.bz2) = 294052a290daff54124fe560b887fed364d303a7c0512ee3f715fd73a77872b5
-SHA512 (xfce4-notifyd-0.9.0.tar.bz2) = 79d65e1fe7dc7957a0a43474d156b8a7ab1940dc7bfca640610ee17c80105e538a701f66727bef907b29115f4b92efb6e0f754884dcb0b7f06f89341eec26939
-Size (xfce4-notifyd-0.9.0.tar.bz2) = 727524 bytes
-SHA1 (patch-xfce4-notifyd_Makefile.in) = e1d1a9b033876dee100966344b585b3612196322
+BLAKE2s (xfce4-notifyd-0.9.2.tar.bz2) = 504f0cc16eb01ed669e717401a6ebfa8de35b944972d69f2f4ac6b5b6f9ea3bc
+SHA512 (xfce4-notifyd-0.9.2.tar.bz2) = 7c65111d888f4aeee7d36f3c44ca35fb7c4b0f433dd77cb9c1ae03472fd31a2b36f5bba7f6f6fafb5dbf8c60a14a09b05443f3e8ffa737fced1e8bc67278b30d
+Size (xfce4-notifyd-0.9.2.tar.bz2) = 728345 bytes
+SHA1 (patch-xfce4-notifyd_Makefile.in) = ac527cea718eb402a357b76e58947fb25073cb49

Index: pkgsrc/x11/xfce4-notifyd/patches/patch-xfce4-notifyd_Makefile.in
diff -u pkgsrc/x11/xfce4-notifyd/patches/patch-xfce4-notifyd_Makefile.in:1.2 pkgsrc/x11/xfce4-notifyd/patches/patch-xfce4-notifyd_Makefile.in:1.3
--- pkgsrc/x11/xfce4-notifyd/patches/patch-xfce4-notifyd_Makefile.in:1.2	Tue Sep 19 02:01:36 2023
+++ pkgsrc/x11/xfce4-notifyd/patches/patch-xfce4-notifyd_Makefile.in	Tue Sep 26 23:16:17 2023
@@ -1,13 +1,13 @@
-$NetBSD: patch-xfce4-notifyd_Makefile.in,v 1.2 2023/09/19 02:01:36 gutteridge Exp $
+$NetBSD: patch-xfce4-notifyd_Makefile.in,v 1.3 2023/09/26 23:16:17 gutteridge Exp $
 
 Adjust to pkgsrc norms for placing configuration files.
 
---- xfce4-notifyd/Makefile.in.orig	2023-09-18 20:51:44.000000000 +0000
+--- xfce4-notifyd/Makefile.in.orig	2023-09-20 00:02:18.000000000 +0000
 +++ xfce4-notifyd/Makefile.in
-@@ -524,7 +524,7 @@ dist_noinst_DATA = \
- @USE_DBUS_START_DAEMON_TRUE@service_DATA = $(service_in_files:.service.in=.service)
- @USE_SYSTEMD_TRUE@systemd_userdir = $(SYSTEMD_USER_SERVICE_DIR)
- @USE_SYSTEMD_TRUE@systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
+@@ -528,7 +528,7 @@ dist_noinst_DATA = \
+ @USE_SYSTEMD_TRUE@systemd_service = SystemdService=xfce4-notifyd.service
+ @USE_SYSTEMD_FALSE@xdg_autostart_exec = $(xfce4_notifyddir)/xfce4-notifyd
+ @USE_SYSTEMD_TRUE@xdg_autostart_exec = sh -c "systemctl --user start xfce4-notifyd.service 2>/dev/null || exec $(xfce4_notifyddir)/xfce4-notifyd"
 -@USE_XDG_AUTOSTART_TRUE@autostartdir = $(sysconfdir)/xdg/autostart
 +@USE_XDG_AUTOSTART_TRUE@autostartdir = $(datadir)/examples/xfce4-notifyd
  @USE_XDG_AUTOSTART_TRUE@autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)


--_----------=_169577017765310--