diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-10-13 23:05:28 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-10-13 23:13:29 +0200 |
| commit | bde0ef6d982dd6b7c0c577b4a69f283cb45e7978 (patch) | |
| tree | c9f89c8f3aa508fee747fc3f23322824988967f2 /app-office/calligraplan | |
| parent | app-antivirus/clamav: version bump (diff) | |
| download | gentoo-bde0ef6d982dd6b7c0c577b4a69f283cb45e7978.tar.gz gentoo-bde0ef6d982dd6b7c0c577b4a69f283cb45e7978.tar.bz2 gentoo-bde0ef6d982dd6b7c0c577b4a69f283cb45e7978.zip | |
app-office/calligraplan: Drop obsolete patch to fix USE=pim
After kcalendarcore was fixed properly in upstream
commit 28eab632238352ab46f6c1db11f6ebf7d3ce0690, this patch is superfluous
and apparently breaks build with first release as a Framework in 5.63.
Cleanup dependencies at the same time; with a minimum >=19.08.0, there is
no more kde-apps/kcalcore to satisfy this package.
Closes: https://bugs.gentoo.org/697660
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-office/calligraplan')
| -rw-r--r-- | app-office/calligraplan/calligraplan-3.1.0-r3.ebuild | 12 | ||||
| -rw-r--r-- | app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-3.patch | 33 |
2 files changed, 3 insertions, 42 deletions
diff --git a/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild b/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild index ec094bc71c2c..2f0f38c3d9f9 100644 --- a/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild +++ b/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild @@ -60,14 +60,8 @@ DEPEND=" app-crypt/qca:2[qt5(+)] ) pim? ( - || ( - $(add_frameworks_dep kcalendarcore) - $(add_kdeapps_dep kcalcore) - ) - || ( - $(add_frameworks_dep kcontacts) - $(add_kdeapps_dep kcontacts) - ) + $(add_frameworks_dep kcalendarcore) + $(add_frameworks_dep kcontacts) ) X? ( $(add_qt_dep qtx11extras) @@ -87,7 +81,7 @@ PATCHES=( "${FILESDIR}"/${P}-qca.patch "${FILESDIR}"/${P}-missing-header.patch "${FILESDIR}"/${P}-unused-deps.patch - "${FILESDIR}"/${P}-kcalcore-19.08-{1,2,3}.patch + "${FILESDIR}"/${P}-kcalcore-19.08-{1,2}.patch ) src_configure() { diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-3.patch b/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-3.patch deleted file mode 100644 index 14cc70ab1c8e..000000000000 --- a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-3.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2f5505cf03ff865349d06e1d5c39007c52e7cd10 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Fri, 16 Aug 2019 15:49:09 +0200 -Subject: [PATCH] Fix headers after kcalcore->kcalendercore rename happened - ---- - .../filters/icalendar/export/icalendarexport.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/plugins/filters/icalendar/export/icalendarexport.cpp b/src/plugins/filters/icalendar/export/icalendarexport.cpp -index bb6b097d..729d6e50 100644 ---- a/src/plugins/filters/icalendar/export/icalendarexport.cpp -+++ b/src/plugins/filters/icalendar/export/icalendarexport.cpp -@@ -31,11 +31,11 @@ - #include <kptdocuments.h> - #include "kptdebug.h" - --#include <kcalcore/attendee.h> --#include <kcalcore/attachment.h> --#include <kcalcore/icalformat.h> --#include <kcalcore/memorycalendar.h> --#include <kcalcore_version.h> -+#include <kcalendarcore/attendee.h> -+#include <kcalendarcore/attachment.h> -+#include <kcalendarcore/icalformat.h> -+#include <kcalendarcore/memorycalendar.h> -+#include <kcalendarcore_version.h> - - #include <QTextCodec> - #include <QByteArray> --- -2.22.1 - |