Hello community, here is the log from the commit of package zanshin for openSUSE:Factory checked in at 2019-10-24 23:08:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zanshin (Old) and /work/SRC/openSUSE:Factory/.zanshin.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zanshin" Thu Oct 24 23:08:55 2019 rev:5 rq:742248 version:0.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/zanshin/zanshin.changes 2019-06-20 18:55:47.932878579 +0200 +++ /work/SRC/openSUSE:Factory/.zanshin.new.2990/zanshin.changes 2019-10-24 23:09:09.496521876 +0200 @@ -1,0 +2,22 @@ +Thu Oct 17 09:27:29 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Fix the license tag. Zanshin has GPL-2.0-only and MIT files + +------------------------------------------------------------------- +Fri Oct 11 10:21:44 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Add patches to build with recent kcalendarcore versions: + * 0001-Fix-compilation-with-latest-KCalCore-API-changes-Att.patch + * 0001-Fix-build-with-Boost-1.70.0.patch + * 0001-Look-for-AkonadiContact.patch + * 0001-Remove-the-delegation-feature.patch + * 0001-Fix-compilation-after-Collection-referenced-was-removed.patch + * 0001-Fix-linking-of-the-cuke-steps.patch + * 0001-Make-it-build-both-with-pre-and-post.patch +- Drop patches: + * findKF5sooner.patch + * useknownGCCflag.patch + * qpointerconnect.diff + * fix-build-with-Qt-5.6.patch + +------------------------------------------------------------------- Old: ---- findKF5sooner.patch fix-build-with-Qt-5.6.patch qpointerconnect.diff useknownGCCflag.patch New: ---- 0001-Fix-build-with-Boost-1.70.0.patch 0001-Fix-compilation-after-Collection-referenced-was-removed.patch 0001-Fix-compilation-with-latest-KCalCore-API-changes-Att.patch 0001-Fix-linking-of-the-cuke-steps.patch 0001-Look-for-AkonadiContact.patch 0001-Make-it-build-both-with-pre-and-post.patch 0001-Remove-the-delegation-feature.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zanshin.spec ++++++ --- /var/tmp/diff_new_pack.C0pvVT/_old 2019-10-24 23:09:10.272522781 +0200 +++ /var/tmp/diff_new_pack.C0pvVT/_new 2019-10-24 23:09:10.276522786 +0200 @@ -1,7 +1,7 @@ # # spec file for package zanshin # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,29 +12,33 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%bcond_without lang +%bcond_without lang Name: zanshin Version: 0.5.0 Release: 0 Summary: TODO Application -License: GPL-2.0 or GPL-3.0 +# zanshin is GPL-2.0-only, 3rdparty/cucumber-cpp is MIT +License: GPL-2.0-only AND MIT Group: Productivity/Office/Organizers -Url: https://zanshin.kde.org/ +URL: https://zanshin.kde.org/ Source: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz -Patch0: findKF5sooner.patch -Patch1: useknownGCCflag.patch -Patch2: qpointerconnect.diff -# PATCH-FIX-OPENSUSE -Patch3: fix-build-with-Qt-5.6.patch +Patch0: 0001-Fix-compilation-with-latest-KCalCore-API-changes-Att.patch +Patch1: 0001-Fix-build-with-Boost-1.70.0.patch +Patch2: 0001-Look-for-AkonadiContact.patch +Patch3: 0001-Remove-the-delegation-feature.patch +Patch4: 0001-Fix-compilation-after-Collection-referenced-was-removed.patch +Patch5: 0001-Fix-linking-of-the-cuke-steps.patch +Patch6: 0001-Make-it-build-both-with-pre-and-post.patch BuildRequires: boost-devel BuildRequires: kf5-filesystem BuildRequires: update-desktop-files BuildRequires: cmake(KF5Akonadi) BuildRequires: cmake(KF5AkonadiCalendar) +BuildRequires: cmake(KF5AkonadiContact) BuildRequires: cmake(KF5AkonadiMime) BuildRequires: cmake(KF5AkonadiNotes) BuildRequires: cmake(KF5AkonadiSearch) @@ -52,7 +56,6 @@ BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Widgets) Recommends: %{name}-lang -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Zanshin Todo is an application for managing your day-to-day actions. @@ -62,11 +65,7 @@ %lang_package %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 %build %cmake_kf5 -d build @@ -81,8 +80,8 @@ %endif %files -%defattr(-,root,root) -%doc AUTHORS COPYING gpl-*.txt +%license COPYING 3rdparty/cucumber-cpp/LICENSE.txt +%doc AUTHORS gpl-*.txt %{_kf5_bindir}/renku %{_kf5_bindir}/zanshin %{_kf5_bindir}/zanshin-migrator @@ -107,7 +106,7 @@ %if %{with lang} %files lang -f %{name}.lang -%doc COPYING +%license COPYING %endif %changelog ++++++ 0001-Fix-build-with-Boost-1.70.0.patch ++++++ >From 66e06787dc96dfb1509f91b1d86b9b048f849ccf Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christo...@krop.fr> Date: Fri, 11 Oct 2019 11:18:45 +0200 Subject: [PATCH] Fix build with Boost 1.70.0. Patch by "K. Mlynarczyk" <mlynarc...@emar.pl> submitted to upstream cucumber-cpp --- 3rdparty/cucumber-cpp/src/drivers/BoostDriver.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/3rdparty/cucumber-cpp/src/drivers/BoostDriver.cpp b/3rdparty/cucumber-cpp/src/drivers/BoostDriver.cpp index 141ae29..8e4b75b 100644 --- a/3rdparty/cucumber-cpp/src/drivers/BoostDriver.cpp +++ b/3rdparty/cucumber-cpp/src/drivers/BoostDriver.cpp @@ -34,7 +34,11 @@ public: // Formatter void log_start( std::ostream&, counter_t test_cases_amount) {}; void log_finish( std::ostream&) {}; - void log_build_info( std::ostream&) {}; +#if BOOST_VERSION >= 107000 + void log_build_info( std::ostream&, bool /*log_build_info*/) {}; +#else + void log_build_info( std::ostream&) {}; +#endif void test_unit_start( std::ostream&, test_unit const& tu) {}; void test_unit_finish( std::ostream&, test_unit const& tu, unsigned long elapsed) {}; -- 2.23.0 ++++++ 0001-Fix-compilation-after-Collection-referenced-was-removed.patch ++++++ commit 00a1024fc93978330f94e7346135a7feec8c0241 Author: David Faure <fa...@kde.org> Date: Fri May 3 19:40:20 2019 +0200 Fix compilation after Collection::referenced was removed from Akonadi diff --git a/tests/testlib/akonadifakestorage.cpp b/tests/testlib/akonadifakestorage.cpp index e64c363..8fe1258 100644 --- a/tests/testlib/akonadifakestorage.cpp +++ b/tests/testlib/akonadifakestorage.cpp @@ -508,7 +508,7 @@ Akonadi::Collection::List AkonadiFakeStorage::collectChildren(const Akonadi::Col auto collections = Akonadi::Collection::List(); foreach (const auto &child, m_data->childCollections(findId(root))) { - if (child.enabled() || child.referenced()) + if (child.enabled()) collections << m_data->collection(findId(child)); collections += collectChildren(child); } ++++++ 0001-Fix-compilation-with-latest-KCalCore-API-changes-Att.patch ++++++ >From 3d73d1733190245c23b921c0da11aac0d783345d Mon Sep 17 00:00:00 2001 From: David Faure <fa...@kde.org> Date: Sat, 27 Jul 2019 19:31:42 +0200 Subject: [PATCH 01/23] Fix compilation with latest KCalCore API changes (Attachment now a value class) --- src/akonadi/akonadiserializer.cpp | 25 ++++++++++++++++++ tests/units/akonadi/akonadiserializertest.cpp | 26 +++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/src/akonadi/akonadiserializer.cpp b/src/akonadi/akonadiserializer.cpp index ee4d1ff..8cb60ff 100644 --- a/src/akonadi/akonadiserializer.cpp +++ b/src/akonadi/akonadiserializer.cpp @@ -239,6 +239,19 @@ void Serializer::updateTaskFromItem(Domain::Task::Ptr task, Item item) attachments.reserve(attachmentsInput.size()); std::transform(attachmentsInput.cbegin(), attachmentsInput.cend(), std::back_inserter(attachments), +#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80) + [&mimeDb] (const KCalCore::Attachment &attach) { + Domain::Task::Attachment attachment; + if (attach.isUri()) + attachment.setUri(QUrl(attach.uri())); + else + attachment.setData(attach.decodedData()); + attachment.setLabel(attach.label()); + attachment.setMimeType(attach.mimeType()); + attachment.setIconName(mimeDb.mimeTypeForName(attach.mimeType()).iconName()); + return attachment; + }); +#else [&mimeDb] (const KCalCore::Attachment::Ptr &attach) { Domain::Task::Attachment attachment; if (attach->isUri()) @@ -250,6 +263,7 @@ void Serializer::updateTaskFromItem(Domain::Task::Ptr task, Item item) attachment.setIconName(mimeDb.mimeTypeForName(attach->mimeType()).iconName()); return attachment; }); +#endif task->setAttachments(attachments); if (todo->attendeeCount() > 0) { @@ -324,6 +338,15 @@ Akonadi::Item Serializer::createItemFromTask(Domain::Task::Ptr task) } for (const auto &attachment : task->attachments()) { +#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80) + KCalCore::Attachment attach(QByteArray{}); + if (attachment.isUri()) + attach.setUri(attachment.uri().toString()); + else + attach.setDecodedData(attachment.data()); + attach.setMimeType(attachment.mimeType()); + attach.setLabel(attachment.label()); +#else KCalCore::Attachment::Ptr attach(new KCalCore::Attachment(QByteArray())); if (attachment.isUri()) attach->setUri(attachment.uri().toString()); @@ -331,6 +354,7 @@ Akonadi::Item Serializer::createItemFromTask(Domain::Task::Ptr task) attach->setDecodedData(attachment.data()); attach->setMimeType(attachment.mimeType()); attach->setLabel(attachment.label()); +#endif todo->addAttachment(attach); } diff --git a/tests/units/akonadi/akonadiserializertest.cpp b/tests/units/akonadi/akonadiserializertest.cpp index 3be5450..e380baf 100644 --- a/tests/units/akonadi/akonadiserializertest.cpp +++ b/tests/units/akonadi/akonadiserializertest.cpp @@ -696,10 +696,17 @@ private slots: setTodoDates(originalTodo, QDateTime(QDate(2013, 11, 24)), QDateTime(QDate(2014, 03, 01))); originalTodo->setRelatedTo(QStringLiteral("my-uid")); +#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80) + KCalCore::Attendee originalAttendee(QStringLiteral("John Doe"), + QStringLiteral("j...@d.com"), + true, + KCalCore::Attendee::Accepted); +#else KCalCore::Attendee::Ptr originalAttendee(new KCalCore::Attendee(QStringLiteral("John Doe"), QStringLiteral("j...@d.com"), true, KCalCore::Attendee::Accepted)); +#endif originalTodo->addAttendee(originalAttendee); // ... as payload of an item... @@ -758,6 +765,15 @@ private slots: updatedTodo->recurrence()->setDaily(1); for (int i = 0; i < updatedAttachmentData.size(); i++) { +#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80) + KCalCore::Attachment attachment(QByteArray{}); + if (!updatedAttachmentData.at(i).isEmpty()) + attachment.setDecodedData(updatedAttachmentData.at(i)); + else + attachment.setUri(updatedAttachmentUris.at(i)); + attachment.setMimeType(updatedAttachmentMimeTypes.at(i)); + attachment.setLabel(updatedAttachmentLabels.at(i)); +#else KCalCore::Attachment::Ptr attachment(new KCalCore::Attachment(QByteArray())); if (!updatedAttachmentData.at(i).isEmpty()) attachment->setDecodedData(updatedAttachmentData.at(i)); @@ -765,6 +781,7 @@ private slots: attachment->setUri(updatedAttachmentUris.at(i)); attachment->setMimeType(updatedAttachmentMimeTypes.at(i)); attachment->setLabel(updatedAttachmentLabels.at(i)); +#endif updatedTodo->addAttachment(attachment); } @@ -1289,11 +1306,19 @@ private slots: QCOMPARE(todo->attachments().size(), attachments.size()); for (int i = 0; i < attachments.size(); i++) { auto attachment = todo->attachments().at(i); +#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80) + QCOMPARE(attachment.isUri(), attachments.at(i).isUri()); + QCOMPARE(QUrl(attachment.uri()), attachments.at(i).uri()); + QCOMPARE(attachment.decodedData(), attachments.at(i).data()); + QCOMPARE(attachment.label(), attachments.at(i).label()); + QCOMPARE(attachment.mimeType(), attachments.at(i).mimeType()); +#else QCOMPARE(attachment->isUri(), attachments.at(i).isUri()); QCOMPARE(QUrl(attachment->uri()), attachments.at(i).uri()); QCOMPARE(attachment->decodedData(), attachments.at(i).data()); QCOMPARE(attachment->label(), attachments.at(i).label()); QCOMPARE(attachment->mimeType(), attachments.at(i).mimeType()); +#endif } if (delegate.isValid()) { ++++++ 0001-Fix-linking-of-the-cuke-steps.patch ++++++ commit 768ab13cf4cbc76ca4e43f6476ed139c396896c7 Author: Kevin Ottens <er...@kde.org> Date: Tue Mar 6 14:13:54 2018 +0100 Fix linking of the cuke-steps Turns out that cucumber-cpp via its boost dependency is pulling also the pthreads. In case of a string linker this requires to be linked against as well. diff --git a/CMakeLists.txt b/CMakeLists.txt index a6191f54..0de24b51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,7 @@ include(ECMPoQmTools) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Gui Widgets Qml Test) find_package(Boost REQUIRED) +find_package(Threads REQUIRED) macro(assert_min_ver version) set(error_msg "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_VERSION} not supported") if("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "${version}") diff --git a/tests/features/renku/features/step_definitions/CMakeLists.txt b/tests/features/renku/features/step_definitions/CMakeLists.txt index 03096058..d272e6af 100644 --- a/tests/features/renku/features/step_definitions/CMakeLists.txt +++ b/tests/features/renku/features/step_definitions/CMakeLists.txt @@ -13,6 +13,7 @@ set(steps_SRCS add_executable(renku-cuke-steps ${steps_SRCS}) target_link_libraries(renku-cuke-steps cucumber-cpp + Threads::Threads ${Boost_REGEX_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} diff --git a/tests/features/zanshin/features/step_definitions/CMakeLists.txt b/tests/features/zanshin/features/step_definitions/CMakeLists.txt index 72540c15..ea270fbe 100644 --- a/tests/features/zanshin/features/step_definitions/CMakeLists.txt +++ b/tests/features/zanshin/features/step_definitions/CMakeLists.txt @@ -13,6 +13,7 @@ set(steps_SRCS add_executable(zanshin-cuke-steps ${steps_SRCS}) target_link_libraries(zanshin-cuke-steps cucumber-cpp + Threads::Threads ${Boost_REGEX_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ++++++ 0001-Look-for-AkonadiContact.patch ++++++ >From 567523cec634405db7cd4e151518778a485277db Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christo...@krop.fr> Date: Fri, 11 Oct 2019 10:29:17 +0200 Subject: [PATCH] Look for AkonadiContact --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b639c4..2f13e28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,6 +67,7 @@ include_directories ( find_package(KF5 REQUIRED COMPONENTS AkonadiCalendar + AkonadiContact AkonadiNotes AkonadiSearch IdentityManagement -- 2.23.0 ++++++ 0001-Make-it-build-both-with-pre-and-post.patch ++++++ commit 0d3760b646d15e66f43a6a48546eae11cbf84497 Author: Kevin Ottens <er...@kde.org> Date: Sun Aug 25 15:38:49 2019 +0200 Make it build both with pre and post 19.08.0 KCalCore Summary: Obviously this assumes a compiler supporting __has_include in C++14 mode, but that should be the case in most target platforms nowadays. Beside this is hopefully temporary measure. Reviewers: dfaure Differential Revision: https://phabricator.kde.org/D23443 diff --git a/src/akonadi/akonadiserializer.cpp b/src/akonadi/akonadiserializer.cpp index 8cb60ff..593712b 100644 --- a/src/akonadi/akonadiserializer.cpp +++ b/src/akonadi/akonadiserializer.cpp @@ -30,7 +30,11 @@ #include <AkonadiCore/Item> #include <Akonadi/Notes/NoteUtils> #include <KCalCore/Todo> +#if __has_include(<kcalcore_version.h>) #include <kcalcore_version.h> +#else +#include <kcalendarcore_version.h> +#endif #include <KMime/Message> #include <QMimeDatabase> #if KCALCORE_VERSION < QT_VERSION_CHECK(5, 6, 80) diff --git a/tests/units/akonadi/akonadiserializertest.cpp b/tests/units/akonadi/akonadiserializertest.cpp index e380baf..936f02c 100644 --- a/tests/units/akonadi/akonadiserializertest.cpp +++ b/tests/units/akonadi/akonadiserializertest.cpp @@ -34,7 +34,11 @@ #include <Akonadi/Notes/NoteUtils> #include <AkonadiCore/Tag> #include <KCalCore/Todo> +#if __has_include(<kcalcore_version.h>) #include <kcalcore_version.h> +#else +#include <kcalendarcore_version.h> +#endif #include <KMime/Message> Q_DECLARE_METATYPE(Akonadi::Item*) ++++++ 0001-Remove-the-delegation-feature.patch ++++++ ++++ 12621 lines (skipped)
