diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2017-08-01 18:24:12 +0200 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-08-05 07:07:53 +0700 |
| commit | b619f938e24d405903fb930e5d1003a8e557c9e3 (patch) | |
| tree | b9b870b559eb74c21afb1f1c621738c301d9fb63 /system | |
| parent | 20aa2e3ce6a9c7ee5f90ca6e1c19f07c8035ccee (diff) | |
| download | slackbuilds-b619f938e24d405903fb930e5d1003a8e557c9e3.tar.gz | |
system/lxdm: Patch from upstream to honor X zapping.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'system')
| -rw-r--r-- | system/lxdm/lxdm.SlackBuild | 3 | ||||
| -rw-r--r-- | system/lxdm/patches/honor_zap.patch | 28 |
2 files changed, 31 insertions, 0 deletions
diff --git a/system/lxdm/lxdm.SlackBuild b/system/lxdm/lxdm.SlackBuild index 3ee1125957..a3bc14fe9b 100644 --- a/system/lxdm/lxdm.SlackBuild +++ b/system/lxdm/lxdm.SlackBuild @@ -91,6 +91,9 @@ patch -p1 < $CWD/patches/remove_suse_from_Xsession.diff # to maintain ; let's hope I don't eat those words. --rworkman patch -p1 < $CWD/patches/lxdm-set_DESKTOP_SESSION_in_env.diff +# From upstream +patch -p1 < $CWD/patches/honor_zap.patch + sh autogen.sh || true CFLAGS="$SLKCFLAGS" \ diff --git a/system/lxdm/patches/honor_zap.patch b/system/lxdm/patches/honor_zap.patch new file mode 100644 index 0000000000..f90c47a477 --- /dev/null +++ b/system/lxdm/patches/honor_zap.patch @@ -0,0 +1,28 @@ +From fe121ce70ad5e99bd3b3b896dfcbe439dd22716c Mon Sep 17 00:00:00 2001 +From: dgod <dgod.osa@gmail.com> +Date: Sun, 21 Feb 2016 11:45:35 +0800 +Subject: [PATCH] fix not honor ctl+alt+backspacer for restarting + +--- + src/lxdm.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/lxdm.c b/src/lxdm.c +index d81b587..e00d219 100644 +--- a/src/lxdm.c ++++ b/src/lxdm.c +@@ -962,6 +962,11 @@ static void on_xserver_stop(void *data,int pid, int status) + s->dpy=NULL; + ui_drop(); + lxdm_startx(s); ++ #ifndef DISABLE_XAUTH ++ char temp[256]; ++ sprintf(temp,"/var/run/lxdm/lxdm-:%d.auth",s->display); ++ setenv("XAUTHORITY",temp,1); ++ #endif + ui_prepare(); + lxsession_set_active(s); + } +-- +2.1.4 + |