From 5058babb4907e53d9a06121ec6bedcf9f0a0c38e Mon Sep 17 00:00:00 2001 From: John Date: Sat, 16 Nov 2019 02:48:16 +0100 Subject: [PATCH] calligra-plan: update to 3.2.0. --- .../patches/missing-includes.patch | 103 ------------------ srcpkgs/calligra-plan/template | 6 +- srcpkgs/calligra-plan/update | 3 +- 3 files changed, 4 insertions(+), 108 deletions(-) delete mode 100644 srcpkgs/calligra-plan/patches/missing-includes.patch diff --git a/srcpkgs/calligra-plan/patches/missing-includes.patch b/srcpkgs/calligra-plan/patches/missing-includes.patch deleted file mode 100644 index efb4183edfe..00000000000 --- a/srcpkgs/calligra-plan/patches/missing-includes.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- src/kptview.h -+++ src/kptview.h -@@ -30,6 +30,7 @@ - - #include - #include -+#include - - #include - #include ---- src/kptviewlist.cpp -+++ src/kptviewlist.cpp -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #include - #include ---- src/libs/ui/kptaccountseditor.cpp -+++ src/libs/ui/kptaccountseditor.cpp -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - #include - #include ---- src/libs/ui/kptdocumentspanel.h -+++ src/libs/ui/kptdocumentspanel.h -@@ -27,6 +27,7 @@ - #include "kptdocuments.h" - - #include -+#include - #include - - class QModelIndex; ---- src/libs/ui/kptitemviewsettup.cpp -+++ src/libs/ui/kptitemviewsettup.cpp -@@ -26,7 +26,7 @@ - #include "KoPageLayoutWidget.h" - - #include -- -+#include - - namespace KPlato - { ---- src/libs/ui/kpttaskeditor.cpp -+++ src/libs/ui/kpttaskeditor.cpp -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include - - #include - #include ---- src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp -+++ src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp -@@ -44,6 +44,7 @@ - #include - #include - #include -+#include - - namespace KPlato - { ---- src/libs/widgets/KoPageLayoutWidget.h -+++ src/libs/widgets/KoPageLayoutWidget.h -@@ -25,6 +25,7 @@ - //#include - #include - #include -+#include - - class KoUnit; - -From fe36bf6f0dc1f0c1e927850dd78093cfe3b7aae2 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Sun, 28 Jul 2019 00:07:33 +0200 -Subject: [PATCH] Fix compile on CI - -src/workpackage/view.h:148:31: error: field m_scheduleActions has incomplete type QMap ---- - src/workpackage/view.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/workpackage/view.h b/src/workpackage/view.h -index 6cae32b7..cd2fc4ea 100644 ---- src/workpackage/view.h -+++ src/workpackage/view.h -@@ -24,6 +24,7 @@ - - #include - -+#include - #include - - class QPrinter; diff --git a/srcpkgs/calligra-plan/template b/srcpkgs/calligra-plan/template index a39e482f1b6..0f40643c669 100644 --- a/srcpkgs/calligra-plan/template +++ b/srcpkgs/calligra-plan/template @@ -1,7 +1,7 @@ # Template file for 'calligra-plan' pkgname=calligra-plan -version=3.1.0 -revision=4 +version=3.2.0 +revision=1 wrksrc="${pkgname/-/}-${version}" build_style=cmake hostmakedepends="extra-cmake-modules kdoctools" @@ -13,7 +13,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later" homepage="https://www.calligra.org/plan/" distfiles="${KDE_SITE}/calligra/${version}/calligraplan-${version}.tar.xz" -checksum=59f985bae0482789c13c9440af3bf5da0a1d04756c1c1ccf39f68f66cd3e7ddd +checksum=a12995a129b3c13cd8a12e8efe17a27be86bc42afefc5cb2c62d6797ed4301ce if [ "$CROSS_BUILD" ];then hostmakedepends+=" qt5-qmake qt5-host-tools python3 perl diff --git a/srcpkgs/calligra-plan/update b/srcpkgs/calligra-plan/update index 1a61eaabdf9..70aa3f51c18 100644 --- a/srcpkgs/calligra-plan/update +++ b/srcpkgs/calligra-plan/update @@ -1,2 +1 @@ -site="https://download.kde.org/stable/calligra/" -pattern='href="\K[\d\.]+(?=/")' +pkgname=calligraplan