diff options
author | Tobias C. Berner <tcberner@FreeBSD.org> | 2020-08-16 08:52:03 +0000 |
---|---|---|
committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2020-08-16 08:52:03 +0000 |
commit | a7ddf7db79c84fa7f668e35e18f21f572ad6d16e (patch) | |
tree | ac23995bd29d023eb98d29e3e46b856c4fabecfc /deskutils/zanshin | |
parent | b2992449523c4942b0fdaa3210bd3d192e7d066d (diff) | |
download | ports-a7ddf7db79c84fa7f668e35e18f21f572ad6d16e.tar.gz ports-a7ddf7db79c84fa7f668e35e18f21f572ad6d16e.zip |
Notes
Diffstat (limited to 'deskutils/zanshin')
-rw-r--r-- | deskutils/zanshin/files/patch-git_4850c0 | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/deskutils/zanshin/files/patch-git_4850c0 b/deskutils/zanshin/files/patch-git_4850c0 new file mode 100644 index 000000000000..30b747f6e58c --- /dev/null +++ b/deskutils/zanshin/files/patch-git_4850c0 @@ -0,0 +1,61 @@ +https://invent.kde.org/pim/zanshin/-/commit/4850c08998b33b37af99c3312d193b063b3e8174.patch + +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 +--- src/zanshin/kontact/kontact_plugin.cpp ++++ 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 +--- src/zanshin/kontact/kontact_plugin.h ++++ 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 + + |