3 files changed, 133 insertions, 0 deletions

diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/keysymdef_include.patch
new file mode 100644
index 0000000000..d1bdab9778
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/keysymdef_include.patch
@@ -0,0 +1,23 @@
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+
+diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac
+--- libX11-1.3.6.orig//configure.ac     2010-09-20 08:04:16.000000000 +0200
++++ libX11-1.3.6/configure.ac   2010-09-28 16:29:26.000000000 +0200
+@@ -355,7 +355,14 @@
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysym definitions])
+-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
++AC_ARG_WITH(keysymdefdir,
++        AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]),
++        KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="")
++
++if test x$KEYSYMDEFDIR = x; then
++       KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
++fi
++
+ FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
+ for i in $FILES; do
+     if test -f "$KEYSYMDEFDIR/$i"; then
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/makekeys_crosscompile.patch
new file mode 100644
index 0000000000..daf3696b34
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/makekeys_crosscompile.patch
@@ -0,0 +1,76 @@
+Because the size of "unsigned long" is different between 32-bit
+and 64-bit, judge whether target is 32-bit or 64-bit and tell
+"makekey".
+
+The error information from LSB Test suite is as follow:
+VSW5TESTSUITE PURPOSE 7
+Assertion XStringToKeysym-7.(A)
+When the string argument is the name of a KeySym in the 
+table with the prefix XK_ removed, then a call to
+XStringToKeysym returns that KeySym.
+METH: For each KeySym name in table with code G:
+METH: Call XStringToKeysym to obtain the KeySym defined for that string.
+METH: Verify that XStringToKeysym did not return NoSymbol.
+METH: Verify that the returned string is correct.
+CHECK: XStringToKeysym-7 1, line 130 
+CHECK: XStringToKeysym-7 2, line 140 
+CHECK: XStringToKeysym-7 3, line 150 
+CHECK: XStringToKeysym-7 4, line 160 
+CHECK: XStringToKeysym-7 5, line 170 
+CHECK: XStringToKeysym-7 6, line 180 
+CHECK: XStringToKeysym-7 7, line 190 
+CHECK: XStringToKeysym-7 8, line 200 
+CHECK: XStringToKeysym-7 9, line 210 
+CHECK: XStringToKeysym-7 10, line 220 
+CHECK: XStringToKeysym-7 11, line 230 
+CHECK: XStringToKeysym-7 12, line 240 
+CHECK: XStringToKeysym-7 13, line 250 
+CHECK: XStringToKeysym-7 14, line 260 
+CHECK: XStringToKeysym-7 15, line 270 
+CHECK: XStringToKeysym-7 16, line 280 
+CHECK: XStringToKeysym-7 17, line 290 
+CHECK: XStringToKeysym-7 18, line 300 
+CHECK: XStringToKeysym-7 19, line 310 
+CHECK: XStringToKeysym-7 20, line 320
+
+Upstream-Status: Pending
+
+Signed-off-by: dbuitenh@windriver.com
+
+--- libX11-1.3.4.orig/src/util/makekeys.c       2010-01-15 09:11:36.000000000 +0800
++++ libX11-1.3.4/src/util/makekeys.c    2011-05-24 19:04:25.454774908 +0800
+@@ -33,6 +33,7 @@
+ #include <X11/keysymdef.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ 
+ typedef unsigned long Signature;
+ 
+@@ -124,7 +125,12 @@
+            name = info[i].name;
+            sig = 0;
+            while ((c = *name++))
+-               sig = (sig << 1) + c;
++#ifdef USE32
++               sig = (uint32_t)(sig << 1) + c;
++#else
++               sig = (uint64_t)(sig << 1) + c;
++#endif
++               
+            first = j = sig % z;
+            for (k = 0; tab[j]; k++) {
+                j += first + 1;
+@@ -163,7 +169,11 @@
+        name = info[i].name;
+        sig = 0;
+        while ((c = *name++))
+-           sig = (sig << 1) + c;
++#ifdef USE32
++           sig = (uint32_t)(sig << 1) + c;
++#else
++           sig = (uint64_t)(sig << 1) + c;
++#endif
+        first = j = sig % z;
+        while (offsets[j]) {
+            j += first + 1;
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/x11_disable_makekeys.patch
new file mode 100644
index 0000000000..69f9e6c4d6
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/x11_disable_makekeys.patch
@@ -0,0 +1,34 @@
+Upstream-Status: Pending
+
+Index: libX11-1.5.0/src/util/Makefile.am
+===================================================================
+--- libX11-1.5.0.orig/src/util/Makefile.am
++++ libX11-1.5.0/src/util/Makefile.am
+@@ -1,27 +1,2 @@
+-
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS = \
+-       $(X11_CFLAGS) \
+-       $(CWARNFLAGS)
+-
+-makekeys_CPPFLAGS = \
+-       -I$(top_srcdir)/include
+-
+-CC = @CC_FOR_BUILD@
+-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
+-CFLAGS = @CFLAGS_FOR_BUILD@
+-LDFLAGS = @LDFLAGS_FOR_BUILD@
+-
+ EXTRA_DIST = mkks.sh
+ 
+-if LINT
+-# Check source code with tools like lint & sparse
+-
+-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-               $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+-
+-lint:
+-       $(LINT) $(ALL_LINT_FLAGS) makekeys.c
+-
+-endif LINT