From 8eebecce5e86a2189fa17f86390e5e1f64aa2894 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 13 Aug 2019 12:22:56 +0200 Subject: [PATCH] xfce4-power-manager: get rid of pm-utils; void uses zzz(8) like openbsd. --- .../xfce4-power-manager/patches/void.patch | 72 +++++++++++++++++++ srcpkgs/xfce4-power-manager/template | 2 +- 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/xfce4-power-manager/patches/void.patch diff --git a/srcpkgs/xfce4-power-manager/patches/void.patch b/srcpkgs/xfce4-power-manager/patches/void.patch new file mode 100644 index 00000000000..5e06b35f8f9 --- /dev/null +++ b/srcpkgs/xfce4-power-manager/patches/void.patch @@ -0,0 +1,72 @@ +--- src/xfpm-pm-helper.c.orig 2019-08-13 12:17:22.787621859 +0200 ++++ src/xfpm-pm-helper.c 2019-08-13 12:18:31.946471555 +0200 +@@ -69,11 +69,8 @@ + #define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/acpiconf -s 3" + #define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/acpiconf -s 4" + #endif +-#ifdef BACKEND_TYPE_LINUX +-#define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/pm-suspend" +-#define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/pm-hibernate" +-#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_HIBERNATE_COMMAND "/usr/sbin/ZZZ" + #endif +--- src/xfpm-suspend.c.orig 2019-08-13 12:19:21.476080088 +0200 ++++ src/xfpm-suspend.c 2019-08-13 12:20:59.699286887 +0200 +@@ -101,35 +101,6 @@ freebsd_supports_sleep_state (const gcha + } + #endif + +-#ifdef BACKEND_TYPE_LINUX +-static gboolean +-linux_supports_sleep_state (const gchar *state) +-{ +- gboolean ret = FALSE; +- gchar *command; +- GError *error = NULL; +- gint exit_status; +- +- XFPM_DEBUG("entering"); +- +- /* run script from pm-utils */ +- command = g_strdup_printf ("/usr/bin/pm-is-supported --%s", state); +- g_debug ("executing command: %s", command); +- ret = g_spawn_command_line_sync (command, NULL, NULL, &exit_status, &error); +- if (!ret) { +- g_warning ("failed to run script: %s", error->message); +- g_error_free (error); +- goto out; +- } +- ret = (WIFEXITED(exit_status) && (WEXITSTATUS(exit_status) == EXIT_SUCCESS)); +- +-out: +- g_free (command); +- +- return ret; +-} +-#endif +- + + gboolean + xfpm_suspend_can_suspend (void) +@@ -139,7 +110,7 @@ xfpm_suspend_can_suspend (void) + return freebsd_supports_sleep_state ("S3"); + #endif + #ifdef BACKEND_TYPE_LINUX +- return linux_supports_sleep_state ("suspend"); ++ return TRUE; + #endif + #ifdef BACKEND_TYPE_OPENBSD + return TRUE; +@@ -156,7 +127,7 @@ xfpm_suspend_can_hibernate (void) + return freebsd_supports_sleep_state ("S4"); + #endif + #ifdef BACKEND_TYPE_LINUX +- return linux_supports_sleep_state ("hibernate"); ++ return TRUE; + #endif + #ifdef BACKEND_TYPE_OPENBSD + return TRUE; diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template index 3aa02c132ae..61038068585 100644 --- a/srcpkgs/xfce4-power-manager/template +++ b/srcpkgs/xfce4-power-manager/template @@ -1,7 +1,7 @@ # Template file for 'xfce4-power-manager' pkgname=xfce4-power-manager version=1.6.5 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool"