diff --git a/srcpkgs/xfce4-power-manager/patches/void.patch b/srcpkgs/xfce4-power-manager/patches/void.patch index f2517900d57..d6cd4016387 100644 --- a/srcpkgs/xfce4-power-manager/patches/void.patch +++ b/srcpkgs/xfce4-power-manager/patches/void.patch @@ -1,22 +1,23 @@ --- a/src/xfpm-pm-helper.c +++ b/src/xfpm-pm-helper.c -@@ -69,11 +69,8 @@ - #define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/acpiconf -s 3" +@@ -72,12 +72,8 @@ #define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/acpiconf -s 4" + #define UP_BACKEND_HYBRID_SLEEP_COMMAND "/usr/bin/false" #endif -#ifdef BACKEND_TYPE_LINUX -#define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/pm-suspend" -#define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/pm-hibernate" +-#define UP_BACKEND_HYBRID_SLEEP_COMMAND "/usr/sbin/pm-suspend-hybrid" -#endif -#ifdef BACKEND_TYPE_OPENBSD +/* voidlinux and openbsd use zzz(8) */ +#if defined(BACKEND_TYPE_LINUX) || defined(BACKEND_TYPE_OPENBSD) - #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 + #define UP_BACKEND_HYBRID_SLEEP_COMMAND "/usr/bin/false" --- a/src/xfpm-suspend.c +++ b/src/xfpm-suspend.c -@@ -103,33 +103,6 @@ freebsd_supports_sleep_state (const gcha +@@ -105,33 +105,6 @@ freebsd_supports_sleep_state (const gcha } #endif @@ -33,7 +34,7 @@ - XFPM_DEBUG ("Executing command: %s", command); - - if (!g_spawn_command_line_sync (command, NULL, NULL, &status, &error) -- || !g_spawn_check_exit_status (status, &error)) +- || !g_spawn_check_wait_status (status, &error)) - { - g_warning ("Failed to run script: %s", error->message); - g_error_free (error); @@ -50,7 +51,7 @@ gboolean xfpm_suspend_can_suspend (void) { -@@ -137,7 +110,7 @@ xfpm_suspend_can_suspend (void) +@@ -139,7 +112,7 @@ xfpm_suspend_can_suspend (void) return freebsd_supports_sleep_state ("S3"); #endif #ifdef BACKEND_TYPE_LINUX @@ -59,7 +60,7 @@ #endif #ifdef BACKEND_TYPE_OPENBSD return TRUE; -@@ -153,7 +126,7 @@ xfpm_suspend_can_hibernate (void) +@@ -155,7 +128,7 @@ xfpm_suspend_can_hibernate (void) return freebsd_supports_sleep_state ("S4"); #endif #ifdef BACKEND_TYPE_LINUX @@ -68,3 +69,12 @@ #endif #ifdef BACKEND_TYPE_OPENBSD return TRUE; +@@ -171,7 +144,7 @@ xfpm_suspend_can_hybrid_sleep (void) + return TRUE; + #endif + #ifdef BACKEND_TYPE_LINUX +- return linux_supports_sleep_state ("suspend-hybrid"); ++ return TRUE; + #endif + #ifdef BACKEND_TYPE_OPENBSD + return TRUE; diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template index ff812bf54fa..33773c01018 100644 --- a/srcpkgs/xfce4-power-manager/template +++ b/srcpkgs/xfce4-power-manager/template @@ -1,15 +1,16 @@ # Template file for 'xfce4-power-manager' pkgname=xfce4-power-manager -version=4.18.4 +version=4.20.0 revision=1 build_style=gnu-configure -configure_args="--with-locales-dir=/usr/share/locale --disable-static" -hostmakedepends="pkg-config intltool" -makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel" +configure_args="--disable-static" +hostmakedepends="pkg-config gettext glib-devel wayland-devel polkit" +makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel + polkit-devel libglib-devel wayland-devel" depends="hicolor-icon-theme desktop-file-utils upower" short_desc="Xfce power manager" maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later" homepage="https://xfce.org/" distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2" -checksum=76918f7bdcd936dbbf20efd9221a33be0cd504c7d7ffce792bace3c720f3d874 +checksum=971391cef63352833bdd92df28957392e17e1f2b3d486c0f57294fd204d6ed29