X Strike Force X.Org X11 SVN commit: r2126 - in trunk/xserver/xorg-server-1.0.2/debian: . patches
Author: barbier
Date: 2006-05-12 16:22:56 -0400 (Fri, 12 May 2006)
New Revision: 2126
Modified:
trunk/xserver/xorg-server-1.0.2/debian/changelog
trunk/xserver/xorg-server-1.0.2/debian/patches/13_debian_add_xkbpath_env_variable.diff
Log:
Fix 13_debian_add_xkbpath_env_variable.diff, XKBPATH environment
variable was not always taken into account.
Modified: trunk/xserver/xorg-server-1.0.2/debian/changelog
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/changelog 2006-05-12 15:36:53 UTC (rev 2125)
+++ trunk/xserver/xorg-server-1.0.2/debian/changelog 2006-05-12 20:22:56 UTC (rev 2126)
@@ -1,3 +1,11 @@
+xorg-server (1:1.0.2-9) UNRELEASED; urgency=low
+
+ [ Denis Barbier ]
+ * Fix 13_debian_add_xkbpath_env_variable.diff, XKBPATH environment
+ variable was not always taken into account.
+
+ -- Denis Barbier <barbier@debian.org> Fri, 12 May 2006 22:33:46 +0200
+
xorg-server (1:1.0.2-8) unstable; urgency=low
* Move xserverrc back to xbase-clients. Thanks Benjamin Mesing.
Modified: trunk/xserver/xorg-server-1.0.2/debian/patches/13_debian_add_xkbpath_env_variable.diff
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/patches/13_debian_add_xkbpath_env_variable.diff 2006-05-12 15:36:53 UTC (rev 2125)
+++ trunk/xserver/xorg-server-1.0.2/debian/patches/13_debian_add_xkbpath_env_variable.diff 2006-05-12 20:22:56 UTC (rev 2126)
@@ -2,13 +2,30 @@
===================================================================
--- xorg-server-1.0.2.orig/xkb/xkbInit.c
+++ xorg-server-1.0.2/xkb/xkbInit.c
-@@ -908,6 +908,9 @@
+@@ -906,6 +906,14 @@
+ extern unsigned char XkbDfltAccessXOptions;
+
int
- XkbProcessArguments(int argc,char *argv[],int i)
- {
++xkbInitGlobals()
++{
+ char * xkbpath= getenv("XKBPATH");
+ if (xkbpath!=NULL)
+ XkbBaseDirectory= xkbpath;
++}
++
++int
+ XkbProcessArguments(int argc,char *argv[],int i)
+ {
if (strcmp(argv[i],"-kb")==0) {
- noXkbExtension= True;
- return 1;
+Index: xorg-server-1.0.2/os/utils.c
+===================================================================
+--- xorg-server-1.0.2.orig/os/utils.c
++++ xorg-server-1.0.2/os/utils.c
+@@ -712,6 +712,7 @@
+ */
+ void InitGlobals(void)
+ {
++ xkbInitGlobals();
+ ddxInitGlobals();
+ }
+
Reply to: