diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile index 6a52572751b8..3562589c967f 100644 --- a/sysutils/xfce4-power-manager/Makefile +++ b/sysutils/xfce4-power-manager/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.17 2020/12/04 04:56:15 riastradh Exp $ +# $NetBSD: Makefile,v 1.18 2021/11/30 14:52:32 gutteridge Exp $ -PKGREVISION= 5 .include "../../meta-pkgs/xfce4/Makefile.common" -DISTNAME= xfce4-power-manager-1.6.5 +DISTNAME= xfce4-power-manager-4.16.0 CATEGORIES= sysutils -MASTER_SITES= http://archive.xfce.org/src/apps/xfce4-power-manager/1.6/ +MASTER_SITES= https://archive.xfce.org/src/xfce/xfce4-power-manager/4.16/ HOMEPAGE= https://goodies.xfce.org/projects/applications/xfce4-power-manager COMMENT= Xfce power manager diff --git a/sysutils/xfce4-power-manager/PLIST b/sysutils/xfce4-power-manager/PLIST index fd321bfd50e3..36c2feeac9aa 100644 --- a/sysutils/xfce4-power-manager/PLIST +++ b/sysutils/xfce4-power-manager/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2019/07/13 00:32:57 gutteridge Exp $ +@comment $NetBSD: PLIST,v 1.4 2021/11/30 14:52:32 gutteridge Exp $ bin/xfce4-power-manager bin/xfce4-power-manager-settings man/man1/xfce4-power-manager-settings.1 @@ -7,28 +7,10 @@ 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/32x32/status/ac-adapter.png -share/icons/hicolor/32x32/status/battery-caution-charging.png -share/icons/hicolor/32x32/status/battery-caution.png -share/icons/hicolor/32x32/status/battery-empty-charging.png -share/icons/hicolor/32x32/status/battery-empty.png -share/icons/hicolor/32x32/status/battery-full-charged.png -share/icons/hicolor/32x32/status/battery-full-charging.png -share/icons/hicolor/32x32/status/battery-full.png -share/icons/hicolor/32x32/status/battery-good-charging.png -share/icons/hicolor/32x32/status/battery-good.png -share/icons/hicolor/32x32/status/battery-low-charging.png -share/icons/hicolor/32x32/status/battery-low.png -share/icons/hicolor/32x32/status/battery-missing.png -share/icons/hicolor/32x32/status/computer.png -share/icons/hicolor/32x32/status/input-keyboard.png -share/icons/hicolor/32x32/status/input-mouse.png -share/icons/hicolor/32x32/status/multimedia-player.png -share/icons/hicolor/32x32/status/pda.png -share/icons/hicolor/32x32/status/phone.png -share/icons/hicolor/32x32/status/tablet.png -share/icons/hicolor/32x32/status/uninterruptible-power-supply.png -share/icons/hicolor/32x32/status/video-display.png +share/icons/hicolor/128x128/apps/org.xfce.powermanager.png +share/icons/hicolor/16x16/apps/org.xfce.powermanager.png +share/icons/hicolor/24x24/apps/org.xfce.powermanager.png +share/icons/hicolor/48x48/apps/org.xfce.powermanager.png share/icons/hicolor/48x48/status/ac-adapter.png share/icons/hicolor/48x48/status/battery-caution-charging.png share/icons/hicolor/48x48/status/battery-caution.png @@ -53,6 +35,7 @@ share/icons/hicolor/48x48/status/phone.png share/icons/hicolor/48x48/status/tablet.png share/icons/hicolor/48x48/status/uninterruptible-power-supply.png share/icons/hicolor/48x48/status/video-display.png +share/icons/hicolor/scalable/apps/org.xfce.powermanager.svg share/icons/hicolor/scalable/status/ac-adapter-symbolic.svg share/icons/hicolor/scalable/status/ac-adapter.svg share/icons/hicolor/scalable/status/battery-caution-charging-symbolic.svg @@ -92,7 +75,6 @@ share/icons/hicolor/scalable/status/phone.svg share/icons/hicolor/scalable/status/tablet.svg share/icons/hicolor/scalable/status/uninterruptible-power-supply.svg share/icons/hicolor/scalable/status/video-display.svg -share/icons/hicolor/scalable/status/xfce4-power-manager-settings.svg share/locale/ar/LC_MESSAGES/xfce4-power-manager.mo share/locale/ast/LC_MESSAGES/xfce4-power-manager.mo share/locale/be/LC_MESSAGES/xfce4-power-manager.mo @@ -103,6 +85,7 @@ share/locale/da/LC_MESSAGES/xfce4-power-manager.mo share/locale/de/LC_MESSAGES/xfce4-power-manager.mo share/locale/el/LC_MESSAGES/xfce4-power-manager.mo share/locale/en_AU/LC_MESSAGES/xfce4-power-manager.mo +share/locale/en_CA/LC_MESSAGES/xfce4-power-manager.mo share/locale/en_GB/LC_MESSAGES/xfce4-power-manager.mo share/locale/es/LC_MESSAGES/xfce4-power-manager.mo share/locale/et/LC_MESSAGES/xfce4-power-manager.mo @@ -114,6 +97,7 @@ share/locale/he/LC_MESSAGES/xfce4-power-manager.mo share/locale/hr/LC_MESSAGES/xfce4-power-manager.mo share/locale/hu/LC_MESSAGES/xfce4-power-manager.mo share/locale/hy_AM/LC_MESSAGES/xfce4-power-manager.mo +share/locale/hye/LC_MESSAGES/xfce4-power-manager.mo share/locale/id/LC_MESSAGES/xfce4-power-manager.mo share/locale/ie/LC_MESSAGES/xfce4-power-manager.mo share/locale/is/LC_MESSAGES/xfce4-power-manager.mo diff --git a/sysutils/xfce4-power-manager/distinfo b/sysutils/xfce4-power-manager/distinfo index 60e71206c0e2..46388181574b 100644 --- a/sysutils/xfce4-power-manager/distinfo +++ b/sysutils/xfce4-power-manager/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2021/10/26 11:20:26 nia Exp $ +$NetBSD: distinfo,v 1.7 2021/11/30 14:52:32 gutteridge Exp $ -BLAKE2s (xfce4-power-manager-1.6.5.tar.bz2) = f35ce7669148f62407095dadf96d3b63d41f97768f884fd06f3ec5063632ab15 -SHA512 (xfce4-power-manager-1.6.5.tar.bz2) = ebcf9ba7431518fdafa74f49511200e16093c34f78516e823a2f7ac02a085a08377efe5f9c6fe285f3d1e2de253789404e01b34a48e3f5ff23c2c143b2801207 -Size (xfce4-power-manager-1.6.5.tar.bz2) = 1205473 bytes +BLAKE2s (xfce4-power-manager-4.16.0.tar.bz2) = 5e46f817b8828839f27eb9950ba00adbba9d392da6d96fb0ce3916db18fee1bc +SHA512 (xfce4-power-manager-4.16.0.tar.bz2) = 1c6ecfb7696bc13c9b11fdfb4ad4e3278de2350bbc59c84c933b28c07c1a0c55b9954794e1f57e4407d2b54ffaace9ea5baed829bf0683332cf9d12bff7e71ec +Size (xfce4-power-manager-4.16.0.tar.bz2) = 1234968 bytes SHA1 (patch-src_Makefile.in) = aad658d19417609138d281ea99a708ab5ea49acb -SHA1 (patch-src_xfpm-pm-helper.c) = 7ac402541b500726e54ecceeaffe3893c1ab862a -SHA1 (patch-src_xfpm-suspend.c) = 8ea785ad5c4f435348947377ce5e7d1a7af30d46 +SHA1 (patch-src_xfpm-pm-helper.c) = 7e21c85c03b0591262e67c8cccf17770e64e00d9 +SHA1 (patch-src_xfpm-suspend.c) = 1ed047a705eeae03facc37b84c2077b6ab54dd9d diff --git a/sysutils/xfce4-power-manager/patches/patch-src_xfpm-pm-helper.c b/sysutils/xfce4-power-manager/patches/patch-src_xfpm-pm-helper.c index 90a6087b397e..bfbdbceb2c4b 100644 --- a/sysutils/xfce4-power-manager/patches/patch-src_xfpm-pm-helper.c +++ b/sysutils/xfce4-power-manager/patches/patch-src_xfpm-pm-helper.c @@ -1,21 +1,21 @@ -$NetBSD: patch-src_xfpm-pm-helper.c,v 1.1 2018/05/18 17:07:29 youri Exp $ +$NetBSD: patch-src_xfpm-pm-helper.c,v 1.2 2021/11/30 14:52:32 gutteridge Exp $ Add NetBSD support. ---- src/xfpm-pm-helper.c.orig 2015-07-14 08:02:18.000000000 +0000 +--- src/xfpm-pm-helper.c.orig 2021-11-26 18:17:09.701758792 +0000 +++ src/xfpm-pm-helper.c @@ -77,6 +77,10 @@ - #define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/zzz" + #define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/zzz" #define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/ZZZ" #endif +#ifdef BACKEND_TYPE_NETBSD -+#define UP_BACKEND_SUSPEND_COMMAND "sysctl -w hw.acpi.sleep.state=1" ++#define UP_BACKEND_SUSPEND_COMMAND "sysctl -w hw.acpi.sleep.state=3" +#define UP_BACKEND_HIBERNATE_COMMAND "sysctl -w hw.acpi.sleep.state=4" +#endif static gboolean -@@ -174,19 +178,25 @@ main (int argc, char **argv) +@@ -178,22 +182,26 @@ main (int argc, char **argv) /* run the command */ if(suspend) { @@ -23,10 +23,10 @@ Add NetBSD support. if (run (UP_BACKEND_SUSPEND_COMMAND)) { return EXIT_CODE_SUCCESS; -- } else { -+ } else + } + else +#endif -+ { + { return EXIT_CODE_FAILED; } } @@ -36,10 +36,9 @@ Add NetBSD support. if(run (UP_BACKEND_HIBERNATE_COMMAND)) { return EXIT_CODE_SUCCESS; -- } else { -+ } else + } + else +#endif -+ { + { return EXIT_CODE_FAILED; } - } diff --git a/sysutils/xfce4-power-manager/patches/patch-src_xfpm-suspend.c b/sysutils/xfce4-power-manager/patches/patch-src_xfpm-suspend.c index 883a9149e9e9..4825e7b65701 100644 --- a/sysutils/xfce4-power-manager/patches/patch-src_xfpm-suspend.c +++ b/sysutils/xfce4-power-manager/patches/patch-src_xfpm-suspend.c @@ -1,16 +1,16 @@ -$NetBSD: patch-src_xfpm-suspend.c,v 1.1 2018/05/18 17:07:29 youri Exp $ +$NetBSD: patch-src_xfpm-suspend.c,v 1.2 2021/11/30 14:52:32 gutteridge Exp $ Add NetBSD support. ---- src/xfpm-suspend.c.orig 2015-07-14 08:02:18.000000000 +0000 +--- src/xfpm-suspend.c.orig 2021-11-26 18:17:09.717521832 +0000 +++ src/xfpm-suspend.c -@@ -144,6 +144,9 @@ xfpm_suspend_can_suspend (void) - #ifdef BACKEND_TYPE_OPENBSD - return TRUE; +@@ -137,6 +137,9 @@ out: + return ret; + } #endif +#ifdef BACKEND_TYPE_NETBSD + return TRUE; +#endif - return FALSE; - } + + gboolean