aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/103_nxagent_set-X0-config-path.full.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-14 16:23:43 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-14 16:23:43 +0100
commit09d2732b4e299eaa06c64b7a683529e337691c59 (patch)
tree3a07c4a95980c0f34b1d3ce2f55388dd7677c685 /debian/patches/103_nxagent_set-X0-config-path.full.patch
parent8c98a401b49506f969dc9263d9bd566e5b31a572 (diff)
downloadnx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.tar.gz
nx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.tar.bz2
nx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.zip
Patch system: Prepend a "0" to every patch file name in debian/patches/. Adapt only this changelog stanza to this modification.
Diffstat (limited to 'debian/patches/103_nxagent_set-X0-config-path.full.patch')
-rw-r--r--debian/patches/103_nxagent_set-X0-config-path.full.patch40
1 files changed, 0 insertions, 40 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",