[oe-commits] org.oe.dev diet-x11: add patch from http://www.koka-in.org/~kensyu/zaurus/diary/20030618.html

[koen commit]

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

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 54e44395d7dbd0290f6e72028110601b2b872d68
ViewMTN: http://monotone.openembedded.org/revision.psp?id=54e44395d7dbd0290f6e72028110601b2b872d68
Files:
1
packages/xorg-lib/diet-x11/xchar2b.patch
packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
Diffs:

#
# mt diff -r77e271d03af435bb3b3b5ce740ac5359258f7f0e -r54e44395d7dbd0290f6e72028110601b2b872d68
#
# 
# 
# add_file "packages/xorg-lib/diet-x11/xchar2b.patch"
#  content [6dbc1e50d1c8f5645a7fea8034afb8d485024e8d]
# 
# patch "packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb"
#  from [5f477f6a9fd8b3d0e95e55409326c29f727302f9]
#    to [26223c8ae8698875b73da72e1de34e41c3c884b6]
# 
============================================================
--- packages/xorg-lib/diet-x11/xchar2b.patch	6dbc1e50d1c8f5645a7fea8034afb8d485024e8d
+++ packages/xorg-lib/diet-x11/xchar2b.patch	6dbc1e50d1c8f5645a7fea8034afb8d485024e8d
@@ -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 */
============================================================
--- packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb	5f477f6a9fd8b3d0e95e55409326c29f727302f9
+++ packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb	26223c8ae8698875b73da72e1de34e41c3c884b6
@@ -1,12 +1,13 @@ CFLAGS += "-D_GNU_SOURCE"
 SECTION = "x11/base"
 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://xchar2b.patch;patch=1"
-	    file://xim.patch;patch=1"