aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-10 18:54:29 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-10 19:40:42 +0100
commitc106ad8e833f05bbe181e28e8e8826115f8424cd (patch)
tree277ea125fc36f218c030d5ffa5ff42fad37a142a
parent057999efabe7f1d857f6a94116bcafdeaa309fcf (diff)
downloadnx-libs-c106ad8e833f05bbe181e28e8e8826115f8424cd.tar.gz
nx-libs-c106ad8e833f05bbe181e28e8e8826115f8424cd.tar.bz2
nx-libs-c106ad8e833f05bbe181e28e8e8826115f8424cd.zip
FHS path fix for keyboard config file (103_nxagent_set-X0-config-path.full.patch).
This patch is needed for Tarball installation and on Distros like Debian, not reporting this path addition to upstream. Originally contributed by FreeNX Team.
-rw-r--r--debian/patches/103_nxagent_set-X0-config-path.full.patch40
-rw-r--r--debian/patches/series1
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Keyboard.c9
3 files changed, 3 insertions, 47 deletions
diff --git a/debian/patches/103_nxagent_set-X0-config-path.full.patch b/debian/patches/103_nxagent_set-X0-config-path.full.patch
deleted file mode 100644
index eb705ca81..000000000
--- a/debian/patches/103_nxagent_set-X0-config-path.full.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: FHS path fix for keyboard config file
- This patch is needed for Tarball installation and on Distros like
- Debian, not reporting this path addition to upstream.
- .
- Originally contributed by FreeNX Team.
-Forwarded: not-needed
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Last-Update: 2011-12-31
---- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
-+++ b/nx-X11/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"
-@@ -985,8 +985,7 @@
-
- XkbGetControls(nxagentDisplay, XkbAllControlsMask, xkb);
-
-- nxagentXkbConfigFilePathSize = strlen(XkbBaseDirectory) +
-- strlen(XKB_CONFIG_FILE) + 1;
-+ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE);
-
- nxagentXkbConfigFilePath = malloc((nxagentXkbConfigFilePathSize + 1) * sizeof(char));
-
-@@ -995,9 +994,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",
diff --git a/debian/patches/series b/debian/patches/series
index d84cbd8b2..cfe913d4b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-103_nxagent_set-X0-config-path.full.patch
105_nxagent_export-remote-keyboard-config.full.patch
106_nxagent_utf8-copy-clipboard.full.patch
107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index e3b58b6c7..6039e5c43 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -136,7 +136,7 @@ extern Status XkbGetControls(
#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"
@@ -985,8 +985,7 @@ XkbError:
XkbGetControls(nxagentDisplay, XkbAllControlsMask, xkb);
- nxagentXkbConfigFilePathSize = strlen(XkbBaseDirectory) +
- strlen(XKB_CONFIG_FILE) + 1;
+ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE);
nxagentXkbConfigFilePath = malloc((nxagentXkbConfigFilePathSize + 1) * sizeof(char));
@@ -995,9 +994,7 @@ XkbError:
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",