Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 16 Aug 2020 08:52:03 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r545089 - head/deskutils/zanshin/files
Message-ID:  <202008160852.07G8q3jA018965@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tcberner
Date: Sun Aug 16 08:52:03 2020
New Revision: 545089
URL: https://svnweb.freebsd.org/changeset/ports/545089

Log:
  deskutils/zanshin: add upstream's fix build against kontactinterface
  
  Reported by:	antoine

Added:
  head/deskutils/zanshin/files/
  head/deskutils/zanshin/files/patch-git_4850c0   (contents, props changed)

Added: head/deskutils/zanshin/files/patch-git_4850c0
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/zanshin/files/patch-git_4850c0	Sun Aug 16 08:52:03 2020	(r545089)
@@ -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
+
+



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008160852.07G8q3jA018965>