CVS commit: pkgsrc/sysutils/xfce4-power-manager

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Jan  5 13:50:37 UTC 2025

Modified Files:
        pkgsrc/sysutils/xfce4-power-manager: Makefile PLIST distinfo
        pkgsrc/sysutils/xfce4-power-manager/patches: patch-src_xfpm-pm-helper.c

Log Message:
xfce4-power-manager: update to 4.20.0

Part of the XFCE 4.20 update.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/sysutils/xfce4-power-manager/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/xfce4-power-manager/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/xfce4-power-manager/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/xfce4-power-manager/patches/patch-src_xfpm-pm-helper.c

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

Modified files:

Index: pkgsrc/sysutils/xfce4-power-manager/Makefile
diff -u pkgsrc/sysutils/xfce4-power-manager/Makefile:1.35 pkgsrc/sysutils/xfce4-power-manager/Makefile:1.36
--- pkgsrc/sysutils/xfce4-power-manager/Makefile:1.35   Fri Dec 27 08:20:42 2024
+++ pkgsrc/sysutils/xfce4-power-manager/Makefile        Sun Jan  5 13:50:37 2025
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2024/12/27 08:20:42 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2025/01/05 13:50:37 bsiegert Exp $
 
-PKGREVISION= 3
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-DISTNAME=      xfce4-power-manager-4.18.4
+DISTNAME=      xfce4-power-manager-4.20.0
 CATEGORIES=    sysutils
 MASTER_SITES=  https://archive.xfce.org/src/xfce/xfce4-power-manager/${PKGVERSION_NOREV:R}/
 
