rpm/zanshin
SHA256
1
0
Fork 0
forked from pool/zanshin
Code Pull Requests Activity

Accepting request 938080 from KDE:Applications

Browse Source 
KDE Gear 21.12.0

OBS-URL: https://build.opensuse.org/request/show/938080
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zanshin?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2021-12-13 19:44:19 +00:00 committed by Git OBS Bridge
parent d2cca4aa19
commit e956f49fd5
8 changed files with 64 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
Install-the-kontact-plugin-into-kontact5.patch
View File

@ -1,100 +0,0 @@
From faba24de5cc556870991fcc013a0ef2dceb5eeb9 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Wed, 15 Apr 2020 09:29:42 +0200
Subject: [PATCH] Install the kontact plugin into kontact5, with JSON metadata.
Summary: This will allow kontact to use KPluginLoader one day.
Test Plan:
rm $prefix/lib64/plugins/kontact_zanshinplugin.so ; make install
kontact still finds the zanshin plugin
The same steps (other than old-kontact-interface compatibility) were already
pushed to all other kontact plugins.
Reviewers: ervin
Reviewed By: ervin
Differential Revision: https://phabricator.kde.org/D28847
---
src/zanshin/kontact/CMakeLists.txt | 12 +++++++++++-
src/zanshin/kontact/kontact_plugin.cpp | 20 +++++++++++++++++++-
src/zanshin/kontact/zanshin_plugin.desktop | 2 +-
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/zanshin/kontact/CMakeLists.txt b/src/zanshin/kontact/CMakeLists.txt
index 60913156..be660131 100644
--- a/src/zanshin/kontact/CMakeLists.txt
+++ b/src/zanshin/kontact/CMakeLists.txt
@@ -1,3 +1,12 @@
+# TODO: remove once kontactinterface 5.14.42 is required
+
+if(NOT CMAKE_VERSION VERSION_LESS "3.10.0")
+ # CMake 3.9+ warns about automoc on files without Q_OBJECT, and doesn't know about other macros.
+ # 3.10+ lets us provide more macro names that require automoc.
+ # KF5 >= 5.42 takes care itself of adding its macros in its cmake config files
+ list(APPEND CMAKE_AUTOMOC_MACRO_NAMES "EXPORT_KONTACT_PLUGIN_WITH_JSON")
+endif()
+
set(part_SRCS
../app/aboutdata.cpp
part.cpp
@@ -22,8 +31,9 @@ set(kontact_SRCS
add_library(kontact_zanshinplugin MODULE ${kontact_SRCS})
target_link_libraries(kontact_zanshinplugin KF5::Parts KF5::KontactInterface)
+kcoreaddons_desktop_to_json(kontact_zanshinplugin zanshin_plugin.desktop)
-install(TARGETS kontact_zanshinplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
+install(TARGETS kontact_zanshinplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
install(FILES zanshin_plugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kontact)
install(FILES zanshin_part.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/zanshin)
diff --git a/src/zanshin/kontact/kontact_plugin.cpp b/src/zanshin/kontact/kontact_plugin.cpp
index 4b0d2f92..8edbb4a6 100644
--- a/src/zanshin/kontact/kontact_plugin.cpp
+++ b/src/zanshin/kontact/kontact_plugin.cpp
@@ -25,7 +25,25 @@
#include <KontactInterface/Core>
-EXPORT_KONTACT_PLUGIN(Plugin, zanshin)
+#if KONTACTINTERFACE_VERSION < QT_VERSION_CHECK(5, 14, 42)
+/**
+ Exports Kontact plugin.
+ @param pluginclass the class to instanciate (must derive from KontactInterface::Plugin
+ @param jsonFile filename of the JSON file, generated from a .desktop file
+ */
+#define EXPORT_KONTACT_PLUGIN_WITH_JSON( pluginclass, jsonFile ) \
+ class Instance \
+ { \
+ public: \
+ static QObject *createInstance( QWidget *, QObject *parent, const QVariantList &list ) \
+ { return new pluginclass( static_cast<KontactInterface::Core*>( parent ), list ); } \
+ }; \
+ K_PLUGIN_FACTORY_WITH_JSON( KontactPluginFactory, jsonFile, registerPlugin< pluginclass > \
+ ( QString(), Instance::createInstance ); ) \
+ K_EXPORT_PLUGIN_VERSION(KONTACT_PLUGIN_VERSION)
+#endif
+
+EXPORT_KONTACT_PLUGIN_WITH_JSON(Plugin, "zanshin_plugin.json")
Plugin::Plugin(KontactInterface::Core *core, const QVariantList&)
: KontactInterface::Plugin(core, core, "zanshin")
diff --git a/src/zanshin/kontact/zanshin_plugin.desktop b/src/zanshin/kontact/zanshin_plugin.desktop
index f616a898..58fe05c1 100644
--- a/src/zanshin/kontact/zanshin_plugin.desktop
+++ b/src/zanshin/kontact/zanshin_plugin.desktop
@@ -3,7 +3,7 @@ Type=Service
Icon=zanshin
X-KDE-ServiceTypes=Kontact/Plugin,KPluginInfo
-X-KDE-Library=kontact_zanshinplugin
+X-KDE-Library=kontact5/kontact_zanshinplugin
X-KDE-KontactPluginVersion=10
X-KDE-KontactPartLibraryName=zanshin_part
X-KDE-KontactPartExecutableName=zanshin
--
GitLab

58
Port-to-kontactinterface-5.14.42.patch
View File

@ -1,58 +0,0 @@
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
--- 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
--
GitLab

BIN
applications.keyring Normal file
View File

Binary file not shown.

3
zanshin-0.5.71.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b0933d2d9a63bba372966da0ba9e313b85ab2d6aa513a43657da90c65a33612c
size 307872

3
zanshin-21.12.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:97c5b8eed4bbabbe3b7e44801f71c97703ecaa331f0b2c73977c4911e0177a1d
size 350888

16
zanshin-21.12.0.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmGpY4oACgkQOmpNuDnq
ptd+PA//YrTeNSM7FKMl2RjQiDad6YXN5F+wbTPW6jNPN6tB21xOPqI7YkhN8vkt
j8DgVwfii1ikpnHHk5fX3ITo0tDEL2VVkGsSkxGGc1AuK1dxvhktltJp7ndfyEDh
ATxdjjjgnUr64kUiImHs8a4e3Er7jBv7Y693/cgm9NGhlgCrQ/LxH8xJC+mKA19k
d8l5BoG9qUVxOJpu719SnMnVpSYQKVHGnLlY+QrfsF9aFxFNfEbCh1KCu2qgu9RT
88Va2uEuEGYiRydvJ+IFIUycdVTKhet01m7IESmFQPVYw4Je7lpv2py7LTQp8xRW
SZVYhvddmLbEcZQzOJeClnuypD90ftzecbI1yLItF0uXKfeG3cBnTaF9Z7FcMiJU
pJG9sH5pb8Dk4LTD7JB5FYVjy1B3h1BV60WpJ1rgevpkCsemUx7S+9j6Rk3l+Xqg
IbhIlPFdZxIV7nNTHFxjPknPQy+Pyy1VXxOgPexP5Gu3KUfu43pUluaEY5zmcIVL
zd9b6AqhjIdu30PPkpkGwAjQ9/GrbJRQ2VMSETMBBZkE1mok1LZa76jBpG/bVzA6
kAdQvD+pmY9RS+iDc5RsDgPyMZcfKVVjX1ijlJ2cgWR7nrl77tvFYgvsdffxC6JO
YrtIAj8+dKp5KzNI51Ss5uXJaBAMiad5mlSGTgGc8S91/j9cFrA=
=WcQs
-----END PGP SIGNATURE-----

31
zanshin.changes
View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Fri Dec 3 19:23:09 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 21.12.0
* New feature release
* For more details please see:
* https://kde.org/announcements/gear/21.12.0/
- No code change since 21.11.90
-------------------------------------------------------------------
Sat Nov 27 10:12:05 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 21.11.90
* New feature release
- Changes since 21.11.80:
* Install translations
-------------------------------------------------------------------
Sat Nov 13 18:04:34 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 21.11.80.
* New feature release
- Drop obsolete patches:
* Install-the-kontact-plugin-into-kontact5.patch
* Port-to-kontactinterface-5.14.42.patch
-------------------------------------------------------------------
Tue Apr 20 08:27:48 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Stop owning directories provided by the filesystem package (boo#1184786)
-------------------------------------------------------------------
Fri Jan 15 00:37:49 UTC 2021 - Simon Lees <simonf.lees@suse.com>

22
zanshin.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package zanshin
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,16 +18,17 @@
%bcond_without lang
Name: zanshin
Version: 0.5.71
Version: 21.12.0
Release: 0
Summary: TODO Application
License: GPL-2.0-only
Group: Productivity/Office/Organizers
URL: https://zanshin.kde.org
Source: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM
Patch0: Port-to-kontactinterface-5.14.42.patch
Patch1: Install-the-kontact-plugin-into-kontact5.patch
Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
%if %{with lang}
Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
Source2: applications.keyring
%endif
BuildRequires: boost-devel
BuildRequires: kf5-filesystem
BuildRequires: update-desktop-files
@ -41,7 +42,6 @@ BuildRequires: cmake(Qt5Core)
BuildRequires: cmake(Qt5Gui)
BuildRequires: cmake(Qt5Test)
BuildRequires: cmake(Qt5Widgets)
Recommends: %{name}-lang
%description
Zanshin Todo is an application for managing your day-to-day actions.
@ -65,14 +65,13 @@ job and personal life. You will never forget anything anymore.
%endif
%files
%license COPYING gpl-*.txt
%license LICENSES/*
%doc AUTHORS
%dir %{_kf5_appstreamdir}
%dir %{_kf5_iconsdir}/hicolor/256x256
%dir %{_kf5_iconsdir}/hicolor/256x256/apps
%dir %{_kf5_plugindir}/kontact5/
%dir %{_kf5_plugindir}/kontact5
%{_kf5_applicationsdir}/org.kde.zanshin.desktop
%{_kf5_appstreamdir}/org.kde.zanshin.appdata.xml
%{_kf5_appstreamdir}/org.kde.zanshin.metainfo.xml
%{_kf5_bindir}/zanshin
%{_kf5_bindir}/zanshin-migrator
%{_kf5_iconsdir}/hicolor/*/apps/zanshin.png
@ -87,7 +86,6 @@ job and personal life. You will never forget anything anymore.
%if %{with lang}
%files lang -f %{name}.lang
%license COPYING
%endif
%changelog