summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2011-11-15 12:58:36 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-16 17:32:43 +0000
commitbe24bd3ca24c0916b12a1c15b981b498035e462d (patch)
treeda3e2c11ded8fe42eb710a73b3d071cf95f0d799 /meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff
parentbc9c52cf396e74ee7417a61f7716926926c6a64b (diff)
downloadpoky-be24bd3ca24c0916b12a1c15b981b498035e462d.tar.gz
libx11-diet: update to 1.4.4
I remove patch "nodolt.patch" because it is no use in the new version \ and change patch "include_fix.patch" to "keysymdef_include.patch" from libx11-1.4.4. (From OE-Core rev: dbb86f8445512f95d9dc3cbbdf935901fe2e04b9) Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff17
1 files changed, 17 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff
new file mode 100644
index 0000000000..a7c3984fd5
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff
@@ -0,0 +1,17 @@
1Upstream-Status: Pending
2
3Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
4--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100
5+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100
6@@ -701,7 +701,11 @@
7 }
8 if (l - 2 - (p - charset) < 0)
9 return 0;
10+#ifdef XLOCALE
11 if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
12+#else
13+ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
14+#endif
15 return 0;
16 if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
17 return 0;