From 2db1afbf2e56d8743c701d81a5797001ce9e5c52 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue, 26 Aug 2008 23:09:20 -0700
Subject: [PATCH] XQuartz: Always use TIS for the keyboard layout seed since
 KB* aren't thread safe. (cherry picked from commit
 c8244177b0dbcb28d2f5509e6f2a3e8057889790)

---
 hw/xquartz/quartzKeyboard.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index aebc941ff..d26fbd3b8 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -1103,7 +1103,8 @@ Bool LegalModifier(unsigned int key, DeviceIntPtr pDev)
 /* TODO: Not thread safe */
 unsigned int QuartzSystemKeymapSeed(void) {
     static unsigned int seed = 0;
-#if defined(__x86_64__) || defined(__ppc64__)
+//#if defined(__x86_64__) || defined(__ppc64__)
+#if 1
     static TISInputSourceRef last_key_layout = NULL;
     TISInputSourceRef key_layout;