diff --git a/srcpkgs/xfce4-power-manager/patches/void.patch b/srcpkgs/xfce4-power-manager/patches/void.patch index ad7736ce032..f2517900d57 100644 --- a/srcpkgs/xfce4-power-manager/patches/void.patch +++ b/srcpkgs/xfce4-power-manager/patches/void.patch @@ -16,7 +16,7 @@ #endif --- a/src/xfpm-suspend.c +++ b/src/xfpm-suspend.c -@@ -105,40 +105,6 @@ freebsd_supports_sleep_state (const gcha +@@ -103,33 +103,6 @@ freebsd_supports_sleep_state (const gcha } #endif @@ -24,32 +24,25 @@ -static gboolean -linux_supports_sleep_state (const gchar *state) -{ -- gboolean ret = FALSE; - gchar *command; - GError *error = NULL; -- gint exit_status; -- -- XFPM_DEBUG("entering"); +- gint status; - - /* 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); +- XFPM_DEBUG ("Executing command: %s", command); - -- if (!ret) { -- if (error) -- { -- g_warning ("failed to run script: %s", error->message); -- g_error_free (error); -- } -- goto out; +- if (!g_spawn_command_line_sync (command, NULL, NULL, &status, &error) +- || !g_spawn_check_exit_status (status, &error)) +- { +- g_warning ("Failed to run script: %s", error->message); +- g_error_free (error); +- g_free (command); +- return FALSE; - } -- ret = (WIFEXITED(exit_status) && (WEXITSTATUS(exit_status) == EXIT_SUCCESS)); - --out: - g_free (command); -- -- return ret; +- return TRUE; -} -#endif - @@ -57,7 +50,7 @@ gboolean xfpm_suspend_can_suspend (void) { -@@ -147,7 +113,7 @@ xfpm_suspend_can_suspend (void) +@@ -137,7 +110,7 @@ xfpm_suspend_can_suspend (void) return freebsd_supports_sleep_state ("S3"); #endif #ifdef BACKEND_TYPE_LINUX @@ -66,7 +59,7 @@ #endif #ifdef BACKEND_TYPE_OPENBSD return TRUE; -@@ -164,7 +130,7 @@ xfpm_suspend_can_hibernate (void) +@@ -153,7 +126,7 @@ xfpm_suspend_can_hibernate (void) return freebsd_supports_sleep_state ("S4"); #endif #ifdef BACKEND_TYPE_LINUX diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template index 7081fa53f82..4ca300a7e1e 100644 --- a/srcpkgs/xfce4-power-manager/template +++ b/srcpkgs/xfce4-power-manager/template @@ -1,6 +1,6 @@ # Template file for 'xfce4-power-manager' pkgname=xfce4-power-manager -version=4.18.1 +version=4.18.3 revision=1 build_style=gnu-configure configure_args="--with-locales-dir=/usr/share/locale --disable-static" @@ -12,4 +12,4 @@ 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=6b08b10c4cb7516377dbd32c6cc2296a9faf47022c555f11e75b38fde14aff03 +checksum=0d79dd0f68b90d07b384366be4d2291a6d7815410eb0c20d3d8e8590c62e84f0