[neon/extras/zanshin/Neon/stable] debian/patches: Revert "add patch from branch"

[Jonathan Riddell]

Git commit 7ab4aa2d4240e1cfc981b522ab937aee2361c218 by Jonathan Riddell.
Committed on 09/11/2020 at 14:00.
Pushed by jriddell into branch 'Neon/stable'.

Revert "add patch from branch"

This reverts commit 86b8064b2c27103e2918238d0f52bcadd1ef2194.

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

https://invent.kde.org/neon/extras/zanshin/commit/7ab4aa2d4240e1cfc981b522ab937aee2361c218

diff --git a/debian/patches/kontactinterface-5.14.42.diff b/debian/patches/kontactinterface-5.14.42.diff
deleted file mode 100644
index 673b870..0000000
--- a/debian/patches/kontactinterface-5.14.42.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-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