diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2012-07-04 12:54:45 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-09 16:51:20 +0100 |
| commit | 708785266d1d671f5d2a8e8af81a77e34c70662f (patch) | |
| tree | a384f26350fd1eca24aabb8c66666b2cba9dcf09 /meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-disable-xlocale.diff | |
| parent | 817742fa1a5261b3b2c697de3c14e602d55713e2 (diff) | |
| download | openembedded-core-708785266d1d671f5d2a8e8af81a77e34c70662f.tar.gz openembedded-core-708785266d1d671f5d2a8e8af81a77e34c70662f.tar.bz2 openembedded-core-708785266d1d671f5d2a8e8af81a77e34c70662f.zip | |
libx11-diet: upgrade to 1.5.0
The X18NCMSstubs.diff was modified to please the -Werror=return-type
compiler option. Otherwise, it will throw an error.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-disable-xlocale.diff')
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-disable-xlocale.diff | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-disable-xlocale.diff new file mode 100644 index 0000000000..a7c3984fd5 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/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; |