From: Koen Kooi <koen@openembedded.org>
Date: Fri, 1 Dec 2006 13:48:34 +0000 (+0000)
Subject: diet-x11: add patch from http://www.koka-in.org/~kensyu/zaurus/diary/20030618.html
X-Git-Tag: Release-2010-05/1~9453^2~204^2~55
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad9669152028e0d36733b616b11e16458bc336d2;p=openembedded.git

diet-x11: add patch from koka-in.org/~kensyu/zaurus/diary/20030618.html
---

diff --git a/packages/xorg-lib/diet-x11/xchar2b.patch b/packages/xorg-lib/diet-x11/xchar2b.patch
new file mode 100644
index 0000000000..5459f5ed69
--- /dev/null
+++ b/packages/xorg-lib/diet-x11/xchar2b.patch
@@ -0,0 +1,11 @@
+--- /tmp/Xlib.h	2006-12-01 14:40:27.000000000 +0100
++++ libX11-X11R7.1-1.0.1/include/X11/Xlib.h	2006-12-01 14:40:56.948254000 +0100
+@@ -1067,7 +1067,7 @@
+ typedef struct {		/* normal 16 bit characters are two bytes */
+     unsigned char byte1;
+     unsigned char byte2;
+-} XChar2b;
++} __attribute__ ((packed)) XChar2b;
+ 
+ typedef struct {
+     XChar2b *chars;		/* two byte characters */
diff --git a/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
index 688d59eef6..e2b6e442ba 100644
--- a/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
@@ -4,9 +4,10 @@ require libx11_${PV}.bb
 EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
 CFLAGS += "-D_GNU_SOURCE"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
 	    file://fix-disable-xlocale.diff;patch=1 \
             file://fix-utf8-wrong-define.patch;patch=1 \
-	    file://xim.patch;patch=1"
+	    file://xim.patch;patch=1 \
+	    file://xchar2b.patch;patch=1"