summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-disable-xlocale.diff
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2012-07-04 12:54:45 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-09 16:58:55 +0100
commita5180e43ba7a15541dc8861e0d53aa531b99103f (patch)
treedc20539771fdf766c233f5532523c29cd24a8427 /meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-disable-xlocale.diff
parentf013f72285fcd116253780d0b05c69c432e3a1ee (diff)
downloadpoky-a5180e43ba7a15541dc8861e0d53aa531b99103f.tar.gz
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. (From OE-Core rev: 708785266d1d671f5d2a8e8af81a77e34c70662f) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.diff17
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 @@
1Upstream-Status: Pending
2
3Signed-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;