[X2Go-Dev] Bug#74: Fix build error caused by patch for #74 (missing nxagentKeystrokeFile)

[Mike Gabriel]

tag #74 pending
thanks

THANKS!
Committed:
http://code.x2go.org/gitweb?p=nx-libs.git;a=commitdiff;h=26901cc52224dbfbf308b9252640563e4b52e960

Package seems to build fine now.
Thanks for the quick response!!!

Mike

On Do 06 Dez 2012 00:02:47 CET Alexander Wuerstlein wrote:

> Adds command line argument -keystrokefile to nxagent which fills
> the nxagentKeystrokeFile variable
> ---
>  .../302_nxagent_configurable-keystrokes.full.patch |   42  
> ++++++++++++++++++++
>  1 file changed, 42 insertions(+)
>
> 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__ */
> +
> --
> 1.7.10.4
> _______________________________________________
> X2Go-Dev mailing list
> X2Go-Dev at lists.berlios.de
> https://lists.berlios.de/mailman/listinfo/x2go-dev
>



-- 

DAS-NETZWERKTEAM
mike gabriel, rothenstein 5, 24214 neudorf-bornstein
fon: +49 (1520) 1976 148

GnuPG Key ID 0x25771B31
mail: mike.gabriel at das-netzwerkteam.de, http://das-netzwerkteam.de

freeBusy:
https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digitale PGP-Unterschrift
URL: <http://lists.x2go.org/pipermail/x2go-dev/attachments/20121206/9da32e00/attachment.pgp>