summaryrefslogtreecommitdiff
path: root/packages/xorg-lib
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-12-01 13:48:34 +0000
committerKoen Kooi <koen@openembedded.org>2006-12-01 13:48:34 +0000
commitad9669152028e0d36733b616b11e16458bc336d2 (patch)
tree2a2ac260c5480fc2720e29153087eb63401ed322 /packages/xorg-lib
parentbb121fa61c6bc57235319d790ec4185c981a4232 (diff)
diet-x11: add patch from http://www.koka-in.org/~kensyu/zaurus/diary/20030618.html
Diffstat (limited to 'packages/xorg-lib')
-rw-r--r--packages/xorg-lib/diet-x11/xchar2b.patch11
-rw-r--r--packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb5
2 files changed, 14 insertions, 2 deletions
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"