From 1f63bf7fb2748b1ea6603cdb88500fab26ceec56 Mon Sep 17 00:00:00 2001 From: myml Date: Thu, 8 Aug 2024 11:02:18 +0800 Subject: [PATCH 1/2] feat: Unable to set timer reminder in Linglong environment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 玲珑环境会将家目录config进行隔离, 无法在此创建systemd服务 检测玲珑环境并修正config路径位置 Log: --- calendar-service/src/csystemdtimercontrol.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/calendar-service/src/csystemdtimercontrol.cpp b/calendar-service/src/csystemdtimercontrol.cpp index 1064d34c..6484110e 100644 --- a/calendar-service/src/csystemdtimercontrol.cpp +++ b/calendar-service/src/csystemdtimercontrol.cpp @@ -6,6 +6,7 @@ #include "commondef.h" #include "units.h" +#include #include #include @@ -231,8 +232,14 @@ void CSystemdTimerControl::stopUploadTask() void CSystemdTimerControl::createPath() { m_systemdPath = getHomeConfigPath().append("/systemd/user/"); + // 如果位于玲珑环境, 更改systemd path路径 + QString linglongAppID = qgetenv("LINGLONG_APPID"); + if (!linglongAppID.isEmpty()) { + m_systemdPath = "/run/host/rootfs" + m_systemdPath; + qCInfo(ServiceLogger) << "In Linglong environment, change the systemd path to " << m_systemdPath; + } QDir dir; - //如果该路径不存在，则创建该文件夹 + // 如果该路径不存在，则创建该文件夹 if (!dir.exists(m_systemdPath)) { dir.mkpath(m_systemdPath); } From 3bfeda0cb1af8d7d7f8eb53814a02de3bca79b63 Mon Sep 17 00:00:00 2001 From: myml Date: Thu, 8 Aug 2024 11:30:15 +0800 Subject: [PATCH 2/2] chore: Release 1.5.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 发布1.5.4版本 Log: 修复玲珑环境没有日程提醒 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3efdcd18..548e9bac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dde-calendar (5.14.4) unstable; urgency=medium + + * feat: Unable to set timer reminder in Linglong environment + + -- myml Thu, 08 Aug 2024 11:29:59 +0800 + dde-calendar (5.14.3) unstable; urgency=medium * fix: dialog window display position error(Issue: https://github.com/linuxdeepin/developer-center/issues/10141)