@@ -15,8 +14,8 @@ CONFIGURE_ARGS+=      --sysconfdir=${PKG_SYSC
 CONF_FILES=    share/examples/xfce4/autostart/xfce4-power-manager.desktop \
                ${PKG_SYSCONFDIR}/xdg/autostart/xfce4-power-manager.desktop
 
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../x11/libXmu/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libxfce4ui+=     libxfce4ui>=4.18.2
 .include "../../x11/libxfce4ui/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/upower/buildlink3.mk"

Index: pkgsrc/sysutils/xfce4-power-manager/PLIST
diff -u pkgsrc/sysutils/xfce4-power-manager/PLIST:1.5 pkgsrc/sysutils/xfce4-power-manager/PLIST:1.6
--- pkgsrc/sysutils/xfce4-power-manager/PLIST:1.5       Mon Dec 18 02:11:00 2023
+++ pkgsrc/sysutils/xfce4-power-manager/PLIST   Sun Jan  5 13:50:37 2025
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2023/12/18 02:11:00 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.6 2025/01/05 13:50:37 bsiegert Exp $
 bin/xfce4-power-manager
 bin/xfce4-power-manager-settings
 man/man1/xfce4-power-manager-settings.1
 man/man1/xfce4-power-manager.1
-sbin/xfce4-pm-helper
-sbin/xfpm-power-backlight-helper
 share/applications/xfce4-power-manager-settings.desktop
 share/examples/xfce4/autostart/xfce4-power-manager.desktop
 share/icons/hicolor/128x128/apps/org.xfce.powermanager.png
@@ -138,4 +136,3 @@ share/locale/zh_CN/LC_MESSAGES/xfce4-pow
 share/locale/zh_HK/LC_MESSAGES/xfce4-power-manager.mo
 share/locale/zh_TW/LC_MESSAGES/xfce4-power-manager.mo
 share/metainfo/xfce4-power-manager.appdata.xml
-share/polkit-1/actions/org.xfce.power.policy

Index: pkgsrc/sysutils/xfce4-power-manager/distinfo
diff -u pkgsrc/sysutils/xfce4-power-manager/distinfo:1.13 pkgsrc/sysutils/xfce4-power-manager/distinfo:1.14
--- pkgsrc/sysutils/xfce4-power-manager/distinfo:1.13   Fri Jun 28 19:44:11 2024
+++ pkgsrc/sysutils/xfce4-power-manager/distinfo        Sun Jan  5 13:50:37 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2024/06/28 19:44:11 gutteridge Exp $
+$NetBSD: distinfo,v 1.14 2025/01/05 13:50:37 bsiegert Exp $
 
-BLAKE2s (xfce4-power-manager-4.18.4.tar.bz2) = b8e8e9d4591f8615949f7aceb64b8fe8a34fda0b88c9fd3e75ad6f57ece6e0f7
-SHA512 (xfce4-power-manager-4.18.4.tar.bz2) = 829151b99c279a01037544e8a0a2bbe3cb4c1ec90d8943b3159947d819f94e8f73a8e73db255e1151ca59278583a28448b00d6fc002bd1f8a724c1c16c44fb1b
-Size (xfce4-power-manager-4.18.4.tar.bz2) = 1241669 bytes
+BLAKE2s (xfce4-power-manager-4.20.0.tar.bz2) = ef3a2d020c8ab6060bdc82fd99e3eaf9b7c000eb552847293009963bb441273a
+SHA512 (xfce4-power-manager-4.20.0.tar.bz2) = e61762b4ff374562fa3d70b1eb7c9928a1a7197df5b597763adf16435183fd693307267f37f0eb7dd08b573664a397d2fd22674b5db7e07ee9302089772ff6e7
+Size (xfce4-power-manager-4.20.0.tar.bz2) = 1523787 bytes
 SHA1 (patch-src_Makefile.in) = aad658d19417609138d281ea99a708ab5ea49acb
-SHA1 (patch-src_xfpm-pm-helper.c) = 7e21c85c03b0591262e67c8cccf17770e64e00d9
+SHA1 (patch-src_xfpm-pm-helper.c) = 094b0f893c36774ee025457eab8f8a208cdacdc6
 SHA1 (patch-src_xfpm-suspend.c) = 661a39b0009dded0c0ed90068589424239abcc35

Index: pkgsrc/sysutils/xfce4-power-manager/patches/patch-src_xfpm-pm-helper.c
diff -u pkgsrc/sysutils/xfce4-power-manager/patches/patch-src_xfpm-pm-helper.c:1.2 pkgsrc/sysutils/xfce4-power-manager/patches/patch-src_xfpm-pm-helper.c:1.3
--- pkgsrc/sysutils/xfce4-power-manager/patches/patch-src_xfpm-pm-helper.c:1.2  Tue Nov 30 14:52:32 2021
+++ pkgsrc/sysutils/xfce4-power-manager/patches/patch-src_xfpm-pm-helper.c      Sun Jan  5 13:50:37 2025
@@ -1,44 +1,18 @@
-$NetBSD: patch-src_xfpm-pm-helper.c,v 1.2 2021/11/30 14:52:32 gutteridge Exp $
+$NetBSD: patch-src_xfpm-pm-helper.c,v 1.3 2025/01/05 13:50:37 bsiegert Exp $
 
 Add NetBSD support.
 
---- src/xfpm-pm-helper.c.orig  2021-11-26 18:17:09.701758792 +0000
+--- src/xfpm-pm-helper.c.orig  2024-11-21 06:26:21.000000000 +0000
 +++ src/xfpm-pm-helper.c
-@@ -77,6 +77,10 @@
- #define UP_BACKEND_SUSPEND_COMMAND  "/usr/sbin/zzz"
+@@ -82,6 +82,11 @@
  #define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/ZZZ"
+ #define UP_BACKEND_HYBRID_SLEEP_COMMAND "/usr/bin/false"
  #endif
 +#ifdef BACKEND_TYPE_NETBSD
 +#define UP_BACKEND_SUSPEND_COMMAND "sysctl -w hw.acpi.sleep.state=3"
 +#define UP_BACKEND_HIBERNATE_COMMAND "sysctl -w hw.acpi.sleep.state=4"
++#define UP_BACKEND_HYBRID_SLEEP_COMMAND "/usr/bin/false"
 +#endif
  
  
  static gboolean
-@@ -178,22 +182,26 @@ main (int argc, char **argv)
-   /* run the command */
-   if(suspend)
-   {
-+#if defined(UP_BACKEND_SUSPEND_COMMAND)
-     if (run (UP_BACKEND_SUSPEND_COMMAND))
-     {
-       return EXIT_CODE_SUCCESS;
-     }
-     else
-+#endif
-     {
-       return EXIT_CODE_FAILED;
-     }
-   }
-   else if (hibernate)
-   {
-+#if defined(UP_BACKEND_HIBERNATE_COMMAND)
-     if(run (UP_BACKEND_HIBERNATE_COMMAND))
-     {
-       return EXIT_CODE_SUCCESS;
-     }
-     else
-+#endif
-     {
-       return EXIT_CODE_FAILED;
-     }