CVS commit: pkgsrc/x11/xfce4-session

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sun Mar  1 19:47:23 UTC 2020

Modified Files:
        pkgsrc/x11/xfce4-session: Makefile distinfo
Added Files:
        pkgsrc/x11/xfce4-session/patches:
            patch-xfce4-session_xfsm-shutdown-fallback.c

Log Message:
xfce4-session: fix compilation on !Linux !*BSD

More work would be required should someone want suspension or
hibernation to function in this case, this is simply a build fix.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/x11/xfce4-session/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/xfce4-session/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/xfce4-session/patches/patch-xfce4-session_xfsm-shutdown-fallback.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xfce4-session/Makefile
diff -u pkgsrc/x11/xfce4-session/Makefile:1.80 pkgsrc/x11/xfce4-session/Makefile:1.81
--- pkgsrc/x11/xfce4-session/Makefile:1.80      Wed Jan 29 04:56:19 2020
+++ pkgsrc/x11/xfce4-session/Makefile   Sun Mar  1 19:47:22 2020
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.80 2020/01/29 04:56:19 gutteridge Exp $
+# $NetBSD: Makefile,v 1.81 2020/03/01 19:47:22 gutteridge Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=              xfce4-session-4.14.1
+PKGREVISION=           1
 CATEGORIES=            x11
 MASTER_SITES+=         https://archive.xfce.org/src/xfce/xfce4-session/4.14/
 

Index: pkgsrc/x11/xfce4-session/distinfo
diff -u pkgsrc/x11/xfce4-session/distinfo:1.27 pkgsrc/x11/xfce4-session/distinfo:1.28
--- pkgsrc/x11/xfce4-session/distinfo:1.27      Wed Jan 29 04:45:19 2020
+++ pkgsrc/x11/xfce4-session/distinfo   Sun Mar  1 19:47:22 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2020/01/29 04:45:19 gutteridge Exp $
+$NetBSD: distinfo,v 1.28 2020/03/01 19:47:22 gutteridge Exp $
 
 SHA1 (xfce4-session-4.14.1.tar.bz2) = 1e44eb63a87fa797dbd80fc0a956ebc7a585c3cc
 RMD160 (xfce4-session-4.14.1.tar.bz2) = 896b9cc17947a1fa21b05c85c710266dc4e722fe
@@ -10,4 +10,5 @@ SHA1 (patch-configure) = ef67202879c09f5
 SHA1 (patch-libxfsm_xfsm-shutdown-common.h) = da51714e0924a0ab28f7da1b161659763dff81d2
 SHA1 (patch-scripts_Makefile.in) = 042c3d9c632a57f9acfc8dab43aa6bca8ec69097
 SHA1 (patch-settings_xfce4-session.xml) = 7e990e73d8dab022f3ebd2d4daa24ebc8dcf95a1
+SHA1 (patch-xfce4-session_xfsm-shutdown-fallback.c) = b57375c63b282624b9196b18ea59d98c63fdc326
 SHA1 (patch-xfsm-shutdown-helper_main.c) = db2dc4a7ce729b72092fa2777fd178cb3b7be258

Added files:

Index: pkgsrc/x11/xfce4-session/patches/patch-xfce4-session_xfsm-shutdown-fallback.c
diff -u /dev/null pkgsrc/x11/xfce4-session/patches/patch-xfce4-session_xfsm-shutdown-fallback.c:1.1
--- /dev/null   Sun Mar  1 19:47:23 2020
+++ pkgsrc/x11/xfce4-session/patches/patch-xfce4-session_xfsm-shutdown-fallback.c       Sun Mar  1 19:47:23 2020
@@ -0,0 +1,44 @@
+$NetBSD: patch-xfce4-session_xfsm-shutdown-fallback.c,v 1.1 2020/03/01 19:47:23 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
+@@ -371,7 +371,9 @@ xfsm_shutdown_fallback_try_action (XfsmS
+                                    GError           **error)
+ {
+   const gchar *xfsm_helper_action;
++#ifdef __BACKEND_TYPE_BSD__
+   const gchar *cmd __attribute__((unused));
++#endif
+   gboolean ret = FALSE;
+   gint exit_status = 0;
+ #ifdef HAVE_POLKIT
+@@ -390,21 +392,27 @@ xfsm_shutdown_fallback_try_action (XfsmS
+       break;
+     case XFSM_SHUTDOWN_SUSPEND:
+       xfsm_helper_action = "suspend";
++#ifdef __BACKEND_TYPE_BSD__
+       cmd = UP_BACKEND_SUSPEND_COMMAND;
++#endif
+       /* On suspend we try to lock the screen */
+       if (!lock_screen (error))
+         return FALSE;
+       break;
+     case XFSM_SHUTDOWN_HIBERNATE:
+       xfsm_helper_action = "hibernate";
++#ifdef __BACKEND_TYPE_BSD__
+       cmd = UP_BACKEND_HIBERNATE_COMMAND;
++#endif
+       /* On hibernate we try to lock the screen */
+       if (!lock_screen (error))
+         return FALSE;
+       break;
+     case XFSM_SHUTDOWN_HYBRID_SLEEP:
+       xfsm_helper_action = "hybrid-sleep";
++#ifdef __BACKEND_TYPE_BSD__
+       cmd = UP_BACKEND_HIBERNATE_COMMAND;
++#endif
+       /* On hybrid sleep we try to lock the screen */
+       if (!lock_screen (error))
+         return FALSE;