summaryrefslogtreecommitdiff
path: root/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2011-11-21 15:42:24 +0800
committerSaul Wold <sgw@linux.intel.com>2011-11-29 00:20:07 -0800
commit6903f53e8e1f48849c9ed1aff837bba6feb1ccbe (patch)
treeea7e4d7bd2d8db16c0ad87a658b5731acaa0039a /meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch
parent1f55b31bdc8cf1da04ef29f4e44c1be6c0286ee2 (diff)
downloadopenembedded-core-6903f53e8e1f48849c9ed1aff837bba6feb1ccbe.tar.gz
openembedded-core-6903f53e8e1f48849c9ed1aff837bba6feb1ccbe.tar.bz2
openembedded-core-6903f53e8e1f48849c9ed1aff837bba6feb1ccbe.tar.xz
openembedded-core-6903f53e8e1f48849c9ed1aff837bba6feb1ccbe.zip
libx11-trim: update to 1.4.4
Some description : 1 Remove --with-xcb because xcb is necessary item in the new version. 2 keysymdef_include.patch uses in keeping native directory of X11 as the default configuration. \ or else host directory "/usr/include/X11" is selected when running ./configure. 3 makekeys_crosscompile.patch avoid host contamination. 4 x11_disable_makekeys.patch uses in compiling makekey.c needed by makekeys-makekeys.o Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch
new file mode 100644
index 000000000..e5eacf051
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch
@@ -0,0 +1,45 @@
+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".
+
+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;