From owner-svn-ports-all@freebsd.org Sun Aug 16 08:52:04 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B59233B59D3; Sun, 16 Aug 2020 08:52:04 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BTrX42dyNz44tg; Sun, 16 Aug 2020 08:52:04 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EAB86D8AA; Sun, 16 Aug 2020 08:52:03 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07G8q321018966; Sun, 16 Aug 2020 08:52:03 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07G8q3jA018965; Sun, 16 Aug 2020 08:52:03 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202008160852.07G8q3jA018965@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sun, 16 Aug 2020 08:52:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r545089 - head/deskutils/zanshin/files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/deskutils/zanshin/files X-SVN-Commit-Revision: 545089 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Aug 2020 08:52:04 -0000 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 +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 ++#include + + 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 + +