diff --git a/0001-fix-1060-AE-RC1-DDE.patch b/0001-fix-1060-AE-RC1-DDE.patch new file mode 100644 index 0000000..d6ff385 --- /dev/null +++ b/0001-fix-1060-AE-RC1-DDE.patch @@ -0,0 +1,115 @@ +From 5b8f9686e93998f05f6da6da753f0e41038c26f8 Mon Sep 17 00:00:00 2001 +From: zhangguofu +Date: Tue, 28 Feb 2023 14:46:32 +0800 +Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E3=80=901060=E3=80=91=E3=80=90AE?= + =?UTF-8?q?=E3=80=91=E3=80=90RC1=E3=80=91=E3=80=90=E5=85=A8=E5=B9=B3?= + =?UTF-8?q?=E5=8F=B0=E3=80=91=E3=80=90DDE=E3=80=91=E3=80=90=E6=96=B0?= + =?UTF-8?q?=E9=9C=80=E6=B1=82=E3=80=91=E3=80=90=E6=97=A5=E5=8E=86=E3=80=91?= + =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=8D=95=E5=A4=A9=E6=97=A5=E7=A8=8B=E5=A4=B1?= + =?UTF-8?q?=E8=B4=A5?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + 【1060】【AE】【RC1】【全平台】【DDE】【新需求】【日历】新建单天日程失败 + +Log: 【1060】【AE】【RC1】【全平台】【DDE】【新需求】【日历】新建单天日程失败 + +Bug: https://pms.uniontech.com/bug-view-187697.html +Change-Id: I72c1fb2e8f92a8d37f91f7ad2073081f74e5271b +--- + .../calendarDataManager/daccountmodule.cpp | 22 +++++++++---------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/calendar-service/src/calendarDataManager/daccountmodule.cpp b/calendar-service/src/calendarDataManager/daccountmodule.cpp +index 94968744..4c2492ac 100644 +--- a/calendar-service/src/calendarDataManager/daccountmodule.cpp ++++ b/calendar-service/src/calendarDataManager/daccountmodule.cpp +@@ -213,7 +213,7 @@ bool DAccountModule::deleteScheduleTypeByID(const QString &typeID) + m_accountDB->addUploadTask(uploadTask); + + //如果颜色不为系统类型则删除 +- if(scheduleType->typeColor().privilege() != DTypeColor::PriSystem){ ++ if (scheduleType->typeColor().privilege() != DTypeColor::PriSystem) { + m_accountDB->deleteTypeColor(scheduleType->typeColor().colorID()); + DUploadTaskData::Ptr uploadTask(new DUploadTaskData); + uploadTask->setTaskType(DUploadTaskData::TaskType::Delete); +@@ -226,7 +226,7 @@ bool DAccountModule::deleteScheduleTypeByID(const QString &typeID) + uploadNetWorkAccountData(); + } else { + m_accountDB->deleteScheduleTypeByID(typeID, 1); +- if(scheduleType->typeColor().privilege() != DTypeColor::PriSystem){ ++ if (scheduleType->typeColor().privilege() != DTypeColor::PriSystem) { + m_accountDB->deleteTypeColor(scheduleType->typeColor().colorID()); + } + } +@@ -540,7 +540,7 @@ void DAccountModule::updateRemindSchedules(bool isClear) + { + //因为全天的当前提醒日程会在开始时间延后9小时提醒 + QDateTime dtCurrent = QDateTime::currentDateTime(); +- QDateTime dtStart = dtCurrent.addSecs(-9*60*60); ++ QDateTime dtStart = dtCurrent.addSecs(-9 * 60 * 60); + QDateTime dtEnd = dtCurrent.addMSecs(UPDATEREMINDJOBTIMEINTERVAL); + + //获取未提醒的日程相关信息 +@@ -688,7 +688,7 @@ void DAccountModule::removeDB() + m_accountDB->removeDB(); + //如果为uid帐户退出则清空目录下所有关于uid的数据库文件 + //解决在某些条件下数据库没有被移除的问题（自测未发现） +- if(account()->accountType() == DAccount::Type::Account_UnionID){ ++ if (account()->accountType() == DAccount::Type::Account_UnionID) { + QString dbPatch = getHomeConfigPath().append(QString("/deepin/dde-calendar-service/")); + QDir dir(dbPatch); + if (dir.exists()) { +@@ -717,7 +717,7 @@ QMap DAccountModule::getScheduleTimesOn(const QDateTime + //获取日程的开始结束时间差 + qint64 interval = schedule->dtStart().secsTo(schedule->dtEnd()); + //如果存在重复日程 +- if (schedule->recurs()) { ++ if (schedule->recurs() && DSchedule::RRule_None != schedule->getRRuleType()) { + //如果为农历日程 + if (schedule->lunnar()) { + //农历重复日程计算 +@@ -763,8 +763,8 @@ QMap DAccountModule::getScheduleTimesOn(const QDateTime + //如果在查询时间范围内 + QDateTime queryDtStart = dtStart; + //如果日程为全天日程，则查询的开始时间设置为0点，因为全天日程的开始和结束时间都是0点 +- if(schedule->allDay()){ +- queryDtStart.setTime(QTime(0,0,0)); ++ if (schedule->allDay()) { ++ queryDtStart.setTime(QTime(0, 0, 0)); + } + if (!(schedule->dtEnd() < queryDtStart || schedule->dtStart() > dtEnd)) { + if (extend && schedule->isMultiDay()) { +@@ -772,7 +772,7 @@ QMap DAccountModule::getScheduleTimesOn(const QDateTime + int extenddays = static_cast(schedule->dtStart().daysTo(schedule->dtEnd())); + for (int i = 0; i <= extenddays; ++i) { + //如果扩展的日期在查询范围内则添加，否则退出 +- if(m_scheduleMap.contains(schedule->dtStart().date().addDays(i))){ ++ if (m_scheduleMap.contains(schedule->dtStart().date().addDays(i))) { + m_scheduleMap[schedule->dtStart().date().addDays(i)].append(schedule); + } else { + break; +@@ -816,8 +816,8 @@ void DAccountModule::extendRecurrence(DSchedule::Map &scheduleMap, const DSchedu + { + QDateTime queryDtStart = dtStart; + //如果日程为全天日程，则查询的开始时间设置为0点，因为全天日程的开始和结束时间都是0点 +- if(schedule->allDay()){ +- queryDtStart.setTime(QTime(0,0,0)); ++ if (schedule->allDay()) { ++ queryDtStart.setTime(QTime(0, 0, 0)); + } + if (schedule->recurs()) { + //获取日程的开始结束时间差 +@@ -960,7 +960,7 @@ void DAccountModule::slotSyncState(const int syncState) + m_account->setSyncState(DAccount::Sync_StorageFull); + break; + default: +- qWarning()<<"syncState:"<setSyncState(DAccount::Sync_ServerException); + break; +-- +2.20.1 + diff --git a/0001-fix-build-error.patch b/0001-fix-build-error.patch deleted file mode 100644 index e5a956e..0000000 --- a/0001-fix-build-error.patch +++ /dev/null @@ -1,26 +0,0 @@ -From bbbbe0a6f69f7ca4fba2275963fca948988feb2f Mon Sep 17 00:00:00 2001 -From: Super User -Date: Mon, 27 Mar 2023 14:14:37 +0800 -Subject: [PATCH] fix build error - ---- - tests/third-party_stub/stub.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/third-party_stub/stub.h b/tests/third-party_stub/stub.h -index 76d6606..79bf963 100644 ---- a/tests/third-party_stub/stub.h -+++ b/tests/third-party_stub/stub.h -@@ -16,6 +16,8 @@ - #include - //c++ - #include -+#include -+using namespace std; - - - #define ADDR(CLASS_NAME,MEMBER_NAME) (&CLASS_NAME::MEMBER_NAME) --- -2.39.1 - - diff --git a/0002-fix-1060-AE-RC1-DDE.patch b/0002-fix-1060-AE-RC1-DDE.patch new file mode 100644 index 0000000..e417a65 --- /dev/null +++ b/0002-fix-1060-AE-RC1-DDE.patch @@ -0,0 +1,45 @@ +From 488e2d821adb15ee9df65a9f1a2f9be35274c383 Mon Sep 17 00:00:00 2001 +From: zhangguofu +Date: Wed, 8 Mar 2023 10:32:19 +0800 +Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E3=80=901060=E3=80=91=E3=80=90AE?= + =?UTF-8?q?=E3=80=91=E3=80=90RC1=E3=80=91=E3=80=90=E5=85=A8=E5=B9=B3?= + =?UTF-8?q?=E5=8F=B0=E3=80=91=E3=80=90DDE=E3=80=91=E3=80=90=E6=96=B0?= + =?UTF-8?q?=E9=9C=80=E6=B1=82=E3=80=91=E3=80=90=E6=97=A5=E5=8E=86=E3=80=91?= + =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=8D=95=E5=A4=A9=E6=97=A5=E7=A8=8B=E5=A4=B1?= + =?UTF-8?q?=E8=B4=A5?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + 【1060】【AE】【RC1】【全平台】【DDE】【新需求】【日历】新建单天日程失败 + +Log: 【1060】【AE】【RC1】【全平台】【DDE】【新需求】【日历】新建单天日程失败 + +Bug: https://pms.uniontech.com/bug-view-187697.html +Change-Id: I32c838c5b466854465c9325ecf2fae1a1c2990d1 +--- + calendar-client/src/dialog/scheduledlg.cpp | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/calendar-client/src/dialog/scheduledlg.cpp b/calendar-client/src/dialog/scheduledlg.cpp +index 3bceafba..b2d349d9 100644 +--- a/calendar-client/src/dialog/scheduledlg.cpp ++++ b/calendar-client/src/dialog/scheduledlg.cpp +@@ -315,10 +315,11 @@ bool CScheduleDlg::createSchedule(const QString &scheduleTypeId) + } + schedule->recurrence()->setDuration(0); + schedule->recurrence()->setEndDateTime(endrpeattime); +- } else { ++ } /*else { ++ KCalendarCore中说明了不重复就不要setDuration，传入错误的值会导致各个版本libical解析器结果不同 + //永不 +- schedule->recurrence()->setDuration(-1); +- } ++// schedule->recurrence()->setDuration(-1); ++ }*/ + + CScheduleOperation _scheduleOperation(m_accountItem, this); + +-- +2.20.1 + diff --git a/dde-calendar-5.8.20.1.tar.gz b/dde-calendar-5.8.20.1.tar.gz deleted file mode 100644 index 62cc8a5..0000000 Binary files a/dde-calendar-5.8.20.1.tar.gz and /dev/null differ diff --git a/dde-calendar-5.9.14.tar.gz b/dde-calendar-5.9.14.tar.gz new file mode 100644 index 0000000..e8c3aae Binary files /dev/null and b/dde-calendar-5.9.14.tar.gz differ diff --git a/dde-calendar.spec b/dde-calendar.spec index 248f3cf..2a495c2 100644 --- a/dde-calendar.spec +++ b/dde-calendar.spec @@ -1,20 +1,15 @@ %define pkgrelease 1 -%if 0%{?openeuler} -%define specrelease %{pkgrelease} -%else -## allow specrelease to have configurable %%{?dist} tag in other distribution -%define specrelease %{pkgrelease}%{?dist} -%endif Name: dde-calendar -Version: 5.8.20.1 +Version: 5.9.14 -Release: %{specrelease} +Release: %{pkgrelease} Summary: Calendar is a smart daily planner to schedule all things in life License: GPLv3 URL: https://github.com/linuxdeepin/dde-calendarr -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: 0001-fix-build-error.patch +Source0: %{name}-%{version}.tar.gz +Patch0: 0001-fix-1060-AE-RC1-DDE.patch +Patch1: 0002-fix-1060-AE-RC1-DDE.patch BuildRequires: cmake BuildRequires: qt5-devel @@ -25,6 +20,7 @@ BuildRequires: dtkwidget-devel BuildRequires: pkgconfig(dframeworkdbus) BuildRequires: gtest-devel BuildRequires: gmock +BuildRequires: libical-devel %description %{summary}. @@ -35,9 +31,9 @@ BuildRequires: gmock %build export PATH=%{_qt5_bindir}:$PATH sed -i "s|^cmake_minimum_required.*|cmake_minimum_required(VERSION 3.0)|" $(find . -name "CMakeLists.txt") -mkdir build && pushd build +mkdir build && pushd build %cmake -DCMAKE_BUILD_TYPE=Release ../ -DAPP_VERSION=%{version} -DVERSION=%{version} -DCMAKE_SCHEDULE_PLUGIN_OFF="OFF" -%make_build +%make_build popd %install @@ -54,8 +50,13 @@ popd /etc/xdg/autostart/dde-calendar-service.desktop %{_datadir}/dde-calendar/data/* /usr/lib/deepin-daemon/dde-calendar-service +%{_prefix}/lib/deepin-aiassistant/serivce-plugins/libuosschedulex-plugin.so +%{_prefix}/lib/systemd/user/ %changelog +* Wed Aug 02 2023 leeffo - 5.9.14-1 +- upgrade to version 5.9.14 + * Mon Mar 27 2023 liweiganga - 5.8.20.1-1 - update: update to 5.8.20.1