From e768d9a4141e35afc3f09e97aa0e9a4c032d75c3 Mon Sep 17 00:00:00 2001 From: tangjie02 Date: Thu, 27 Apr 2023 09:10:01 +0800 Subject: [PATCH] Prior to select last ntp service in ntp-utils.d directory Signed-off-by: tangjie02 --- ...-Prior-to-select-last-ntp-service-in.patch | 32 +++++++++++++++++++ kiran-cc-daemon.spec | 20 +++++++++--- 2 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 0001-feature-timedate-Prior-to-select-last-ntp-service-in.patch diff --git a/0001-feature-timedate-Prior-to-select-last-ntp-service-in.patch b/0001-feature-timedate-Prior-to-select-last-ntp-service-in.patch new file mode 100644 index 0000000..3a10bff --- /dev/null +++ b/0001-feature-timedate-Prior-to-select-last-ntp-service-in.patch @@ -0,0 +1,32 @@ +From f399f85e9dcdd2786dec68f0f8bdd73b1547b891 Mon Sep 17 00:00:00 2001 +From: tangjie02 +Date: Thu, 27 Apr 2023 08:57:46 +0800 +Subject: [PATCH] feature(timedate): Prior to select last ntp service in + ntp-utils.d directory. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 改为优先选择最后一个ntp服务器，即按照.d目录中最后一个文件作为最高优先级 + +Signed-off-by: tangjie02 +--- + plugins/timedate/timedate-manager.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/timedate/timedate-manager.cpp b/plugins/timedate/timedate-manager.cpp +index 92a4147..bd3085e 100644 +--- a/plugins/timedate/timedate-manager.cpp ++++ b/plugins/timedate/timedate-manager.cpp +@@ -404,7 +404,7 @@ void TimedateManager::init_ntp_units() + this->ntp_unit_name_.clear(); + for (auto &ntp_unit : ntp_units) + { +- if (ntp_unit == ntp_units.front()) ++ if (ntp_unit == ntp_units.back()) + { + this->ntp_unit_name_ = ntp_unit; + continue; +-- +2.36.1 + diff --git a/kiran-cc-daemon.spec b/kiran-cc-daemon.spec index a12f926..a431a63 100644 --- a/kiran-cc-daemon.spec +++ b/kiran-cc-daemon.spec @@ -1,14 +1,15 @@ Name: kiran-cc-daemon Version: 2.5.1 -Release: 4 +Release: 7 Summary: DBus daemon for Kiran Desktop License: MulanPSL-2.0 Source0: %{name}-%{version}.tar.gz -Patch0: 0001-fix-translate-add-some-translation.patch -Patch0001: 0001-fix-keyboard-Add-modifier-lock-window-tips-enable-ke.patch -Patch0002: 0001-fix-audio-Fix-coredump-problem-caused-by-nullpointer.patch -Patch0003: 0001-fix-audio-Fix-the-type-of-return-value-in-template.patch +Patch0: 0001-fix-translate-add-some-translation.patch +Patch0001: 0001-fix-keyboard-Add-modifier-lock-window-tips-enable-ke.patch +Patch0002: 0001-fix-audio-Fix-coredump-problem-caused-by-nullpointer.patch +Patch0003: 0001-fix-audio-Fix-the-type-of-return-value-in-template.patch +Patch0004: 0001-feature-timedate-Prior-to-select-last-ntp-service-in.patch BuildRequires: cmake >= 3.2 @@ -173,6 +174,15 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/nulls || : %{_libdir}/pkgconfig/kiran-cc-daemon.pc %changelog +* Thu Apr 27 2023 tangjie02 - 2.5.1-7 +- KYOS-F: Prior to select last ntp service in ntp-utils.d directory. + +* Sun Apr 23 2023 kpkg - 2.5.1-6 +- rebuild for KY3.4-5-GC-KiranUI-2.5 + +* Sun Apr 23 2023 kpkg - 2.5.1-5 +- rebuild for KY3.4-5-GC-KiranUI-2.5 + * Sun Apr 23 2023 wangyucheng - 2.5.1-4 - KYOS-F: Conditional statement error