Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kjots for openSUSE:Factory checked
in at 2022-08-12 16:06:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kjots (Old)
and /work/SRC/openSUSE:Factory/.kjots.new.1521 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kjots"
Fri Aug 12 16:06:44 2022 rev:13 rq:994688 version:5.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kjots/kjots.changes 2022-04-01
21:37:32.268554815 +0200
+++ /work/SRC/openSUSE:Factory/.kjots.new.1521/kjots.changes 2022-08-12
16:07:14.419577655 +0200
@@ -1,0 +2,6 @@
+Fri Aug 12 06:15:50 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Add patch to fix build with recent kontactinterface releases:
+ * 0001-Adapt-to-new-KontactInterface-Plugin-ctor.patch
+
+-------------------------------------------------------------------
New:
----
0001-Adapt-to-new-KontactInterface-Plugin-ctor.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kjots.spec ++++++
--- /var/tmp/diff_new_pack.TC0Otg/_old 2022-08-12 16:07:14.895579087 +0200
+++ /var/tmp/diff_new_pack.TC0Otg/_new 2022-08-12 16:07:14.903579110 +0200
@@ -30,6 +30,7 @@
# PATCH-FIX-UPSTREAM
Patch2: Fix-akonadi-includes.patch
Patch3: Fix-build-with-Akonadi-21.12.patch
+Patch4: 0001-Adapt-to-new-KontactInterface-Plugin-ctor.patch
BuildRequires: extra-cmake-modules
BuildRequires: update-desktop-files
BuildRequires: cmake(Grantlee5)
++++++ 0001-Adapt-to-new-KontactInterface-Plugin-ctor.patch ++++++
>From 85121754c862417e872048ae2f85e9b9fe2ddc7a Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fe...@gmx.de>
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 68db22b..9907d2b 100644
--- a/src/kontact_plugin/kjots_plugin.cpp
+++ b/src/kontact_plugin/kjots_plugin.cpp
@@ -56,8 +56,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 ca06d65..ae7b69f 100644
--- a/src/kontact_plugin/kjots_plugin.h
+++ b/src/kontact_plugin/kjots_plugin.h
@@ -50,7 +50,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 Q_DECL_OVERRIDE
{
