From 5d1977062a0cdd88806fa95fd81e8ff42e8f1011 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 28 Jan 2013 23:54:37 +0200
Subject: [PATCH] libX11: fix non-working keyboard layouts (again)

   this is a partial solution. requires invocation of
   setxkbmap when a keyboard is added / replugged.
   a propper fix is to move xkb setup to udev. I will do
   that later when our new settings addon is ready.

   closes #108 #823 #1661 #1741 #1743
---
 packages/x11/lib/libX11/build   | 1 -
 packages/x11/lib/libX11/install | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/x11/lib/libX11/build b/packages/x11/lib/libX11/build
index d5d6b22443..2a58cbfe35 100755
--- a/packages/x11/lib/libX11/build
+++ b/packages/x11/lib/libX11/build
@@ -42,7 +42,6 @@ cd $PKG_BUILD
             --disable-xcms \
             --enable-xlocale \
             --enable-xkb \
-            --disable-xlocaledir \
             --disable-xf86bigfont \
             --enable-malloc0returnsnull \
             --disable-specs \
diff --git a/packages/x11/lib/libX11/install b/packages/x11/lib/libX11/install
index ecf4cacea2..7ee76b37a2 100755
--- a/packages/x11/lib/libX11/install
+++ b/packages/x11/lib/libX11/install
@@ -25,3 +25,9 @@
 mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/src/.libs/libX11*.so* $INSTALL/usr/lib
   rm -rf $INSTALL/usr/lib/libX11*.so*T
+
+mkdir -p $INSTALL/usr/share/X11
+  cp -R $SYSROOT_PREFIX/usr/share/X11/locale $INSTALL/usr/share/X11
+
+mkdir -p $INSTALL/usr/lib/X11
+  cp -R $SYSROOT_PREFIX/usr/lib/X11/locale $INSTALL/usr/lib/X11