libx11-1.4.4: add patch "makekeys_crosscompile.patch"

PATCH In review Xiaofeng Yan 2 participants 6 messages Feb 9, 2012 – Mar 1, 2012

lore

Share & tools

lore

Xiaofeng Yan

author

2012-02-09 08:30 UTC #0 lore raw

cover libx11-1.4.4: add patch "makekeys_crosscompile.patch"

From: Xiaofeng Yan <[email protected]>

LSB report the following information when running lsb test.

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

This is host contamination problem. libx11-1.4.4 hasn't patch "makekeys_crosscompile.patch" in libx11-trim-1.4.4 because core-image-lsb-qt3 use libx11 instead of libx11-trim.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/1970
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/1970

Thanks,
Xiaofeng Yan <[email protected]>
---

Xiaofeng Yan (2):
libx11-1.4.4: Add patch makekeys_crosscompile.patch libx11-1.4.4: Add patch "makekeys_crosscompile.patch"

 .../libx11-1.4.4/makekeys_crosscompile.patch       |   45 ++++++++++++++++++++
 meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb     |    3 +-
 2 files changed, 47 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch

Xiaofeng Yan

author

2012-02-09 08:30 UTC #1 lore raw

PATCH 1/2 libx11-1.4.4: Add patch makekeys_crosscompile.patch

From: Xiaofeng Yan <[email protected]>

LSB 4.1 complain a host contamination error from libx11 because of absent patch "makekeys_crosscompile.patch" from libx11-trim-1.4.4.

