Skip to content

Commit

Permalink
xfce4-power-manager: update to 4.16.0
Browse files Browse the repository at this point in the history 
Change log:

4.16.0
======
- bump glib (and gio, gthread, etc) minimum to 2.50.0
- panel-plugin: Prefer ac-adapter-symbolic (Fixes #103)
- Add new icons in size 24x24 and 32x32
- Translation Updates:
  Albanian, Basque, Catalan, Danish, Estonian, French, Galician,
  Hebrew, Indonesian, Norwegian Bokmål, Portuguese, Portuguese
  (Brazil), Russian, Serbian, Slovenian, Swedish, Turkish

1.7.1
======
This is a development release.
- Add new app icon and switch to rDNS icon name
- Use more accurate status icons (Fixes #95)
- Also use symbolic icons in battery notifications
- Reorder screensavers so Xfce comes first (Fixes #101)
- settings: Adjust title and show min/max buttons
- settings: Allow critical battery level up to 70% (Fixes #67)
- settings: Add keywords for discoverability (Bug #10694)
- settings: Fix GtkSwitch signal handlers (Issue #99)
- xfpm: avoid default double fork
- Respect the notification daemon's timeouts (Fixes #57)
- Fix Laptop lid settings (Bug #15300)
- Fix spelling mistake (Bug #16698)
- Only update blank time when appropriate
- Bug #16717: Move from exo-csource to xdt-csource
- Guard against NULL pointer dereference
- More blank time debug code
- Indentation fixes
- Cleanup code
- Move default icon names into one place
- Silence compiler warnings
- Add README.md
- Add basic GitLab pipeline
- Translation Updates:
  Albanian, Arabic, Armenian (Armenia), Basque, Belarusian, Bulgarian,
  Catalan, Chinese (China), Chinese (Hong Kong), Chinese (Taiwan),
  Croatian, Czech, Danish, Dutch, Eastern Armenian, English (Australia),
  English (Canada), English (United Kingdom), Estonian, Finnish, French,
  Galician, German, Greek, Hebrew, Hungarian, Icelandic, Indonesian,
  Interlingue, Italian, Japanese, Kannada, Kazakh, Korean, Lithuanian,
  Malay, Norwegian Bokmål, Norwegian Nynorsk, Occitan (post 1500),
  Polish, Portuguese, Portuguese (Brazil), Romanian, Russian, Serbian,
  Sinhala, Slovak, Slovenian, Spanish, Swedish, Telugu, Thai, Turkish,
  Ukrainian, Uyghur, Vietnamese

1.7.0
======
This is a development release.
- Fix inhibiting xfce4-screensaver (Bug #16364)
- Fix indentation (makes git blame harder, but code more readable)
- settings: Unclutter system and display tabs
- settings: Move % sign out of spinbutton (Bug #15994)
- Switch to symbolic window-close icons
- Dismiss critical notification when connecting to AC
- Make brightness steps configurable (Bug #12062)
- Allow compilation with panel 4.15
- panel-plugin: Properly show 'About' menu item
- panel-plugin: Add (optional) Presentation mode indicator (Bug #15773)
- panel-plugin: Toggle presentation mode on middle click
- panel-plugin: Add warning color to presentation mode indicator
- panel-plugin: Use GtkSwitch for Presentation mode
- panel-plugin: Replace deprecated call
- systray: Ensure presentation mode can be toggled (Bug #16337)
- Translation Updates:
  Albanian, Arabic, Belarusian, Catalan, Chinese (China), Chinese
  (Taiwan), Croatian, Czech, Danish, Dutch, Finnish, French, Galician,
  German, Greek, Hebrew, Italian, Japanese, Kazakh, Korean, Lithuanian,
  Malay, Norwegian Bokmål, Portuguese, Portuguese (Brazil), Russian,
  Serbian, Slovak, Slovenian, Spanish, Turkish
  • Loading branch information
@dhgutteridge
dhgutteridge committed Nov 30, 2021
1 parent 5ce9c1a commit 427bcca
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 53 deletions.
7 changes: 3 additions & 4 deletions sysutils/xfce4-power-manager/Makefile
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
32 changes: 8 additions & 24 deletions sysutils/xfce4-power-manager/PLIST
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions sysutils/xfce4-power-manager/distinfo
View file
Original file line number Diff line number Diff line change
@@ -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
23 changes: 11 additions & 12 deletions sysutils/xfce4-power-manager/patches/patch-src_xfpm-pm-helper.c
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
$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)
{
+#if defined(UP_BACKEND_SUSPEND_COMMAND)
if (run (UP_BACKEND_SUSPEND_COMMAND))
{
return EXIT_CODE_SUCCESS;
- } else {
+ } else
}
else
+#endif
+ {
{
return EXIT_CODE_FAILED;
}
}
Expand All @@ -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;
}
}
14 changes: 7 additions & 7 deletions sysutils/xfce4-power-manager/patches/patch-src_xfpm-suspend.c
View file
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 427bcca

Please sign in to comment.