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 14:52:37 +0100 |
| commit | 34b337e52551717106b377c53ea5dc617ac4c92c (patch) | |
| tree | dfc5395aaa0a8a2bc300d2af5c85ced2255dd0df /meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff | |
| parent | 0f2643cfa385e9637a2d34268e60cdce9fa44e69 (diff) | |
| download | openembedded-core-34b337e52551717106b377c53ea5dc617ac4c92c.tar.gz | |
libx11: merge patches into a single directory
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 @@ +Upstream-Status: Pending + +Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> +--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100 +@@ -701,7 +701,11 @@ + } + if (l - 2 - (p - charset) < 0) + return 0; ++#ifdef XLOCALE + if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset)) ++#else ++ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset)) ++#endif + return 0; + if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1) + return 0; |