[YOCTO #1970]

Signed-off-by Xiaofeng Yan <[email protected]>

---
 .../libx11-1.4.4/makekeys_crosscompile.patch       |   45 ++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch

meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch new file +45 -0

new file mode 100644
index 0000000..e5eacf0
@@ -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: [email protected]
+
+--- 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;

Signature · 1 line

1.7.0.4

Paul Menzel

2012-02-09 09:14 UTC #2 lore raw

Re: [PATCH 1/2] libx11-1.4.4: Add patch makekeys_crosscompile.patch

Dear Xiaofeng,

Am Donnerstag, den 09.02.2012, 16:05 +0800 schrieb Xiaofeng Yan:

Quoted 6 lines

From: Xiaofeng Yan <[email protected]>
LSB 4.1 complain a host contamination error from libx11 because of absent patch "makekeys_crosscompile.patch" from libx11-trim-1.4.4.
[YOCTO #1970]

could you squash both patches please?

Also please add the output from the cover letter to the commit message.

Quoted 12 lines

Signed-off-by Xiaofeng Yan <[email protected]>
---
 .../libx11-1.4.4/makekeys_crosscompile.patch       |   45 ++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch
meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch new file +0 -0
new file mode 100644
index 0000000..e5eacf0

meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch line 3

Quoted 3 lines

meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch new file +3 -0
@@ -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". 

Trailing space at the end.

Could you also add the error message to the patch file in a *separate* patch please. Preferably before copying it.

meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch line 10

Quoted 7 lines

meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch new file +7 -0

+
+Upstream-Status: Pending
+
+Signed-off-by: [email protected]
+
+--- 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

[…]

Thanks,

Paul

Xiaofeng Yan

author

2012-03-01 06:24 UTC #3 lore raw

Re: [PATCH 1/2] libx11-1.4.4: Add patch makekeys_crosscompile.patch

Quoted 31 lines · Paul Menzel

Dear Xiaofeng,
Am Donnerstag, den 09.02.2012, 16:05 +0800 schrieb Xiaofeng Yan:
Quoted 6 lines
From: Xiaofeng Yan<[email protected]>
LSB 4.1 complain a host contamination error from libx11 because of absent patch "makekeys_crosscompile.patch" from libx11-trim-1.4.4.
[YOCTO #1970]
could you squash both patches please?
Also please add the output from the cover letter to the commit message.
Quoted 12 lines
Signed-off-by Xiaofeng Yan<[email protected]>
---
  .../libx11-1.4.4/makekeys_crosscompile.patch       |   45 ++++++++++++++++++++
  1 files changed, 45 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch
meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch new file +0 -0
new file mode 100644
index 0000000..e5eacf0
meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch line 3
Quoted 3 lines
meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch new file +3 -0
@@ -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".
Trailing space at the end.

Quoted 3 lines

Could you also add the error message to the patch file in a *separate* patch please. Preferably before copying it.

Do you mean I use an separated file to record error message?
So there are two file here. one is for makekeys_crosscompile.patch, another is for a file to record error message. right?

Quoted 13 lines

meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch line 10
Quoted 7 lines
meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch new file +7 -0
+
+Upstream-Status: Pending
+
+Signed-off-by: [email protected]
+
+--- 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
[…]
Thanks,
Paul

Paul Menzel

2012-03-01 10:46 UTC #4 lore raw

Re: [PATCH 1/2] libx11-1.4.4: Add patch makekeys_crosscompile.patch

Am Donnerstag, den 01.03.2012, 14:14 +0800 schrieb Xiaofeng Yan:

Quoted 8 lines · Paul Menzel

Quoted 7 lines
Am Donnerstag, den 09.02.2012, 16:05 +0800 schrieb Xiaofeng Yan:
Quoted 5 lines
From: Xiaofeng Yan<[email protected]>
LSB 4.1 complain a host contamination error from libx11 because of absent patch "makekeys_crosscompile.patch" from libx11-trim-1.4.4.

Quoted 6 lines

Quoted 6 lines
Quoted 1 line
[YOCTO #1970]
could you squash both patches please?
Also please add the output from the cover letter to the commit message.
Quoted 1 line
Signed-off-by Xiaofeng Yan<[email protected]>

I just noticed. Your Thunderbird setup seems to be broken. For some reason it deletes spaces.

Quoted 6 lines

Quoted 6 lines
meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch
Quoted 6 lines
---
  .../libx11-1.4.4/makekeys_crosscompile.patch       |   45 ++++++++++++++++++++
  1 files changed, 45 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch
meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch +0 -0

Here Thunderbird removed a line break.

Quoted 10 lines

Quoted 10 lines
meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch line 3
Quoted 8 lines
new file mode 100644
index 0000000..e5eacf0
meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch new file +3 -0
@@ -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".
Trailing space at the end.

Quoted 6 lines

Quoted 2 lines
Could you also add the error message to the patch file in a *separate* patch please. Preferably before copying it.
Do you mean I use an separated file to record error message? So there are two file here. one is for makekeys_crosscompile.patch, another is for a file to record error message. right?

Sorry, I did not understand your reply either. :/

1. Copy the error message you got when building without the patch.
2. Go to

meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch

and add that error message to the commit message of the patch above. Make that the first patch.
3. Now copy this file to libx11-1.4.4 and submit as a second patch.

Quoted 8 lines

Quoted 8 lines
Quoted 7 lines
meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch new file +7 -0
+
+Upstream-Status: Pending
+
+Signed-off-by: [email protected]
+
+--- 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
[…]

Thanks,

Paul

Xiaofeng Yan

author

2012-02-09 08:30 UTC #5 lore raw

PATCH 2/2 libx11-1.4.4: Add patch "makekeys_crosscompile.patch"

In reply to Xiaofeng Yan

From: Xiaofeng Yan <[email protected]>

Add patch "makekeys_crosscompile.patch" to libx11-1.4.4 for fixing bug 1970.

[YOCTO #1970]

Signed-off-by Xiaofeng Yan <[email protected]>

---
 meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb +2 -1

index ee1d919..0428ff5 100644
@@ -1,7 +1,7 @@
 require libx11.inc
 inherit gettext
 
-PR = "r1"
+PR = "r2"
 
 BBCLASSEXTEND = "native nativesdk"

@@ -15,6 +15,7 @@ DEPENDS += "util-macros xtrans libxdmcp libxau \
 SRC_URI += " file://keysymdef_include.patch \
              file://x11_disable_makekeys.patch \
              file://0001-Add-_XGetRequest-as-substitute-for-GetReq-GetReqExtr.patch \
+             file://makekeys_crosscompile.patch \
              "
 
 SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9"

Signature · 1 line

1.7.0.4