diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-01-04 01:27:12 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-01-04 01:27:12 +0000 |
commit | 3517852e3b8a68d1e997770fc0650c5053bafc6c (patch) | |
tree | 44068672445b1418489aed82de58df3c470289e7 /kde-misc/zanshin/files | |
parent | 0f15659d48c193027158492acb726297501202c5 (diff) |
gentoo resync : 04.01.2022
Diffstat (limited to 'kde-misc/zanshin/files')
-rw-r--r-- | kde-misc/zanshin/files/zanshin-0.5.71-akonadi-20.07.80.patch | 24 | ||||
-rw-r--r-- | kde-misc/zanshin/files/zanshin-0.5.71-kontactinterface-20.07.80.patch | 58 |
2 files changed, 0 insertions, 82 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 59afdfad7762..000000000000 --- 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 <vkrause@kde.org> -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 a5b39bbe6756..000000000000 --- 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 <faure@kde.org> -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 - |