diff options
author | Ross Burton <ross.burton@intel.com> | 2012-09-11 20:17:58 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-12 15:13:47 +0100 |
commit | d7a03d5bd066bc22eddaf9f7aba8c995227ab3a7 (patch) | |
tree | 0754d97fcf7ec6c0a147d11a12261ef008ec914b /meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff | |
parent | 8e6a6ecd0edd7fd72225023254d9fd0c1e27fa93 (diff) | |
download | poky-d7a03d5bd066bc22eddaf9f7aba8c995227ab3a7.tar.gz |
libx11: merge patches into a single directory
(From OE-Core rev: 34b337e52551717106b377c53ea5dc617ac4c92c)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff new file mode 100644 index 0000000000..a7c3984fd5 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff | |||
@@ -0,0 +1,17 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Signed-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; | ||