pool/zanshin
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 742248 from KDE:Extra

Browse Source 
- Fix the license tag. Zanshin has GPL-2.0-only and MIT files

- 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

OBS-URL: https://build.opensuse.org/request/show/742248
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zanshin?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2019-10-24 21:08:55 +00:00 committed by Git OBS Bridge
parent 3730d65462
commit e1214e61a2
13 changed files with 12959 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0001-Fix-build-with-Boost-1.70.0.patch Normal file
View File

@ -0,0 +1,30 @@
From 66e06787dc96dfb1509f91b1d86b9b048f849ccf Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Fri, 11 Oct 2019 11:18:45 +0200
Subject: [PATCH] Fix build with Boost 1.70.0.
Patch by "K. Mlynarczyk" <mlynarczyk@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

19
0001-Fix-compilation-after-Collection-referenced-was-removed.patch Normal file
View File

@ -0,0 +1,19 @@
commit 00a1024fc93978330f94e7346135a7feec8c0241
Author: David Faure <faure@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);
}

132
0001-Fix-compilation-with-latest-KCalCore-API-changes-Att.patch Normal file
View File

@ -0,0 +1,132 @@
From 3d73d1733190245c23b921c0da11aac0d783345d Mon Sep 17 00:00:00 2001
From: David Faure <faure@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()) {

46
0001-Fix-linking-of-the-cuke-steps.patch Normal file
View File

@ -0,0 +1,46 @@
commit 768ab13cf4cbc76ca4e43f6476ed139c396896c7
Author: Kevin Ottens <ervin@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}

24
0001-Look-for-AkonadiContact.patch Normal file
View File

@ -0,0 +1,24 @@
From 567523cec634405db7cd4e151518778a485277db Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@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

47
0001-Make-it-build-both-with-pre-and-post.patch Normal file
View File

@ -0,0 +1,47 @@
commit 0d3760b646d15e66f43a6a48546eae11cbf84497
Author: Kevin Ottens <ervin@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*)

12621
0001-Remove-the-delegation-feature.patch Normal file
View File

File diff suppressed because it is too large Load Diff

46
findKF5sooner.patch
View File

@ -1,46 +0,0 @@
--- zanshin-0.4.1/CMakeLists.txt 2016-09-06 16:21:19.000000000 +0200
+++ zanshin-0.4.1.new/CMakeLists.txt 2016-11-21 14:37:27.169696650 +0100
@@ -16,6 +16,21 @@ include(ECMMarkAsTest)
include(ECMPoQmTools)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Gui Widgets Qml Test)
+find_package(KF5 REQUIRED COMPONENTS
+ AkonadiCalendar
+ AkonadiContact
+ AkonadiNotes
+ AkonadiSearch
+ IdentityManagement
+ KontactInterface
+ Ldap
+ Runner
+ Wallet
+ WindowSystem
+ I18n
+ KDELibs4Support
+)
+find_package(KF5Akonadi "5.1" CONFIG REQUIRED)
find_package(Boost REQUIRED)
macro(assert_min_ver version)
set(error_msg "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_VERSION} not supported")
@@ -64,21 +75,6 @@ include_directories (
3rdparty/kdepim/libkdepim/
)
-find_package(KF5 REQUIRED COMPONENTS
- AkonadiCalendar
- AkonadiNotes
- AkonadiSearch
- IdentityManagement
- KontactInterface
- Ldap
- Runner
- Wallet
- WindowSystem
- I18n
- KDELibs4Support
-)
-find_package(KF5Akonadi "5.1" CONFIG REQUIRED)
-
add_subdirectory(3rdparty)
add_subdirectory(src)

31
fix-build-with-Qt-5.6.patch
View File

@ -1,31 +0,0 @@
From 55c7126edf9e956c14ed5c82973399c7db48d965 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Thu, 4 Jan 2018 11:59:21 +0100
Subject: [PATCH] Fix build with Qt 5.6
qAsConst() only exists in Qt 5.7.0 and higher.
This basically reverts commit ff4cbbff when compiling with Qt < 5.7.0,
to make it build on Leap 42.x.
---
src/utils/dependencymanager.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/utils/dependencymanager.cpp b/src/utils/dependencymanager.cpp
index 560a768e..2f70fad1 100644
--- a/src/utils/dependencymanager.cpp
+++ b/src/utils/dependencymanager.cpp
@@ -44,7 +44,11 @@ DependencyManager::DependencyManager(const DependencyManager &other)
DependencyManager::~DependencyManager()
{
+#if QT_VERSION < QT_VERSION_CHECK(5,7,0)
+ foreach (void (*cleanupFunction)(DependencyManager*), m_cleanupFunctions) {
+#else
for (const auto &cleanupFunction : qAsConst(m_cleanupFunctions)) {
+#endif
cleanupFunction(this);
}
}
--
2.13.6

22
qpointerconnect.diff
View File

@ -1,22 +0,0 @@
--- zanshin-0.5.0/src/widgets/applicationcomponents.cpp
+++ zanshin-0.5.0.new/src/widgets/applicationcomponents.cpp
@@ -112,7 +112,7 @@ AvailablePagesView *ApplicationComponent
ApplicationComponents *self = const_cast<ApplicationComponents*>(this);
self->m_availablePagesView = availablePagesView;
- connect(self->m_availablePagesView, &AvailablePagesView::currentPageChanged, self, &ApplicationComponents::onCurrentPageChanged);
+ connect(self->m_availablePagesView.data(), &AvailablePagesView::currentPageChanged, self, &ApplicationComponents::onCurrentPageChanged);
}
return m_availablePagesView;
--- zanshin-0.5.0/src/widgets/applicationcomponents.cpp
+++ zanshin-0.5.0.new/src/widgets/applicationcomponents.cpp
@@ -136,7 +136,7 @@ PageView *ApplicationComponents::pageView() const
self->m_pageView = pageView;
self->m_errorHandler->setPageView(pageView);
- connect(self->m_pageView, &PageView::currentArtifactChanged, self, &ApplicationComponents::onCurrentArtifactChanged);
+ connect(self->m_pageView.data(), &PageView::currentArtifactChanged, self, &ApplicationComponents::onCurrentArtifactChanged);
}
return m_pageView;

15
useknownGCCflag.patch
View File

@ -1,15 +0,0 @@
--- zanshin-0.4.1/CMakeLists.txt 2016-11-21 16:01:51.528098093 +0100
+++ zanshin-0.4.1.new/CMakeLists.txt 2016-11-21 16:01:34.876162691 +0100
@@ -46,7 +46,11 @@ if(APPLE)
endif()
if(UNIX)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+ if("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "5.0.0.0")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
+ else()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+ endif()
set(CMAKE_CXX_STANDARD 14) # Enable C++14, with cmake >= 3.1
set(CMAKE_CXX_EXTENSIONS OFF) # Don't enable gcc-specific extensions
endif()

22
zanshin.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Thu Oct 17 09:27:29 UTC 2019 - Christophe Giboudeaux <christophe@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 <christophe@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
-------------------------------------------------------------------
Wed Jun 19 12:38:29 UTC 2019 - wbauer@tmo.at

37
zanshin.spec
View File

@ -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(Qt5Qml)
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 @@ job and personal life. You will never forget anything anymore.
%lang_package
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%autosetup -p1
%build
%cmake_kf5 -d build
@ -81,8 +80,8 @@ job and personal life. You will never forget anything anymore.
%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 @@ job and personal life. You will never forget anything anymore.
%if %{with lang}
%files lang -f %{name}.lang
%doc COPYING
%license COPYING
%endif
%changelog