diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2011-12-29 09:57:30 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2011-12-29 09:57:30 +0100 |
| commit | 89fea92798d1823bea3991889be4c938043a72ef (patch) | |
| tree | 201d0b7a5eb63555657914437219d68c356d62c6 /debian/patches/103_nxagent_set-X0-config-path.patch | |
| parent | dd287a5c8e01cbdab17c94016cf74f9c92205e13 (diff) | |
| download | nx-libs-89fea92798d1823bea3991889be4c938043a72ef.tar.gz nx-libs-89fea92798d1823bea3991889be4c938043a72ef.tar.bz2 nx-libs-89fea92798d1823bea3991889be4c938043a72ef.zip | |
Add FreeNX patches for nxagent (some with other names compared to FreeNX):
- 101_nxagent_set-rgb-path.patch
- 102_xserver-xext_set-securitypolicy-path.patch
- 103_nxagent_set-X0-config-path.patch
- 104_nxagent_enable_debug.patch
- 105_nxagent_export-remote-keyboard-config.patch
- 106_nxagent_utf8-copy-clipboard.patch
- 107_nxagent_clipboard-compound-text+small-bed-sheets.patch
- 108_nxagent_wine-close-delay.patch
- 109_nxagent_locale-utf8-compound-text.patch
- 200_nxagent_unbrand-agent.patch
Diffstat (limited to 'debian/patches/103_nxagent_set-X0-config-path.patch')
| -rw-r--r-- | debian/patches/103_nxagent_set-X0-config-path.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/debian/patches/103_nxagent_set-X0-config-path.patch b/debian/patches/103_nxagent_set-X0-config-path.patch new file mode 100644 index 000000000..326c91b57 --- /dev/null +++ b/debian/patches/103_nxagent_set-X0-config-path.patch @@ -0,0 +1,32 @@ +--- a/nxagent/programs/Xserver/hw/nxagent/Keyboard.c ++++ b/nxagent/programs/Xserver/hw/nxagent/Keyboard.c +@@ -136,7 +136,7 @@ + #define XKB_ALTERNATE_BASE_DIRECTORY "/usr/X11R6/lib/X11/xkb" + #endif + #ifndef XKB_CONFIG_FILE +-#define XKB_CONFIG_FILE "X0-config.keyboard" ++#define XKB_CONFIG_FILE "/etc/nxagent/nxagent.keyboard" + #endif + #ifndef XKB_DFLT_RULES_FILE + #define XKB_DFLT_RULES_FILE "xfree86" +@@ -978,8 +978,7 @@ + + XkbGetControls(nxagentDisplay, XkbAllControlsMask, xkb); + +- nxagentXkbConfigFilePathSize = strlen(XkbBaseDirectory) + +- strlen(XKB_CONFIG_FILE) + 1; ++ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE); + + nxagentXkbConfigFilePath = malloc((nxagentXkbConfigFilePathSize + 1) * sizeof(char)); + +@@ -988,9 +987,7 @@ + FatalError("nxagentKeyboardProc: malloc failed."); + } + +- strcpy(nxagentXkbConfigFilePath, XkbBaseDirectory); +- strcat(nxagentXkbConfigFilePath, "/"); +- strcat(nxagentXkbConfigFilePath, XKB_CONFIG_FILE); ++ strcpy(nxagentXkbConfigFilePath, XKB_CONFIG_FILE); + + #ifdef TEST + fprintf(stderr, "nxagentKeyboardProc: nxagentXkbConfigFilePath [%s].\n", |