[oe-commits] org.oe.dev libx11: Fix floating-point error on x86_64 buildhost, closes bug 1940

[nail commit]

libx11: Fix floating-point error on x86_64 buildhost, closes bug 1940

Author: nail at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 5a015d1c49983568aacf29859d863463069aca15
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5a015d1c49983568aacf29859d863463069aca15
Files:
1
packages/xorg-lib/diet-x11/makekeys.diff
packages/xorg-lib/libx11/makekeys.diff
packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
Diffs:

#
# mt diff -r31e524cb9422566197345149ed42d3b0a46e435e -r5a015d1c49983568aacf29859d863463069aca15
#
# 
# 
# add_file "packages/xorg-lib/diet-x11/makekeys.diff"
#  content [944db89320ba0446456950f166ca2af2ad7f5185]
# 
# add_file "packages/xorg-lib/libx11/makekeys.diff"
#  content [944db89320ba0446456950f166ca2af2ad7f5185]
# 
# patch "packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb"
#  from [7a2839fa7a4fd2718a2e5198d3c567bec37e379b]
#    to [4ae56b29c831b6e3ab5849e32fac78062ff7ee2c]
# 
# patch "packages/xorg-lib/libx11_X11R7.1-1.0.1.bb"
#  from [fd89d9d976242dfff03bb54b20f004b6e29a19b3]
#    to [ab5dcb0c63ab2ddae6113fb90321f6848c6b1ae0]
# 
============================================================
--- packages/xorg-lib/diet-x11/makekeys.diff	944db89320ba0446456950f166ca2af2ad7f5185
+++ packages/xorg-lib/diet-x11/makekeys.diff	944db89320ba0446456950f166ca2af2ad7f5185
@@ -0,0 +1,12 @@
+diff -Nru libX11-X11R7.1-1.0.1.org/src/util/makekeys.c libX11-X11R7.1-1.0.1/src/util/makekeys.c
+--- libX11-X11R7.1-1.0.1.org/src/util/makekeys.c	2007-03-08 14:34:34.000000000 +0100
++++ libX11-X11R7.1-1.0.1/src/util/makekeys.c	2007-03-08 14:34:58.000000000 +0100
+@@ -49,7 +49,7 @@
+     KeySym	val;
+ } info[KTNUM];
+ 
+-#define MIN_REHASH 10
++#define MIN_REHASH 15
+ #define MATCHES 10
+ 
+ char tab[KTNUM];
============================================================
--- packages/xorg-lib/libx11/makekeys.diff	944db89320ba0446456950f166ca2af2ad7f5185
+++ packages/xorg-lib/libx11/makekeys.diff	944db89320ba0446456950f166ca2af2ad7f5185
@@ -0,0 +1,12 @@
+diff -Nru libX11-X11R7.1-1.0.1.org/src/util/makekeys.c libX11-X11R7.1-1.0.1/src/util/makekeys.c
+--- libX11-X11R7.1-1.0.1.org/src/util/makekeys.c	2007-03-08 14:34:34.000000000 +0100
++++ libX11-X11R7.1-1.0.1/src/util/makekeys.c	2007-03-08 14:34:58.000000000 +0100
+@@ -49,7 +49,7 @@
+     KeySym	val;
+ } info[KTNUM];
+ 
+-#define MIN_REHASH 10
++#define MIN_REHASH 15
+ #define MATCHES 10
+ 
+ char tab[KTNUM];
============================================================
--- packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb	7a2839fa7a4fd2718a2e5198d3c567bec37e379b
+++ packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb	4ae56b29c831b6e3ab5849e32fac78062ff7ee2c
@@ -10,4 +10,5 @@ SRC_URI += "file://X18NCMSstubs.diff;pat
 	    file://fix-disable-xlocale.diff;patch=1 \
             file://fix-utf8-wrong-define.patch;patch=1 \
 	    file://xim.patch;patch=1 \
+	    file://xchar2b.patch;patch=1 \
+	    file://makekeys.diff;patch=1"
-	    file://xchar2b.patch;patch=1"
============================================================
--- packages/xorg-lib/libx11_X11R7.1-1.0.1.bb	fd89d9d976242dfff03bb54b20f004b6e29a19b3
+++ packages/xorg-lib/libx11_X11R7.1-1.0.1.bb	ab5dcb0c63ab2ddae6113fb90321f6848c6b1ae0
@@ -1,8 +1,9 @@ DESCRIPTION = "Base X libs."
 require xorg-lib-common.inc
 
 PR = "r4"
 
 DESCRIPTION = "Base X libs."
+SRC_URI += "file://makekeys.diff;patch=1"
 
 DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
 	libxdmcp xf86bigfontproto kbproto inputproto"