From 937545db232fbcc23969d2697b5007aea65de762 Mon Sep 17 00:00:00 2001 From: peijiankang Date: Mon, 22 Sep 2025 14:02:25 +0800 Subject: [PATCH] fix-Time-garbled-code --- ...-2.5.1.2-kylin-fix-Time-garbled-code.patch | 43 +++++++++++++++++++ libkysdk-system.spec | 9 +++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 libkysdk-system-2.5.1.2-kylin-fix-Time-garbled-code.patch diff --git a/libkysdk-system-2.5.1.2-kylin-fix-Time-garbled-code.patch b/libkysdk-system-2.5.1.2-kylin-fix-Time-garbled-code.patch new file mode 100644 index 0000000..4766860 --- /dev/null +++ b/libkysdk-system-2.5.1.2-kylin-fix-Time-garbled-code.patch @@ -0,0 +1,43 @@ +diff -Nur libkysdk-system-2.5.1.2_back/src/systemtime/libkydate.c libkysdk-system-2.5.1.2_git/src/systemtime/libkydate.c +--- libkysdk-system-2.5.1.2_back/src/systemtime/libkydate.c 2025-09-16 10:44:47.640702843 +0800 ++++ libkysdk-system-2.5.1.2_git/src/systemtime/libkydate.c 2025-09-22 11:22:35.743605928 +0800 +@@ -1453,11 +1453,15 @@ + + char* kdk_system_loginweek() + { +- setlocale (LC_ALL, ""); ++ char *lang = getenv("LANG"); ++ if(strstr(lang,"zh")){ ++ setlocale(LC_ALL, "zh_CN.UTF-8"); ++ }else{ ++ setlocale(LC_ALL, ""); ++ } + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + //textdomain (GETTEXT_PACKAGE); + char *tmpe = (char *)malloc(sizeof(char) * 256); +- char *lang = getenv("LANG"); + struct tm *p; + time_t current; + time(¤t); +@@ -2954,7 +2958,12 @@ + + kdk_logn_dateinfo *kdk_system_login_lock_dateinfo(char *user) + { +- setlocale (LC_ALL, ""); ++ char *lang = getenv("LANG"); ++ if(strstr(lang,"zh")){ ++ setlocale(LC_ALL, "zh_CN.UTF-8"); ++ }else{ ++ setlocale(LC_ALL, ""); ++ } + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + //textdomain (GETTEXT_PACKAGE); + char value[64] = "\0"; +@@ -2965,7 +2974,6 @@ + time_t current; + time(¤t); + now = localtime(¤t); +- char *lang = getenv("LANG"); + sprintf(path, "/var/lib/lightdm-data/%s/dateformat.conf", user); + GKeyFile *config = g_key_file_new(); + kdk_logn_dateinfo *res = (kdk_logn_dateinfo *)calloc(1, sizeof(kdk_logn_dateinfo)); diff --git a/libkysdk-system.spec b/libkysdk-system.spec index fd1f4bd..67dd640 100644 --- a/libkysdk-system.spec +++ b/libkysdk-system.spec @@ -1,13 +1,14 @@ Summary: 麒麟开发者套件 - 系统层套件，提供系统信息、磁盘信息、系统时间等API与服务 Name: libkysdk-system Version: 2.5.1.2 -Release: 2 +Release: 3 License: GPL-2+ URL: http://gitlab2.kylin.com/kysdk/kysdk-system Source0: %{name}-%{version}.tar.gz Patch0: libkysdk-system-2.5.1.2-kylin-change-arch-linux-gnu-to-usr-lib64.patch Patch1: 0001-libkysdk-systime-don-t-set-textdomain-in-library.patch +Patch2: libkysdk-system-2.5.1.2-kylin-fix-Time-garbled-code.patch BuildRequires: cmake BuildRequires: glibc-devel @@ -1625,6 +1626,12 @@ fi %changelog +* Mon Sep 22 2025 peijiankang - 2.5.1.2-3 +- Type: bugfix +- ID : NA +- SUG : NA +- DESC: add libkysdk-system-2.5.1.2-kylin-fix-Time-garbled-code.patch + * Wed Aug 27 2025 houhongxun - 2.5.1.2-2 - Type: bugfix - ID : NA -- Gitee