mirror of
git://git.yoctoproject.org/poky
synced 2026-10-02 17:25:46 +00:00
25a8862b90
devtool doesn't like patches without subjects, so add meaningful subjects. (From OE-Core rev: 3056a2e5d8b7e7285fd9680073a5ab613a4066e4) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
34 lines
918 B
Diff
34 lines
918 B
Diff
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] Fix build when xlocale disabled
|
|
|
|
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
|
|
|