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.patch | |
| 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.patch')
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch new file mode 100644 index 0000000000..3677fb1c5c --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | From 5c1693028ef12ab767d7cdbc349c27efa1ada87a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Changqing Li <changqing.li@windriver.com> | ||
| 3 | Date: Mon, 10 Sep 2018 09:13:38 +0800 | ||
| 4 | Subject: [PATCH] Upstream-Status: Pending | ||
| 5 | |||
| 6 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> | ||
| 7 | |||
| 8 | Update patch to version 1.6.6 | ||
| 9 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 10 | --- | ||
| 11 | src/Font.c | 4 ++++ | ||
| 12 | 1 file changed, 4 insertions(+) | ||
| 13 | |||
| 14 | diff --git a/src/Font.c b/src/Font.c | ||
| 15 | index a73f9b1..8f4d210 100644 | ||
| 16 | --- a/src/Font.c | ||
| 17 | +++ b/src/Font.c | ||
| 18 | @@ -675,7 +675,11 @@ int _XF86LoadQueryLocaleFont( | ||
| 19 | } | ||
| 20 | if (l - 2 - (p - charset) < 0) | ||
| 21 | return 0; | ||
| 22 | +#ifdef XLOCALE | ||
| 23 | if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset)) | ||
| 24 | +#else | ||
| 25 | + if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset)) | ||
| 26 | +#endif | ||
| 27 | return 0; | ||
| 28 | if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1) | ||
| 29 | return 0; | ||
| 30 | -- | ||
| 31 | 2.7.4 | ||
| 32 | |||
