[X2Go-Commits] [x2goserver] 01/02: x2goserver/bin/x2gosetkeyboard: setxkbmap expects a parameter called "-option", but nxagent uses the key "options". Make setxkbmap happy.
git-admin at x2go.org
git-admin at x2go.org
Thu Mar 9 07:56:42 CET 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goserver.
commit e19bb919f1cba056a69a410378c585b3ff3c2a1d
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Mar 9 07:51:11 2017 +0100
x2goserver/bin/x2gosetkeyboard: setxkbmap expects a parameter called "-option", but nxagent uses the key "options". Make setxkbmap happy.
Cherry-picked from release/4.0.1.x branch.
---
debian/changelog | 2 ++
x2goserver/bin/x2gosetkeyboard | 7 ++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index b1fd812..72e9668 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -255,6 +255,8 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium
work properly - with or without Arctica's nx-libs.
- x2goserver/bin/x2gosetkeyboard: rename ${setxkbcomp_opts} to
${setxkbmap_opts}, that's what it really is.
+ - x2goserver/bin/x2gosetkeyboard: setxkbmap expects a parameter called
+ "-option", but nxagent uses the key "options". Make setxkbmap happy.
* x2goserver.spec:
- Add mandatory perl-generators Build-Requires as per
https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl
diff --git a/x2goserver/bin/x2gosetkeyboard b/x2goserver/bin/x2gosetkeyboard
index 438ae07..0b5c73e 100755
--- a/x2goserver/bin/x2gosetkeyboard
+++ b/x2goserver/bin/x2gosetkeyboard
@@ -81,7 +81,12 @@ read_keyboard_file() {
# FIXME: find out why that substitution is needed in the first place!
[ "${key}" = 'rules' ] && value="${value//evdev/base}"
- setxkbmap_opts+=("-${key}" "${value}")
+ # Even though the keyboard file contains "options" as the key,
+ # setxkbmap expects a parameter called "-option".
+ typeset option="${key}"
+ [ "${option}" = 'options' ] && option='option'
+
+ setxkbmap_opts+=("-${option}" "${value}")
fi
fi
done
--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list