xfce4-session: adjust two patches

Amend a patch that fixes compilation on non-Linux and non-BSD OSes.
There are several things that could be adjusted differently in the
function in question, but that needs to be discussed upstream. For now,
take the simplest route.

Also, be consistent with upstream's intent that "suspend" means ACPI
state 3, also being consistent with what was patched in xfce4-power-
manager before, too. (Where suspend and resume generally works for me
on NetBSD laptops, state 3 is effective.)

4 files changed, 22 insertions, 12 deletions

diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index c36c93beb63..21838f38f5a 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.93 2021/12/08 16:07:16 adam Exp $
+# $NetBSD: Makefile,v 1.94 2022/02/06 17:42:47 gutteridge Exp $
 
-PKGREVISION= 1
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=		xfce4-session-4.16.0
+PKGREVISION=		2
 CATEGORIES=		x11
 MASTER_SITES+=		https://archive.xfce.org/src/xfce/xfce4-session/4.16/
 
diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo
index 4f449625c84..d7c324e0011 100644
--- a/x11/xfce4-session/distinfo
+++ b/x11/xfce4-session/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2021/11/30 14:31:09 gutteridge Exp $
+$NetBSD: distinfo,v 1.35 2022/02/06 17:42:47 gutteridge Exp $
 
 BLAKE2s (xfce4-session-4.16.0.tar.bz2) = c47d2336881178cc04dccf92d345e58e39118644636993ab5228833601cf8119
 SHA512 (xfce4-session-4.16.0.tar.bz2) = fd74b24d0c2762b5a99883b62ca9447c3683e42e9e39193d0f60e02b8c1ad77a3dfff4df6f3b3c345d8ea3d4c4ef93485e9b5586862bab85d4b37110d3400fad
@@ -6,8 +6,8 @@ Size (xfce4-session-4.16.0.tar.bz2) = 875504 bytes
 SHA1 (patch-ac) = acbb27c79b5b6f37ff106c6cbbc87d00ecfe19f5
 SHA1 (patch-config.h.in) = 30e2ae1ea70a99a83f11523e940081b661add69b
 SHA1 (patch-configure) = 155a85a71b42fb360d97c4fda87d54a16f567c87
-SHA1 (patch-libxfsm_xfsm-shutdown-common.h) = da51714e0924a0ab28f7da1b161659763dff81d2
+SHA1 (patch-libxfsm_xfsm-shutdown-common.h) = 4712465218a6bc9beb740203e820203d08b06c06
 SHA1 (patch-scripts_Makefile.in) = 042c3d9c632a57f9acfc8dab43aa6bca8ec69097
 SHA1 (patch-settings_xfce4-session.xml) = 7e990e73d8dab022f3ebd2d4daa24ebc8dcf95a1
-SHA1 (patch-xfce4-session_xfsm-shutdown-fallback.c) = 6f37dbba8dfb1c4f31b16f395c3e4244466eb0aa
+SHA1 (patch-xfce4-session_xfsm-shutdown-fallback.c) = bd3133e9f1dc4a2069203d75058710fe66623c0e
 SHA1 (patch-xfsm-shutdown-helper_main.c) = db2dc4a7ce729b72092fa2777fd178cb3b7be258
diff --git a/x11/xfce4-session/patches/patch-libxfsm_xfsm-shutdown-common.h b/x11/xfce4-session/patches/patch-libxfsm_xfsm-shutdown-common.h
index cefe7716993..d2307c30422 100644
--- a/x11/xfce4-session/patches/patch-libxfsm_xfsm-shutdown-common.h
+++ b/x11/xfce4-session/patches/patch-libxfsm_xfsm-shutdown-common.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-libxfsm_xfsm-shutdown-common.h,v 1.1 2019/05/23 02:56:07 gutteridge Exp $
+$NetBSD: patch-libxfsm_xfsm-shutdown-common.h,v 1.2 2022/02/06 17:42:47 gutteridge Exp $
 
 Add NetBSD commands.
 
@@ -9,7 +9,7 @@ Add NetBSD commands.
  #endif
  
 +#ifdef BACKEND_TYPE_NETBSD
-+#define UP_BACKEND_SUSPEND_COMMAND      "/sbin/sysctl -w hw.acpi.sleep.state=1"
++#define UP_BACKEND_SUSPEND_COMMAND      "/sbin/sysctl -w hw.acpi.sleep.state=3"
 +#define UP_BACKEND_HIBERNATE_COMMAND    "/sbin/sysctl -w hw.acpi.sleep.state=4"
 +#endif
 +
diff --git a/x11/xfce4-session/patches/patch-xfce4-session_xfsm-shutdown-fallback.c b/x11/xfce4-session/patches/patch-xfce4-session_xfsm-shutdown-fallback.c
index 7ade7d8ce77..9ed0794981d 100644
--- a/x11/xfce4-session/patches/patch-xfce4-session_xfsm-shutdown-fallback.c
+++ b/x11/xfce4-session/patches/patch-xfce4-session_xfsm-shutdown-fallback.c
@@ -1,20 +1,21 @@
-$NetBSD: patch-xfce4-session_xfsm-shutdown-fallback.c,v 1.2 2020/03/03 05:06:20 gutteridge Exp $
+$NetBSD: patch-xfce4-session_xfsm-shutdown-fallback.c,v 1.3 2022/02/06 17:42:47 gutteridge Exp $
 
 Fix compilation on OSes other than Linux and the *BSDs.
 
---- xfce4-session/xfsm-shutdown-fallback.c.orig	2019-05-17 12:46:28.000000000 +0000
+--- xfce4-session/xfsm-shutdown-fallback.c.orig	2020-11-06 23:08:55.000000000 +0000
 +++ xfce4-session/xfsm-shutdown-fallback.c
-@@ -371,7 +371,9 @@ xfsm_shutdown_fallback_try_action (XfsmS
+@@ -373,7 +373,9 @@ xfsm_shutdown_fallback_try_action (XfsmS
                                     GError           **error)
  {
    const gchar *xfsm_helper_action;
+-  const gchar *cmd __attribute__((unused));
 +#ifdef __BACKEND_TYPE_BSD__
-   const gchar *cmd __attribute__((unused));
++  const gchar *cmd;
 +#endif
    gboolean ret = FALSE;
    gint exit_status = 0;
  #ifdef HAVE_POLKIT
-@@ -382,29 +384,39 @@ xfsm_shutdown_fallback_try_action (XfsmS
+@@ -384,29 +386,39 @@ xfsm_shutdown_fallback_try_action (XfsmS
    {
      case XFSM_SHUTDOWN_SHUTDOWN:
        xfsm_helper_action = "shutdown";
@@ -54,3 +55,12 @@ Fix compilation on OSes other than Linux and the *BSDs.
        /* On hybrid sleep we try to lock the screen */
        if (!lock_screen (error))
          return FALSE;
+@@ -434,7 +446,7 @@ xfsm_shutdown_fallback_try_action (XfsmS
+ #endif
+   if (!ret)
+     {
+-      g_set_error (error, 1, 0, "Failed to %s (%s)", xfsm_helper_action, cmd);
++      g_set_error (error, 1, 0, "Failed to %s", xfsm_helper_action);
+     }
+   return ret;
+ }