[neon/extras/zanshin/Neon/release] debian/patches: add patch from branch

[Jonathan Riddell]

Git commit 86b8064b2c27103e2918238d0f52bcadd1ef2194 by Jonathan Riddell.
Committed on 09/11/2020 at 13:59.
Pushed by jriddell into branch 'Neon/release'.

add patch from branch

A  +51   -0    debian/patches/kontactinterface-5.14.42.diff

https://invent.kde.org/neon/extras/zanshin/commit/86b8064b2c27103e2918238d0f52bcadd1ef2194

diff --git a/debian/patches/kontactinterface-5.14.42.diff b/debian/patches/kontactinterface-5.14.42.diff
new file mode 100644
index 0000000..673b870
--- /dev/null
+++ b/debian/patches/kontactinterface-5.14.42.diff
@@ -0,0 +1,51 @@
+commit 4850c08998b33b37af99c3312d193b063b3e8174
+Author: David Faure <faure at kde.org>
+Date:   Sat Apr 11 17:36:25 2020 +0200
+
+    Port to kontactinterface >= 5.14.42, with ifdefs
+
+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