summaryrefslogtreecommitdiff
path: root/debian/patches/13_debian_add_xkbpath_env_variable.diff
blob: bd6ca5ba5cfc6a2661c5b66c02212f13d96ca9c7 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
--- xorg-server.orig/xkb/xkbInit.c
+++ xorg-server/xkb/xkbInit.c
@@ -805,6 +805,14 @@
 extern unsigned char	XkbDfltAccessXOptions;
 
 int
+xkbInitGlobals()
+{
+    char * xkbpath= getenv("XKBPATH");
+    if (xkbpath!=NULL)
+	XkbBaseDirectory= xkbpath;
+}
+
+int
 XkbProcessArguments(int argc,char *argv[],int i)
 {
     if (strcmp(argv[i],"-kb")==0) {
--- xorg-server.orig/os/utils.c
+++ xorg-server/os/utils.c
@@ -685,6 +685,7 @@
  */
 void InitGlobals(void)
 {
+    xkbInitGlobals();
     ddxInitGlobals();
 }