openkylin
/
libkysdk-system
mirror of https://gitee.com/openkylin/libkysdk-system.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

同步主线2.2.3.5-0k0.6版本

This commit is contained in:
shaozhimin 2023-07-13 17:39:53 +08:00 committed by cckylin-cibot
parent 89848c21ce
commit dafcf52bdf
4 changed files with 117 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
debian/changelog vendored
View File

@ -1,3 +1,19 @@
libkysdk-system (2.2.3.5-0k0.6) yangtze; urgency=medium
*Bug号：
*需求号：
*其他修改：修改control文件中的libgcc-s1为libgcc-s1 | libgcc1
-- szm-min <shaozhimin@kylinos.cn> Thu, 13 Jul 2023 17:15:13 +0800
libkysdk-system (2.2.3.5-0k0.5) yangtze; urgency=medium
*Bug号：182247 182216
*需求号：
*其他修改：
-- szm-min <shaozhimin@kylinos.cn> Thu, 13 Jul 2023 15:13:01 +0800
libkysdk-system (2.2.3.5-0k0.4) yangtze; urgency=medium
*Bug号：180900 181529 180559 180720 180431 180097 180715 182069

16
debian/control vendored
View File

@ -140,7 +140,7 @@ Depends: libkysdk-log(>=1.2.0),
libc6,
libdbus-1-3,
libdbus-glib-1-2,
libgcc-s1,
libgcc-s1 | libgcc1,
libkysdk-config(>=1.2.0),
libstdc++6,
libsystemd0,
@ -172,7 +172,7 @@ Depends: libkysdk-log(>=1.2.0),
systemd,
libkysdk-systemcommon,
libc6,
libgcc-s1,
libgcc-s1 | libgcc1,
libstdc++6,
libsystemd0
Multi-Arch: same
@ -266,7 +266,7 @@ Depends: libkysdk-log(>=1.2.0),
libkysdk-systemcommon,
libc6,
libdbus-1-3,
libgcc-s1,
libgcc-s1 | libgcc1,
libkysdk-config(>=1.2.0),
libkysdk-utils(>=1.2.0),
libstdc++6,
@ -294,7 +294,7 @@ Depends: libopencv-core4.2,
libtesseract4,
libkysdk-systemcommon,
libc6,
libgcc-s1,
libgcc-s1 | libgcc1,
libstdc++6
Description: AI文字识别功能
@ -395,7 +395,7 @@ Depends: libqt5dbus5,
libcurl4,
libdbus-1-3,
libdbus-glib-1-2,
libgcc-s1,
libgcc-s1 | libgcc1,
libglib2.0-0,
libhd21,
libkmod2,
@ -420,7 +420,7 @@ Depends: libqt5widgets5,
libqt5core5a,
libkysdk-system-dbus,
libc6,
libgcc-s1,
libgcc-s1 | libgcc1,
libqt5concurrent5,
libqt5network5,
libstdc++6
@ -433,7 +433,7 @@ Depends: libqt5webchannel5,
libqt5websockets5,
libkysdk-system-dbus,
libc6,
libgcc-s1,
libgcc-s1 | libgcc1,
libqt5concurrent5,
libqt5core5a,
libqt5dbus5,
@ -454,7 +454,7 @@ Depends: libkysdk-systemcommon,
libkysdk-log(>=1.2.0),
logrotate,
libc6,
libgcc-s1,
libgcc-s1 | libgcc1,
libstdc++6
Multi-Arch: same
Description: 日志转储服务

92
debian/patches/0004-2.2.3.5-0k0.6.patch vendored Normal file
View File

@ -0,0 +1,92 @@
From: shaozhimin <shaozhimin@kylinos.cn>
Date: Thu, 13 Jul 2023 17:39:53 +0800
Subject: =?utf-8?b?5ZCM5q2l5Li757q/Mi4yLjMuNS0wazAuNueJiOacrA==?=
---
src/net/libkynetinfo.c | 26 +++++++++++++++++---------
src/systemtime/libkydate.c | 22 +++++++++++++++++++++-
2 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/src/net/libkynetinfo.c b/src/net/libkynetinfo.c
index c7971bd..fc7fcfa 100644
--- a/src/net/libkynetinfo.c
+++ b/src/net/libkynetinfo.c
@@ -858,7 +858,7 @@ char *kdk_net_get_hosts_domain()
return NULL;
}
- char *hosts = (char *)malloc(sizeof(char) * 64);
+ char *hosts = (char *)malloc(sizeof(char) * 256);
if (hosts == NULL)
{
fclose(fp);
@@ -867,18 +867,26 @@ char *kdk_net_get_hosts_domain()
char line[4096] = "\0";
memset(hosts, 0, sizeof(hosts));
int i = 0;
+ int j = 0;
while (fgets(line, sizeof(line), fp))
{
- if (2 == i && '\n' == line[0])
- continue;
-
- if (line[0] == '\n')
+ if(i == 1)
{
- i++;
- continue;
+ if(j != 6)
+ {
+ j++;
+ }
+ }
+ else{
+ if(strstr(line, "IPv6 capable hosts"))
+ {
+ i = 1;
+ }
+ else{
+ continue;
+ }
}
- // strcat(hosts, line);
- if (i == 2)
+ if((j == 6) && (strlen(line) != 0))
{
strcat(hosts, line);
}
diff --git a/src/systemtime/libkydate.c b/src/systemtime/libkydate.c
index cb7c602..df94085 100644
--- a/src/systemtime/libkydate.c
+++ b/src/systemtime/libkydate.c
@@ -2608,9 +2608,29 @@ kdk_logn_dateinfo *kdk_system_login_lock_dateinfo(char *user)
}
else if(strstr(tvalue, "12小时制"))
{
+ int ap_time = 0; //0为上午，1为下午
+ if (now->tm_hour > 12) {
+ ap_time = 1;
+ }
+ else if (now->tm_hour == 12) {
+ if (now->tm_min > 0 || now->tm_sec > 0) {
+ ap_time = 1;
+ } else {
+ ap_time = 0;
+ }
+ } else {
+ ap_time = 0;
+ }
+
if(strstr(lang, "en"))
{
- strftime(tmp, sizeof(tmp), "%I:%M %p", localtime(&current));
+ // strftime(tmp, sizeof(tmp), "%I:%M %p", localtime(&current));
+ if (ap_time == 0)
+ {
+ strftime(tmp, sizeof(tmp), "%I:%M AM", localtime(&current));
+ }else{
+ strftime(tmp, sizeof(tmp), "%I:%M PM", localtime(&current));
+ }
}else{
if(now->tm_hour >= 12)
{

1
debian/patches/series vendored
View File

@ -1,3 +1,4 @@
0001-Merge-branch-openkylin-yangtze-of-https-gitee.com-op.patch
0002-.patch
0003-2.2.3.5-0k0.4.patch
0004-2.2.3.5-0k0.6.patch