summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch
blob: 559250f9576e00478b6acc5a6b036a795d234569 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
From 5c1693028ef12ab767d7cdbc349c27efa1ada87a Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Mon, 10 Sep 2018 09:13:38 +0800
Subject: [PATCH]

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>

Update patch to version 1.6.6
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Upstream-Status: Pending
---
 src/Font.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Font.c b/src/Font.c
index a73f9b1..8f4d210 100644
--- a/src/Font.c
+++ b/src/Font.c
@@ -675,7 +675,11 @@ int _XF86LoadQueryLocaleFont(
     }
     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;
-- 
2.7.4