aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorAlexander Wuerstlein <arw@arw.name>2012-12-06 09:07:09 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-12-06 09:07:27 +0100
commit26901cc52224dbfbf308b9252640563e4b52e960 (patch)
tree78b71e57766c134c8094592ba107d60b14afdc49 /debian
parentfe598a1e55a7bcd5578c06848e91ff869637c9c6 (diff)
downloadnx-libs-26901cc52224dbfbf308b9252640563e4b52e960.tar.gz
nx-libs-26901cc52224dbfbf308b9252640563e4b52e960.tar.bz2
nx-libs-26901cc52224dbfbf308b9252640563e4b52e960.zip
Follow-up commit for 302_nxagent_configurable-keystrokes.full.patch, fixes FTBFS problem with the first version of that patch.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/302_nxagent_configurable-keystrokes.full.patch42
2 files changed, 44 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 888cb3ce2..6c255c924 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ nx-libs (2:3.5.0.17-0) UNRELEASED; urgency=low
* Add patch: 302_nxagent_configurable-keystrokes.full.patch, replaces the
hardcoded nxagent keybindings by a configurable table of keybindings.
(Closes upstream issue: #74).
+ * Follow-up commit for 302_nxagent_configurable-keystrokes.full.patch, fixes
+ FTBFS problem with the first version of that patch.
[ Mike Gabriel ]
* Add README.keystrokes to doc section of bin:package nxagent.
diff --git a/debian/patches/302_nxagent_configurable-keystrokes.full.patch b/debian/patches/302_nxagent_configurable-keystrokes.full.patch
index fb747392c..8fb34dfbe 100644
--- a/debian/patches/302_nxagent_configurable-keystrokes.full.patch
+++ b/debian/patches/302_nxagent_configurable-keystrokes.full.patch
@@ -987,3 +987,45 @@ Description: Make nxagent-specific keyboard bindings configurable
+regions_on_screen
+test_input
+deactivate_input_devices_grab
+--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
++++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
+@@ -148,6 +148,8 @@
+
+ char nxagentVerbose = 0;
+
++char *nxagentKeystrokeFile = NULL;
++
+ int ddxProcessArgument(int argc, char *argv[], int i)
+ {
+ /*
+@@ -1021,6 +1023,20 @@
+ return 1;
+ }
+
++ if (!strcmp(argv[i], "-keystrokefile"))
++ {
++ if (i + 1 < argc)
++ {
++ if (NULL != (nxagentKeystrokeFile = strdup(argv[i + 1])))
++ {
++ return 2;
++ } else {
++ FatalError("malloc failed");
++ }
++ }
++ return 0;
++ }
++
+ return 0;
+ }
+
+--- a/nx-X11/programs/Xserver/hw/nxagent/Args.h
++++ b/nx-X11/programs/Xserver/hw/nxagent/Args.h
+@@ -83,4 +83,6 @@
+
+ extern int nxagentRemoteMajor;
+
++extern char *nxagentKeystrokeFile;
++
+ #endif /* __Args_H__ */
+