From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 21319158095 for ; Sun, 28 Aug 2022 13:05:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44B2AE092D; Sun, 28 Aug 2022 13:05:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B36CE092D for ; Sun, 28 Aug 2022 13:05:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 212EB340E03 for ; Sun, 28 Aug 2022 13:05:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 761D059E for ; Sun, 28 Aug 2022 13:05:52 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1661691946.96a4aa33cb8bce42aa620ea5cdf65e5f73dd7b9e.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/kjots/, app-text/kjots/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/kjots/files/kjots-5.1.0-akonadi-22.08.0.patch app-text/kjots/kjots-5.1.0-r2.ebuild X-VCS-Directories: app-text/kjots/files/ app-text/kjots/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 96a4aa33cb8bce42aa620ea5cdf65e5f73dd7b9e X-VCS-Branch: master Date: Sun, 28 Aug 2022 13:05:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4f2047a7-ef59-41e5-8e50-b2e642823bee X-Archives-Hash: 0f27543275112b2774f8c76081fb1727 commit: 96a4aa33cb8bce42aa620ea5cdf65e5f73dd7b9e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 28 13:03:25 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 28 13:05:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96a4aa33 app-text/kjots: Fix build with >=akonadi-22.08.0 Upstream commit 85121754c862417e872048ae2f85e9b9fe2ddc7a Closes: https://bugs.gentoo.org/867082 Signed-off-by: Andreas Sturmlechner gentoo.org> .../kjots/files/kjots-5.1.0-akonadi-22.08.0.patch | 47 ++++++++++++++++++++++ app-text/kjots/kjots-5.1.0-r2.ebuild | 1 + 2 files changed, 48 insertions(+) diff --git a/app-text/kjots/files/kjots-5.1.0-akonadi-22.08.0.patch b/app-text/kjots/files/kjots-5.1.0-akonadi-22.08.0.patch new file mode 100644 index 000000000000..fc5240105b02 --- /dev/null +++ b/app-text/kjots/files/kjots-5.1.0-akonadi-22.08.0.patch @@ -0,0 +1,47 @@ +From 85121754c862417e872048ae2f85e9b9fe2ddc7a Mon Sep 17 00:00:00 2001 +From: Nicolas Fella +Date: Thu, 14 Jul 2022 14:27:55 +0200 +Subject: [PATCH] Adapt to new KontactInterface::Plugin ctor + +--- + src/kontact_plugin/kjots_plugin.cpp | 5 +++++ + src/kontact_plugin/kjots_plugin.h | 4 ++++ + 2 files changed, 9 insertions(+) + +diff --git a/src/kontact_plugin/kjots_plugin.cpp b/src/kontact_plugin/kjots_plugin.cpp +index 1146ab3..c75faac 100644 +--- a/src/kontact_plugin/kjots_plugin.cpp ++++ b/src/kontact_plugin/kjots_plugin.cpp +@@ -40,8 +40,13 @@ + + EXPORT_KONTACT_PLUGIN_WITH_JSON(KJotsPlugin, "kjotsplugin.json") + ++#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 20, 41) ++KJotsPlugin::KJotsPlugin(KontactInterface::Core *core, const KPluginMetaData &md, const QVariantList &/*args*/) ++ : KontactInterface::Plugin(core, core, md, "kjots") ++#else + KJotsPlugin::KJotsPlugin(KontactInterface::Core *core, const QVariantList &/*args*/) + : KontactInterface::Plugin(core, core, "kjots") ++#endif + { + setComponentName(QStringLiteral("kjots"), i18n("KJots")); + +diff --git a/src/kontact_plugin/kjots_plugin.h b/src/kontact_plugin/kjots_plugin.h +index 28a793b..03ff500 100644 +--- a/src/kontact_plugin/kjots_plugin.h ++++ b/src/kontact_plugin/kjots_plugin.h +@@ -34,7 +34,11 @@ class KJotsPlugin : public KontactInterface::Plugin + Q_OBJECT + + public: ++#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 20, 41) ++ KJotsPlugin(KontactInterface::Core *core, const KPluginMetaData &md, const QVariantList &); ++#else + KJotsPlugin(KontactInterface::Core *core, const QVariantList &); ++#endif + + int weight() const override + { +-- +GitLab + diff --git a/app-text/kjots/kjots-5.1.0-r2.ebuild b/app-text/kjots/kjots-5.1.0-r2.ebuild index 7ef5fe968253..ade68829883b 100644 --- a/app-text/kjots/kjots-5.1.0-r2.ebuild +++ b/app-text/kjots/kjots-5.1.0-r2.ebuild @@ -52,4 +52,5 @@ PATCHES=( "${FILESDIR}/${P}-akonadi-21.12.0.patch" # bug 830580 "${FILESDIR}/${P}-speech-optional.patch" # bug 835128 "${FILESDIR}/${P}-akonadi-22.04.0.patch" # bug 840272 + "${FILESDIR}/${P}-akonadi-22.08.0.patch" # bug 867082 )