diff --git a/.gitignore b/.gitignore index 377286f..1788f95 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /dde-calendar-1.2.5.tar.gz /dde-calendar-1.2.6.tar.gz /dde-calendar-5.0.1.tar.gz +/dde-calendar-5.7.0.18.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..19725ca --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,18 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +specfile_path: rpm/deepin-calendar.spec + +# add or remove files that should be synced +synced_files: + - rpm/deepin-calendar.spec + - .packit.yaml + +upstream_ref: 5.7.0.18 +upstream_package_name: dde-calendar +# downstream (Fedora) RPM package name +downstream_package_name: deepin-calendar + +actions: + fix-spec-file: | + bash -c "sed -i -r \"s/Version:(\s*)\S*/Version:\1${PACKIT_PROJECT_VERSION}/\" rpm/deepin-calendar.spec" diff --git a/0001-fix-qt.patch b/0001-fix-qt.patch new file mode 100644 index 0000000..f282f7d --- /dev/null +++ b/0001-fix-qt.patch @@ -0,0 +1,274 @@ +From 3e13b5715ac50347ca9e8a5d71c9a09dd253a542 Mon Sep 17 00:00:00 2001 +From: chenhaifeng +Date: Fri, 18 Sep 2020 17:31:44 +0800 +Subject: [PATCH 1/2] =?UTF-8?q?fix:=20qt=E9=AB=98=E7=89=88=E6=9C=AC?= + =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=BC=96=E8=AF=91?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +添加必要头文件 + +Log: qt高版本无法编译 + +link: +Change-Id: Ibd98f8d6c31b8d5d16720ca2f3133833e536c582 +Reviewed-on: http://gerrit.uniontech.com/c/nanjing/dde-calendar/+/5529 +Reviewed-by: cuizhen +Reviewed-by: +Reviewed-by: luzhou +Tested-by: +--- + src/customWidget/customframe.cpp | 1 + + src/customWidget/scheduleview.cpp | 1 + + src/customWidget/todybutton.cpp | 1 + + src/dialog/schceduledlg.cpp | 1 + + src/view/alldayeventview.cpp | 1 + + src/view/draginfographicsview.cpp | 7 +++++++ + src/view/graphicsview.cpp | 1 + + src/view/monthgraphiview.cpp | 3 +++ + src/widget/calendarmainwindow.cpp | 1 + + src/widget/dayWidget/daymonthview.cpp | 3 +++ + src/widget/monthWidget/monthview.cpp | 1 + + src/widget/monthWidget/monthwindow.cpp | 1 + + src/widget/schcedulesearchview.cpp | 3 +++ + src/widget/weekWidget/weekheadview.cpp | 2 ++ + src/widget/weekWidget/weekview.cpp | 1 + + src/widget/yearWidget/yearschceduleview.cpp | 1 + + src/widget/yearWidget/yearview.cpp | 1 + + src/widget/yearWidget/yearwindow.cpp | 2 ++ + 18 files changed, 32 insertions(+) + +diff --git a/src/customWidget/customframe.cpp b/src/customWidget/customframe.cpp +index eb049d0..af68a7c 100644 +--- a/src/customWidget/customframe.cpp ++++ b/src/customWidget/customframe.cpp +@@ -25,6 +25,7 @@ + + #include + #include ++#include + + DGUI_USE_NAMESPACE + CustomFrame::CustomFrame(QWidget *parent) +diff --git a/src/customWidget/scheduleview.cpp b/src/customWidget/scheduleview.cpp +index 57000b1..28118dd 100644 +--- a/src/customWidget/scheduleview.cpp ++++ b/src/customWidget/scheduleview.cpp +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + DGUI_USE_NAMESPACE + +diff --git a/src/customWidget/todybutton.cpp b/src/customWidget/todybutton.cpp +index b5c86c9..03e6641 100644 +--- a/src/customWidget/todybutton.cpp ++++ b/src/customWidget/todybutton.cpp +@@ -24,6 +24,7 @@ + #include + + #include ++#include + + DGUI_USE_NAMESPACE + CTodyButton::CTodyButton(QWidget *parent) +diff --git a/src/dialog/schceduledlg.cpp b/src/dialog/schceduledlg.cpp +index 3be2635..f5e808f 100644 +--- a/src/dialog/schceduledlg.cpp ++++ b/src/dialog/schceduledlg.cpp +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + DGUI_USE_NAMESPACE + CSchceduleDlg::CSchceduleDlg(int type, QWidget *parent, const bool isAllDay) +diff --git a/src/view/alldayeventview.cpp b/src/view/alldayeventview.cpp +index cb50f7f..6f2f6ff 100644 +--- a/src/view/alldayeventview.cpp ++++ b/src/view/alldayeventview.cpp +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + + DGUI_USE_NAMESPACE + +diff --git a/src/view/draginfographicsview.cpp b/src/view/draginfographicsview.cpp +index de125e9..f4d5ea9 100644 +--- a/src/view/draginfographicsview.cpp ++++ b/src/view/draginfographicsview.cpp +@@ -30,6 +30,13 @@ + #include + #include + #include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + + DragInfoGraphicsView::DragInfoGraphicsView(DWidget *parent) + : DGraphicsView(parent) +diff --git a/src/view/graphicsview.cpp b/src/view/graphicsview.cpp +index 25189c5..b48cedb 100644 +--- a/src/view/graphicsview.cpp ++++ b/src/view/graphicsview.cpp +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + + DGUI_USE_NAMESPACE + CGraphicsView::CGraphicsView(QWidget *parent, int viewType) +diff --git a/src/view/monthgraphiview.cpp b/src/view/monthgraphiview.cpp +index b5e856f..eaa2477 100644 +--- a/src/view/monthgraphiview.cpp ++++ b/src/view/monthgraphiview.cpp +@@ -30,6 +30,9 @@ + #include + #include + #include ++#include ++#include ++#include + + bool CDayGraphicsItem::m_LunarVisible = false; + +diff --git a/src/widget/calendarmainwindow.cpp b/src/widget/calendarmainwindow.cpp +index 7a2ecd2..ea4ae68 100644 +--- a/src/widget/calendarmainwindow.cpp ++++ b/src/widget/calendarmainwindow.cpp +@@ -50,6 +50,7 @@ + #include + #include + #include ++#include + + #include + +diff --git a/src/widget/dayWidget/daymonthview.cpp b/src/widget/dayWidget/daymonthview.cpp +index faf16a6..18ddf29 100644 +--- a/src/widget/dayWidget/daymonthview.cpp ++++ b/src/widget/dayWidget/daymonthview.cpp +@@ -37,6 +37,9 @@ + #include + #include + #include ++#include ++#include ++#include + + DGUI_USE_NAMESPACE + CDayMonthView::CDayMonthView(QWidget *parent) +diff --git a/src/widget/monthWidget/monthview.cpp b/src/widget/monthWidget/monthview.cpp +index cd53427..717f026 100644 +--- a/src/widget/monthWidget/monthview.cpp ++++ b/src/widget/monthWidget/monthview.cpp +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + DGUI_USE_NAMESPACE + void CMonthView::setTheMe(int type) +diff --git a/src/widget/monthWidget/monthwindow.cpp b/src/widget/monthWidget/monthwindow.cpp +index 281e0da..b7d0e22 100644 +--- a/src/widget/monthWidget/monthwindow.cpp ++++ b/src/widget/monthWidget/monthwindow.cpp +@@ -29,6 +29,7 @@ + + #include + #include ++#include + + DGUI_USE_NAMESPACE + CMonthWindow::CMonthWindow(QWidget *parent) +diff --git a/src/widget/schcedulesearchview.cpp b/src/widget/schcedulesearchview.cpp +index ad86edf..93b6fd9 100644 +--- a/src/widget/schcedulesearchview.cpp ++++ b/src/widget/schcedulesearchview.cpp +@@ -37,6 +37,9 @@ + #include + #include + #include ++#include ++#include ++#include + + DGUI_USE_NAMESPACE + CSchceduleSearchItem::CSchceduleSearchItem(QWidget *parent) +diff --git a/src/widget/weekWidget/weekheadview.cpp b/src/widget/weekWidget/weekheadview.cpp +index b7766c9..68d4622 100644 +--- a/src/widget/weekWidget/weekheadview.cpp ++++ b/src/widget/weekWidget/weekheadview.cpp +@@ -33,6 +33,8 @@ + #include + #include + #include ++#include ++#include + + DGUI_USE_NAMESPACE + CWeekHeadView::CWeekHeadView(QWidget *parent) +diff --git a/src/widget/weekWidget/weekview.cpp b/src/widget/weekWidget/weekview.cpp +index 3956978..3b54cbe 100644 +--- a/src/widget/weekWidget/weekview.cpp ++++ b/src/widget/weekWidget/weekview.cpp +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + DWIDGET_USE_NAMESPACE + +diff --git a/src/widget/yearWidget/yearschceduleview.cpp b/src/widget/yearWidget/yearschceduleview.cpp +index b50c7d8..3c90a3c 100644 +--- a/src/widget/yearWidget/yearschceduleview.cpp ++++ b/src/widget/yearWidget/yearschceduleview.cpp +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + DGUI_USE_NAMESPACE + +diff --git a/src/widget/yearWidget/yearview.cpp b/src/widget/yearWidget/yearview.cpp +index 86061ab..8468d5d 100644 +--- a/src/widget/yearWidget/yearview.cpp ++++ b/src/widget/yearWidget/yearview.cpp +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + + DGUI_USE_NAMESPACE + CYearSchceduleOutView *CYearView::m_Scheduleview = nullptr; +diff --git a/src/widget/yearWidget/yearwindow.cpp b/src/widget/yearWidget/yearwindow.cpp +index c8b7128..aad8e01 100644 +--- a/src/widget/yearWidget/yearwindow.cpp ++++ b/src/widget/yearWidget/yearwindow.cpp +@@ -27,6 +27,8 @@ + + #include + #include ++#include ++#include + + DGUI_USE_NAMESPACE + CYearWindow::CYearWindow(QWidget *parent) +-- +2.26.2 + diff --git a/0002-Update-to-5.7.0.18.patch b/0002-Update-to-5.7.0.18.patch new file mode 100644 index 0000000..318f1b9 --- /dev/null +++ b/0002-Update-to-5.7.0.18.patch @@ -0,0 +1,50 @@ +From 28c8e88a96af45a98eaa21d1756e31cd8c60126b Mon Sep 17 00:00:00 2001 +From: Robin Lee +Date: Thu, 12 Nov 2020 11:41:22 +0800 +Subject: [PATCH 2/2] Update to 5.7.0.18 + +--- + schedule-plugin/src/widget/itemwidget.cpp | 1 + + schedule-plugin/src/widget/modifyscheduleitem.h | 1 + + schedule-plugin/src/widget/scheduleitemwidget.h | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/schedule-plugin/src/widget/itemwidget.cpp b/schedule-plugin/src/widget/itemwidget.cpp +index e3628d3..1f2171a 100644 +--- a/schedule-plugin/src/widget/itemwidget.cpp ++++ b/schedule-plugin/src/widget/itemwidget.cpp +@@ -21,6 +21,7 @@ + #include "itemwidget.h" + + #include ++#include + + ItemWidget::ItemWidget(QWidget *parent) + : DWidget(parent) +diff --git a/schedule-plugin/src/widget/modifyscheduleitem.h b/schedule-plugin/src/widget/modifyscheduleitem.h +index 042fea6..bc1087c 100644 +--- a/schedule-plugin/src/widget/modifyscheduleitem.h ++++ b/schedule-plugin/src/widget/modifyscheduleitem.h +@@ -22,6 +22,7 @@ + #define MODIFYSCHEDULEITEM_H + + #include "itemwidget.h" ++#include + + class modifyScheduleItem : public ItemWidget + { +diff --git a/schedule-plugin/src/widget/scheduleitemwidget.h b/schedule-plugin/src/widget/scheduleitemwidget.h +index c2137ad..5ee9c58 100644 +--- a/schedule-plugin/src/widget/scheduleitemwidget.h ++++ b/schedule-plugin/src/widget/scheduleitemwidget.h +@@ -5,6 +5,7 @@ + #include "../data/schedulestructs.h" + #include "../data/schedulecolourmanage.h" + #include ++#include + + class scheduleitemdate; + class scheduleitem; +-- +2.26.2 + diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..0b7be24 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.18.0. diff --git a/deepin-calendar.spec b/deepin-calendar.spec index 4303fb2..e65583f 100644 --- a/deepin-calendar.spec +++ b/deepin-calendar.spec @@ -1,38 +1,55 @@ %global repo dde-calendar Name: deepin-calendar -Version: 5.0.1 -Release: 4%{?dist} +Version: 5.7.0.18 +Release: 1%{?dist} Summary: Calendar for Deepin Desktop Environment License: GPLv3+ URL: https://github.com/linuxdeepin/dde-calendar Source0: %{url}/archive/%{version}/%{repo}-%{version}.tar.gz +# PATCHES FROM SOURCE GIT: + +# fix: qt高版本无法编译 +# Author: chenhaifeng +Patch0001: 0001-fix-qt.patch + +# Update to 5.7.0.18 +# Author: Robin Lee +Patch0002: 0002-Update-to-5.7.0.18.patch + + +BuildRequires: cmake BuildRequires: deepin-gettext-tools BuildRequires: desktop-file-utils BuildRequires: qt5-linguist BuildRequires: pkgconfig(dtkwidget) >= 2.0 +BuildRequires: pkgconfig(dframeworkdbus) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: cmake +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Multimedia) +BuildRequires: pkgconfig(Qt5X11Extras) Requires: hicolor-icon-theme %description Calendar for Deepin Desktop Environment. %prep -%setup -q -n %{repo}-%{version} +%autosetup -p1 -n %{repo}-%{version} +sed -i "s:/usr/lib:%{_libdir}:" schedule-plugin/CMakeLists.txt %build # help find (and prefer) qt5 utilities, e.g. qmake, lrelease export PATH=%{_qt5_bindir}:$PATH -%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE=Release +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo %cmake_build %install %cmake_install +install -m 644 -D assets/resources/icon/dde-calendar.svg ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/scalable/apps/%{repo}.svg %check desktop-file-validate %{buildroot}%{_datadir}/applications/%{repo}.desktop @@ -45,8 +62,12 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{repo}.desktop %{_datadir}/dbus-1/services/com.deepin.Calendar.service %{_datadir}/applications/%{repo}.desktop %{_datadir}/icons/hicolor/scalable/apps/%{repo}.svg +%{_libdir}/deepin-aiassistant %changelog +* Thu Nov 12 2020 Robin Lee - 5.7.0.18-1 +- new upstream release: 5.7.0.18 + * Fri Aug 7 2020 Robin Lee - 5.0.1-4 - Improve compatibility with new CMake macro diff --git a/sources b/sources index c35ae45..8815ee5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dde-calendar-5.0.1.tar.gz) = ab52c39f53cd7e5b81a62925ce8ca624a3def5d42537cde743ee401d91d408cfb962801a4f6847c7eff0fae148e635a98aa15c5cd2305c993ae1f4d8048ecc75 +SHA512 (dde-calendar-5.7.0.18.tar.gz) = c59fd2399317309d1da14bb3b6d9f2a3a74d3143fa2e1d3d40107a42bbbbf752a7195a1e6fdbc9349cddc9a10af121811582a456344361957c24102c0a825dc8