summaryrefslogtreecommitdiff
path: root/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-10-03 09:52:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-11 17:04:33 +0100
commitccebeb736c785cc6ade075798a1d5c27f106d780 (patch)
treed25514f44ebbbbae6776ca6cf3b5e62725d5b323 /meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff
parent10c87f3f695215000c218b0dd0a3652ee97738e7 (diff)
downloadopenembedded-core-ccebeb736c785cc6ade075798a1d5c27f106d780.tar.gz
openembedded-core-ccebeb736c785cc6ade075798a1d5c27f106d780.tar.bz2
openembedded-core-ccebeb736c785cc6ade075798a1d5c27f106d780.tar.xz
openembedded-core-ccebeb736c785cc6ade075798a1d5c27f106d780.zip
libx11-trim: move files for libx11-trim from libx11-1.3.4 to libx11-trim-1.3.4
* because there isn't libx11-1.3.4 recipe anymore * remove older versions from libx11-trim directory * notice that DESCRIPTION says xcb is disabled and EXTRA_OECONF has --with-xcb Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff16
1 files changed, 16 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff
new file mode 100644
index 000000000..7dcdd6af2
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff
@@ -0,0 +1,16 @@
+Upstream-Status: Pending
+
+--- 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;