summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11/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 18:08:37 +0100
commit2ee903a73804f16e844c98285962123413bc457b (patch)
treed2a12ae74c2551ba74a15d7cf128543bd5678ea3 /meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
parentdc64df6c176c7e56095c4d09a2d00b8a4d976a7c (diff)
downloadpoky-2ee903a73804f16e844c98285962123413bc457b.tar.gz
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 (From OE-Core rev: ccebeb736c785cc6ade075798a1d5c27f106d780) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.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.diff16
1 files changed, 0 insertions, 16 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
deleted file mode 100644
index 7dcdd6af22..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
+++ /dev/null
@@ -1,16 +0,0 @@
1Upstream-Status: Pending
2
3--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100
4+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100
5@@ -701,7 +701,11 @@
6 }
7 if (l - 2 - (p - charset) < 0)
8 return 0;
9+#ifdef XLOCALE
10 if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
11+#else
12+ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
13+#endif
14 return 0;
15 if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
16 return 0;