diff options
author | Changqing Li <changqing.li@windriver.com> | 2018-09-10 10:33:25 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-11 09:05:35 +0100 |
commit | 17f1496f841e0409e345bf889f3396cded2d7d69 (patch) | |
tree | 2c8ca10e6583688782805ba81d6be39708d20fb7 /meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff | |
parent | f3fb768200b1f4710ed485037f9849d635905c6d (diff) | |
download | poky-17f1496f841e0409e345bf889f3396cded2d7d69.tar.gz |
libx11: Upgrade 1.6.5 ->1.6.6
(From OE-Core rev: a04a0f309f4080497ddb6fa1cf81b9c2db5f4e11)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
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, 0 insertions, 17 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 deleted file mode 100644 index a7c3984fd5..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
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; | ||