From e956f49fd52e36cdf1e37727cee3196dded577e529a7118805e42f691d569160 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 13 Dec 2021 19:44:19 +0000 Subject: [PATCH] Accepting request 938080 from KDE:Applications 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 --- ...all-the-kontact-plugin-into-kontact5.patch | 100 ------------------ Port-to-kontactinterface-5.14.42.patch | 58 ---------- applications.keyring | Bin 0 -> 6936 bytes zanshin-0.5.71.tar.xz | 3 - zanshin-21.12.0.tar.xz | 3 + zanshin-21.12.0.tar.xz.sig | 16 +++ zanshin.changes | 31 ++++++ zanshin.spec | 30 +++--- 8 files changed, 64 insertions(+), 177 deletions(-) delete mode 100644 Install-the-kontact-plugin-into-kontact5.patch delete mode 100644 Port-to-kontactinterface-5.14.42.patch create mode 100644 applications.keyring delete mode 100644 zanshin-0.5.71.tar.xz create mode 100644 zanshin-21.12.0.tar.xz create mode 100644 zanshin-21.12.0.tar.xz.sig diff --git a/Install-the-kontact-plugin-into-kontact5.patch b/Install-the-kontact-plugin-into-kontact5.patch deleted file mode 100644 index 025b6b2..0000000 --- a/Install-the-kontact-plugin-into-kontact5.patch +++ /dev/null @@ -1,100 +0,0 @@ -From faba24de5cc556870991fcc013a0ef2dceb5eeb9 Mon Sep 17 00:00:00 2001 -From: David Faure -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 - --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( 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 - diff --git a/Port-to-kontactinterface-5.14.42.patch b/Port-to-kontactinterface-5.14.42.patch deleted file mode 100644 index 8b6f292..0000000 --- a/Port-to-kontactinterface-5.14.42.patch +++ /dev/null @@ -1,58 +0,0 @@ -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 ---- 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 -+#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 - diff --git a/applications.keyring b/applications.keyring new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..9b6ab5c7fcff549a5c7c241e56901e15961ca2d85add060b3d44e0c17f90c88d GIT binary patch literal 6936 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 euV6i#6XT&(9ClDjfULTh(yxEzOw|D9H&tknAe literal 0 HcmV?d00001 diff --git a/zanshin-0.5.71.tar.xz b/zanshin-0.5.71.tar.xz deleted file mode 100644 index 388240a..0000000 --- a/zanshin-0.5.71.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b0933d2d9a63bba372966da0ba9e313b85ab2d6aa513a43657da90c65a33612c -size 307872 diff --git a/zanshin-21.12.0.tar.xz b/zanshin-21.12.0.tar.xz new file mode 100644 index 0000000..a2de10e --- /dev/null +++ b/zanshin-21.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97c5b8eed4bbabbe3b7e44801f71c97703ecaa331f0b2c73977c4911e0177a1d +size 350888 diff --git a/zanshin-21.12.0.tar.xz.sig b/zanshin-21.12.0.tar.xz.sig new file mode 100644 index 0000000..9bd6ba2 --- /dev/null +++ b/zanshin-21.12.0.tar.xz.sig @@ -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----- diff --git a/zanshin.changes b/zanshin.changes index 5ba825d..54ec549 100644 --- a/zanshin.changes +++ b/zanshin.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Fri Dec 3 19:23:09 UTC 2021 - Christophe Giboudeaux + +- 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 + +- 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 + +- 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 + +- Stop owning directories provided by the filesystem package (boo#1184786) + ------------------------------------------------------------------- Fri Jan 15 00:37:49 UTC 2021 - Simon Lees diff --git a/zanshin.spec b/zanshin.spec index 2e47b27..56ba1e3 100644 --- a/zanshin.spec +++ b/zanshin.spec @@ -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. @@ -54,25 +54,24 @@ job and personal life. You will never forget anything anymore. %autosetup -p1 %build - %cmake_kf5 -d build - %cmake_build +%cmake_kf5 -d build +%cmake_build %install - %kf5_makeinstall -C build - %suse_update_desktop_file org.kde.zanshin Utility TimeUtility +%kf5_makeinstall -C build +%suse_update_desktop_file org.kde.zanshin Utility TimeUtility %if %{with lang} %find_lang %{name} %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