update version to 5.8.10

(cherry picked from commit 13d2693d9971fcd0be4c53ba5543912c21581eb2)

dde-calendar.spec

@@ -1,40 +1,42 @@
+%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.7.0.5
-Release:        2
-Summary:        Calendar for Deepin Desktop Environment
-License:        GPLv3+
-URL:            https://github.com/linuxdeepin/%{name}
+Version:        5.8.10
+
+Release:        %{specrelease}
+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:         modify-QPainterPath-error.patch
 
-Provides:      deepin-calendar
-Obsoletes:     deepin-calendar
-
-BuildRequires: gcc-c++
 BuildRequires: cmake
 BuildRequires: qt5-devel
 BuildRequires: qt5-qtbase-private-devel
-
-BuildRequires: dtkcore-devel
+BuildRequires: dtkgui-devel
 BuildRequires: dtkwidget-devel
-BuildRequires: pkgconfig(dtkgui)
+BuildRequires: deepin-gettext-tools
 BuildRequires: pkgconfig(dframeworkdbus)
+BuildRequires: gtest-devel
+BuildRequires: gmock
 
 %description
 %{summary}.
 
 %prep
-%autosetup -p1
+%autosetup
 
 %build
-# help find (and prefer) qt5 utilities, e.g. qmake, lrelease
 export PATH=%{_qt5_bindir}:$PATH
-# cmake_minimum_required version is too high
 sed -i "s|^cmake_minimum_required.*|cmake_minimum_required(VERSION 3.0)|" $(find . -name "CMakeLists.txt")
-mkdir build && pushd build
-%cmake ../ -DCMAKE_BUILD_TYPE=Release -DAPP_VERSION=%{version} -DVERSION=%{version}
-
-%make_build
+mkdir build && pushd build 
+%cmake -DCMAKE_BUILD_TYPE=Release ../  -DAPP_VERSION=%{version} -DVERSION=%{version} 
+%make_build  
 popd
 
 %install
@@ -44,11 +46,18 @@ popd
 %doc README.md
 %license LICENSE
 %{_bindir}/%{name}
-%{_datadir}/%{name}/translations/*.qm
-%{_datadir}/dbus-1/services/com.deepin.Calendar.service
 %{_datadir}/applications/%{name}.desktop
+%{_datadir}/%{name}/translations/*.qm
+%{_datadir}/deepin-manual/manual-assets/application/dde-calendar/calendar/*
+%{_datadir}/dbus-1/services/*.service
+/etc/xdg/autostart/dde-calendar-service.desktop
+%{_datadir}/dde-calendar/data/*
+/usr/lib/deepin-daemon/dde-calendar-service
 
 %changelog
+* Mon Jul 18 2022 konglidong <konglidong@uniontech.com> - 5.8.10-1
+- update to 5.8.10
+
 * Tue Feb 08 2022 liweigang <liweiganga@uniontech.com> - 5.7.0.5-2
 - fix build error
 

modify-QPainterPath-error.patch

@@ -1,93 +0,0 @@
-diff --color -Naur a/src/customframe.cpp b/src/customframe.cpp
---- a/src/customframe.cpp	2022-02-08 10:03:17.506623669 +0800
-+++ b/src/customframe.cpp	2022-02-08 10:04:29.230201125 +0800
-@@ -20,6 +20,7 @@
- */
- #include "customframe.h"
- #include <QPainter>
-+#include <QPainterPath>
- #include <DPalette>
- #include <QFontMetrics>
- DGUI_USE_NAMESPACE
-diff --color -Naur a/src/daymonthview.cpp b/src/daymonthview.cpp
---- a/src/daymonthview.cpp	2022-02-08 10:03:17.506623669 +0800
-+++ b/src/daymonthview.cpp	2022-02-08 10:41:36.506917338 +0800
-@@ -22,11 +22,14 @@
- #include <QGridLayout>
- #include <QLabel>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QEvent>
- #include <QDebug>
- #include <QMessageBox>
-+#include <QMouseEvent>
- #include <QTime>
- #include <QQueue>
-+#include <QWheelEvent>
- #include "daymonthview.h"
- #include <QSpacerItem>
- #include "constants.h"
-diff --color -Naur a/src/draginfographicsview.cpp b/src/draginfographicsview.cpp
---- a/src/draginfographicsview.cpp	2022-02-08 10:03:17.510623644 +0800
-+++ b/src/draginfographicsview.cpp	2022-02-08 10:40:00.823335148 +0800
-@@ -20,11 +20,18 @@
- */
- #include "draginfographicsview.h"
- 
--#include <DMenu>
-+#include <QContextMenuEvent>
-+#include <QDragEnterEvent>
-+#include <QDragMoveEvent>
-+#include <QDropEvent>
-+#include <QKeyEvent>
-+#include <QMenu>
- #include <QMimeData>
-+#include <QMouseEvent>
- #include <QJsonParseError>
- #include <QJsonDocument>
- #include <QJsonObject>
-+#include <QPainterPath>
- 
- #include "schceduledlg.h"
- #include "schcedulectrldlg.h"
-diff --color -Naur a/src/schcedulesearchview.cpp b/src/schcedulesearchview.cpp
---- a/src/schcedulesearchview.cpp	2022-02-08 10:03:17.510623644 +0800
-+++ b/src/schcedulesearchview.cpp	2022-02-08 10:40:22.971233347 +0800
-@@ -19,9 +19,11 @@
- #include "schcedulesearchview.h"
- #include <QAction>
- #include <QMenu>
-+#include <QMouseEvent>
- #include <QListWidget>
- #include <QLabel>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QHBoxLayout>
- #include <QStylePainter>
- #include <QRect>
-diff --color -Naur a/src/weekheadview.cpp b/src/weekheadview.cpp
---- a/src/weekheadview.cpp	2022-02-08 10:03:17.514623618 +0800
-+++ b/src/weekheadview.cpp	2022-02-08 10:05:16.469959814 +0800
-@@ -22,6 +22,7 @@
- 
- #include <QHBoxLayout>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QEvent>
- #include <QDebug>
- #include <QMessageBox>
-diff --color -Naur a/src/yearwindow.cpp b/src/yearwindow.cpp
---- a/src/yearwindow.cpp	2022-02-08 10:03:17.514623618 +0800
-+++ b/src/yearwindow.cpp	2022-02-08 10:42:12.606773558 +0800
-@@ -21,9 +21,11 @@
- #include "constants.h"
- #include "calendardbus.h"
- #include <QMessageBox>
-+#include <QPainterPath>
- #include <DPalette>
- #include <DHiDPIHelper>
- #include <QMenuBar>
-+#include <QWheelEvent>
- #include "schcedulesearchview.h"
- DGUI_USE_NAMESPACE
- CYearWindow::CYearWindow(QWidget *parent): QMainWindow (parent)