[X2go-Commits] nx-libs.git - master (branch) updated: redist-client/3.5.0.16-12-g26901cc

X2Go dev team git-admin at x2go.org
Thu Dec 6 09:07:35 CET 2012


The branch, master has been updated
       via  26901cc52224dbfbf308b9252640563e4b52e960 (commit)
      from  fe598a1e55a7bcd5578c06848e91ff869637c9c6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 26901cc52224dbfbf308b9252640563e4b52e960
Author: Alexander Wuerstlein <arw at arw.name>
Date:   Thu Dec 6 09:07:09 2012 +0100

    Follow-up commit for 302_nxagent_configurable-keystrokes.full.patch, fixes FTBFS problem with the first version of that patch.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    2 +
 .../302_nxagent_configurable-keystrokes.full.patch |   42 ++++++++++++++++++++
 2 files changed, 44 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 888cb3c..6c255c9 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 fb74739..8fb34df 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__ */
+


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).




More information about the x2go-commits mailing list