summaryrefslogtreecommitdiff
path: root/x11/xfce4-session
diff options
context:
space:
mode:
authorrichard <richard@pkgsrc.org>2015-07-06 10:39:35 +0000
committerrichard <richard@pkgsrc.org>2015-07-06 10:39:35 +0000
commit214307b45f0c3a216937263e1196d1e0f0775f7b (patch)
treef3222f5763aa56e74ab0d93b4b31fa82dc72e2a4 /x11/xfce4-session
parent7e02511f8136c9cb70a1e8340697759270904f6e (diff)
downloadpkgsrc-214307b45f0c3a216937263e1196d1e0f0775f7b.tar.gz
SunOS doesn't currently define SUSPEND or HIBERNATE, so
be careful to only SUSPEND or HIBERNATE when actually defined.
Diffstat (limited to 'x11/xfce4-session')
-rw-r--r--x11/xfce4-session/distinfo4
-rw-r--r--x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c31
2 files changed, 32 insertions, 3 deletions
diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo
index b42fa2d7d70..7194a28f5a8 100644
--- a/x11/xfce4-session/distinfo
+++ b/x11/xfce4-session/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2015/07/02 13:15:58 youri Exp $
+$NetBSD: distinfo,v 1.16 2015/07/06 10:39:35 richard Exp $
SHA1 (xfce4-session-4.12.1.tar.bz2) = ccdeac8bb6b4bb2382a963efdf2e05c09c61fee4
RMD160 (xfce4-session-4.12.1.tar.bz2) = 14db09177003f4139345b4d670015d90ebf28ef6
@@ -8,4 +8,4 @@ SHA1 (patch-config.h.in) = 88c67de7708c958674de7f222937739dd9f7fc00
SHA1 (patch-configure) = 22924508b9af1b428dfe41413ff46b5592d17c48
SHA1 (patch-scripts_Makefile.in) = 1d1f2230fc861f222f44b9541d52c157a23c16dc
SHA1 (patch-settings_xfce4-session.xml) = 6607e682df06674c4e6a3219b911f58f756cfab7
-SHA1 (patch-xfsm-shutdown-helper_main.c) = 93d2322ed90bef8b17427c1cb32e2fe87f614b04
+SHA1 (patch-xfsm-shutdown-helper_main.c) = 6f885efe31597360bb9534007daffa46df41c831
diff --git a/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c b/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c
index b45f42d4b6b..a858883eec3 100644
--- a/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c
+++ b/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c
@@ -1,6 +1,8 @@
-$NetBSD: patch-xfsm-shutdown-helper_main.c,v 1.1 2015/07/02 13:15:58 youri Exp $
+$NetBSD: patch-xfsm-shutdown-helper_main.c,v 1.2 2015/07/06 10:39:35 richard Exp $
Add NetBSD commands.
+... and be careful to only SUSPEND or HIBERNATE when defined.
+
--- xfsm-shutdown-helper/main.c.orig 2014-08-28 15:52:27.000000000 +0000
+++ xfsm-shutdown-helper/main.c
@@ -91,7 +91,10 @@
@@ -15,3 +17,30 @@ Add NetBSD commands.
static gboolean
run (const gchar *command)
+@@ -217,22 +220,26 @@ main (int argc, char **argv)
+ }
+ else if(suspend)
+ {
++#if defined(UP_BACKEND_SUSPEND_COMMAND)
+ if (run (UP_BACKEND_SUSPEND_COMMAND))
+ {
+ return EXIT_CODE_SUCCESS;
+ }
+ else
++#endif
+ {
+ return EXIT_CODE_FAILED;
+ }
+ }
+ else if(hibernate)
+ {
++#if defined (UP_BACKEND_HIBERNATE_COMMAND)
+ if (run (UP_BACKEND_HIBERNATE_COMMAND))
+ {
+ return EXIT_CODE_SUCCESS;
+ }
+ else
++#endif
+ {
+ return EXIT_CODE_FAILED;
+ }