summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch
deleted file mode 100644
index 09cf74fff4..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 5c1693028ef12ab767d7cdbc349c27efa1ada87a Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 10 Sep 2018 09:13:38 +0800
4Subject: [PATCH] Fix build when xlocale disabled
5
6Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
7
8Update patch to version 1.6.6
9Signed-off-by: Changqing Li <changqing.li@windriver.com>
10Upstream-Status: Pending
11---
12 src/Font.c | 4 ++++
13 1 file changed, 4 insertions(+)
14
15diff --git a/src/Font.c b/src/Font.c
16index a73f9b1..8f4d210 100644
17--- a/src/Font.c
18+++ b/src/Font.c
19@@ -675,7 +675,11 @@ int _XF86LoadQueryLocaleFont(
20 }
21 if (l - 2 - (p - charset) < 0)
22 return 0;
23+#ifdef XLOCALE
24 if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
25+#else
26+ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
27+#endif
28 return 0;
29 if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
30 return 0;
31--
322.7.4
33