commit: 5085d41ca35d088026eb73ddb373e5656b9d94fb Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Aug 13 16:06:35 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Aug 13 16:06:35 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5085d41c
kde-misc/zanshin: Drop 0.5.71-r2, moved to Gentoo ebuild repo Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/zanshin-0.5.71-akonadi-20.07.80.patch | 24 -------- .../zanshin-0.5.71-kontactinterface-20.07.80.patch | 58 ------------------ kde-misc/zanshin/zanshin-0.5.71-r2.ebuild | 68 ---------------------- 3 files changed, 150 deletions(-) diff --git a/kde-misc/zanshin/files/zanshin-0.5.71-akonadi-20.07.80.patch b/kde-misc/zanshin/files/zanshin-0.5.71-akonadi-20.07.80.patch deleted file mode 100644 index 59afdfad77..0000000000 --- a/kde-misc/zanshin/files/zanshin-0.5.71-akonadi-20.07.80.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d37e34f78b3cb3ec5890ce22b0d15ad6e639f9be Mon Sep 17 00:00:00 2001 -From: Volker Krause <[email protected]> -Date: Sat, 20 Jun 2020 09:44:44 +0200 -Subject: [PATCH] Build against a recent Akonadi - ---- - tests/testlib/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/testlib/CMakeLists.txt b/tests/testlib/CMakeLists.txt -index 794ac2b2..9b786b77 100644 ---- a/tests/testlib/CMakeLists.txt -+++ b/tests/testlib/CMakeLists.txt -@@ -21,6 +21,7 @@ target_link_libraries(testlib - KF5::AkonadiCore - KF5::AkonadiXml - KF5::CalendarCore -+ Qt5::DBus - Qt5::Test - ) - --- -GitLab - diff --git a/kde-misc/zanshin/files/zanshin-0.5.71-kontactinterface-20.07.80.patch b/kde-misc/zanshin/files/zanshin-0.5.71-kontactinterface-20.07.80.patch deleted file mode 100644 index a5b39bbe67..0000000000 --- a/kde-misc/zanshin/files/zanshin-0.5.71-kontactinterface-20.07.80.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 4850c08998b33b37af99c3312d193b063b3e8174 Mon Sep 17 00:00:00 2001 -From: David Faure <[email protected]> -Date: Sat, 11 Apr 2020 17:36:25 +0200 -Subject: [PATCH] Port to kontactinterface >= 5.14.42, with ifdefs - ---- - src/zanshin/kontact/kontact_plugin.cpp | 7 +++++++ - src/zanshin/kontact/kontact_plugin.h | 5 +++++ - 2 files changed, 12 insertions(+) - -diff --git a/src/zanshin/kontact/kontact_plugin.cpp b/src/zanshin/kontact/kontact_plugin.cpp -index b03d9674..4b0d2f92 100644 ---- a/src/zanshin/kontact/kontact_plugin.cpp -+++ b/src/zanshin/kontact/kontact_plugin.cpp -@@ -33,9 +33,16 @@ Plugin::Plugin(KontactInterface::Core *core, const QVariantList&) - setComponentName(QStringLiteral("zanshin"), QStringLiteral("zanshin")); - } - -+#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 14, 42) -+KParts::Part *Plugin::createPart() -+{ -+ return loadPart(); -+} -+#else - KParts::ReadOnlyPart *Plugin::createPart() - { - return loadPart(); - } -+#endif - - #include "kontact_plugin.moc" -diff --git a/src/zanshin/kontact/kontact_plugin.h b/src/zanshin/kontact/kontact_plugin.h -index 0d45564e..a270ba16 100644 ---- a/src/zanshin/kontact/kontact_plugin.h -+++ b/src/zanshin/kontact/kontact_plugin.h -@@ -25,6 +25,7 @@ - #define ZANSHIN_KONTACT_PLUGIN_H - - #include <KontactInterface/Plugin> -+#include <kontactinterface_version.h> - - class Plugin : public KontactInterface::Plugin - { -@@ -36,7 +37,11 @@ public: - int weight() const override { return 449; } - - protected: -+#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 14, 42) -+ KParts::Part *createPart() override; -+#else - KParts::ReadOnlyPart *createPart() override; -+#endif - }; - - #endif --- -GitLab - diff --git a/kde-misc/zanshin/zanshin-0.5.71-r2.ebuild b/kde-misc/zanshin/zanshin-0.5.71-r2.ebuild deleted file mode 100644 index e85b0dab6b..0000000000 --- a/kde-misc/zanshin/zanshin-0.5.71-r2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="forceoptional" -KDE_APPS_MINIMAL=20.07.80 -KFMIN=5.60.0 -QTMIN=5.12.3 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Getting things done application by KDE" -HOMEPAGE="https://zanshin.kde.org/ https://userbase.kde.org/Zanshin -https://kde.org/applications/utilities/org.kde.zanshin"; - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="5" -IUSE="" - -BDEPEND=" - test? ( >=kde-apps/akonadi-${KDE_APPS_MINIMAL}:5[tools] ) -" -COMMON_DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-apps/akonadi-${KDE_APPS_MINIMAL}:5 - >=kde-apps/akonadi-calendar-${KDE_APPS_MINIMAL}:5 - >=kde-apps/akonadi-contacts-${KDE_APPS_MINIMAL}:5 - >=kde-apps/kmime-${KDE_APPS_MINIMAL}:5 - >=kde-apps/kontactinterface-${KDE_APPS_MINIMAL}:5 - >=kde-frameworks/kcalendarcore-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcontacts-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost -" -RDEPEND="${COMMON_DEPEND} - !kde-misc/zanshin:4 - >=kde-apps/kdepim-runtime-${KDE_APPS_MINIMAL}:5 -" - -PATCHES=( - "${FILESDIR}/${P}-kontactinterface-20.07.80.patch" - "${FILESDIR}/${P}-akonadi-20.07.80.patch" -)
