--- a/open-src/xserver/xorg/make_xkm_output_dir.patch Tue Jul 05 13:41:14 2011 -0700
+++ b/open-src/xserver/xorg/make_xkm_output_dir.patch Thu Jul 07 08:33:27 2011 -0700
@@ -54,7 +54,7 @@
- if (access(XKM_OUTPUT_DIR, W_OK | X_OK) == 0 && (strlen(XKM_OUTPUT_DIR) < size))
+ if ( ( (access(XKM_OUTPUT_DIR, W_OK | X_OK) == 0)
+#ifdef MAKE_XKM_OUTPUT_DIR
-+ || (trans_mkdir(XKM_OUTPUT_DIR, XKM_OUTPUT_DIR_MODE) == 0)
++ || (getuid() == 0 && (trans_mkdir(XKM_OUTPUT_DIR, XKM_OUTPUT_DIR_MODE) == 0))
+#endif
+ ) && (strlen(XKM_OUTPUT_DIR) < size))
{