diff options
| author | gutteridge <gutteridge@pkgsrc.org> | 2020-03-03 05:06:20 +0000 |
|---|---|---|
| committer | gutteridge <gutteridge@pkgsrc.org> | 2020-03-03 05:06:20 +0000 |
| commit | a3b827ad1632c0c1ae078f560d544f250042907e (patch) | |
| tree | 1800133fca4fabd09413d9012285976eded15d1a | |
| parent | 381a2baf3defbfe8787c33b3493c2beadc904bd3 (diff) | |
| download | pkgsrc-a3b827ad1632c0c1ae078f560d544f250042907e.tar.gz | |
xfce4-session: fix botch in patch
| -rw-r--r-- | x11/xfce4-session/distinfo | 4 | ||||
| -rw-r--r-- | x11/xfce4-session/patches/patch-xfce4-session_xfsm-shutdown-fallback.c | 16 |
2 files changed, 16 insertions, 4 deletions
diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo index 98a3a309843..7dab97e7f0a 100644 --- a/x11/xfce4-session/distinfo +++ b/x11/xfce4-session/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.28 2020/03/01 19:47:22 gutteridge Exp $ +$NetBSD: distinfo,v 1.29 2020/03/03 05:06:20 gutteridge Exp $ SHA1 (xfce4-session-4.14.1.tar.bz2) = 1e44eb63a87fa797dbd80fc0a956ebc7a585c3cc RMD160 (xfce4-session-4.14.1.tar.bz2) = 896b9cc17947a1fa21b05c85c710266dc4e722fe @@ -10,5 +10,5 @@ SHA1 (patch-configure) = ef67202879c09f5c02700eac8dd451580c612db6 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-xfce4-session_xfsm-shutdown-fallback.c) = 6f37dbba8dfb1c4f31b16f395c3e4244466eb0aa SHA1 (patch-xfsm-shutdown-helper_main.c) = db2dc4a7ce729b72092fa2777fd178cb3b7be258 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 98d982d319a..7ade7d8ce77 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,4 +1,4 @@ -$NetBSD: patch-xfce4-session_xfsm-shutdown-fallback.c,v 1.1 2020/03/01 19:47:23 gutteridge Exp $ +$NetBSD: patch-xfce4-session_xfsm-shutdown-fallback.c,v 1.2 2020/03/03 05:06:20 gutteridge Exp $ Fix compilation on OSes other than Linux and the *BSDs. @@ -14,7 +14,19 @@ Fix compilation on OSes other than Linux and the *BSDs. gboolean ret = FALSE; gint exit_status = 0; #ifdef HAVE_POLKIT -@@ -390,21 +392,27 @@ xfsm_shutdown_fallback_try_action (XfsmS +@@ -382,29 +384,39 @@ xfsm_shutdown_fallback_try_action (XfsmS + { + case XFSM_SHUTDOWN_SHUTDOWN: + xfsm_helper_action = "shutdown"; ++#ifdef __BACKEND_TYPE_BSD__ + cmd = POWEROFF_CMD; ++#endif + break; + case XFSM_SHUTDOWN_RESTART: + xfsm_helper_action = "restart"; ++#ifdef __BACKEND_TYPE_BSD__ + cmd = REBOOT_CMD; ++#endif break; case XFSM_SHUTDOWN_SUSPEND: xfsm_helper_action = "suspend"; |