commit zanshin for openSUSE:Factory

Hello community, here is the log from the commit of package zanshin for openSUSE:Factory checked in at 2018-01-09 14:52:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zanshin (Old) and /work/SRC/openSUSE:Factory/.zanshin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zanshin" Tue Jan 9 14:52:31 2018 rev:3 rq:561699 version:0.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/zanshin/zanshin.changes 2017-02-06 15:21:43.271945249 +0100 +++ /work/SRC/openSUSE:Factory/.zanshin.new/zanshin.changes 2018-01-09 14:52:33.721577589 +0100 @@ -1,0 +2,39 @@ +Thu Jan 4 09:11:47 UTC 2018 - wbauer@tmo.at + +- Update to 0.5.0 + * Errors coming from the system are now displayed properly in the + main window + * Tasks scheduled in the future can be filtered out + * A task can be picked up as the "currently running" showing a + nice overlay at the top of the screen, this is a reminder of + what you're supposed to focus on + * Projects are now displayed grouped by their containing + collection which can help separate better visually between work + and personal projects + * Attachments are now supported for tasks (which nicely complete + the "create todo" feature from KMail) + * Tasks with recurrence are now supported (although we have a + simple recurrence model for now) + * And of course also a couple of minor GUI adjustments and bug + fixes + Under the hood, we also did some improvements: + * Some error handling has been improved + * Some duplicated code has been factorized + * Some dead code has been cleaned up + * Issues pointed out by krazy and clazy have been addressed + * Feature level tests have been reworked and are better insulated + from each other + * Our code related to dates have been ported to the new KCalCore + ABI introduced in 17.12 + * The biggest architectural change has been the introduction of a + cache which speeds up our accesses to akonadi and allowed to + address a few bugs (we had some views exhibiting duplicated + items, this is now gone) +- Adjust build requirements +- Add -lang subpackage that contains translations +- Add fix-build-with-Qt-5.6.patch to make it build on Leap 42.x +- Update qpointerconnect.diff to fix another instance of the same + "problem" and make it build with gcc 4.8 again +- Update source URL + +------------------------------------------------------------------- Old: ---- zanshin-0.4.1.tar.bz2 New: ---- fix-build-with-Qt-5.6.patch zanshin-0.5.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zanshin.spec ++++++ --- /var/tmp/diff_new_pack.AD6rfx/_old 2018-01-09 14:52:35.081513834 +0100 +++ /var/tmp/diff_new_pack.AD6rfx/_new 2018-01-09 14:52:35.085513645 +0100 @@ -15,44 +15,43 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%bcond_without lang Name: zanshin -Version: 0.4.1 +Version: 0.5.0 Release: 0 Summary: TODO Application License: GPL-2.0 or GPL-3.0 Group: Productivity/Office/Organizers Url: https://zanshin.kde.org/ -Source: http://files.kde.org/%{name}/%{name}-%{version}.tar.bz2 +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 BuildRequires: boost-devel BuildRequires: kf5-filesystem BuildRequires: update-desktop-files +BuildRequires: cmake(KF5Akonadi) BuildRequires: cmake(KF5AkonadiCalendar) BuildRequires: cmake(KF5AkonadiMime) BuildRequires: cmake(KF5AkonadiNotes) BuildRequires: cmake(KF5AkonadiSearch) -BuildRequires: cmake(KF5CalendarCore) -BuildRequires: cmake(KF5Completion) -BuildRequires: cmake(KF5Contacts) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5IdentityManagement) -BuildRequires: cmake(KF5KCMUtils) -BuildRequires: cmake(KF5KHtml) +BuildRequires: cmake(KF5KDELibs4Support) BuildRequires: cmake(KF5KontactInterface) BuildRequires: cmake(KF5Ldap) -BuildRequires: cmake(KF5PimTextEdit) -BuildRequires: cmake(KF5Plasma) BuildRequires: cmake(KF5Runner) BuildRequires: cmake(KF5Wallet) +BuildRequires: cmake(KF5WindowSystem) BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5Script) +BuildRequires: cmake(Qt5Qml) BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Widgets) +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -60,11 +59,14 @@ It helps you organize and reduce the cognitive pressure of what one has to do in his job and personal life. You will never forget anything anymore. +%lang_package + %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %cmake_kf5 -d build @@ -74,6 +76,9 @@ %kf5_makeinstall -C build %suse_update_desktop_file org.kde.zanshin Utility TimeUtility %suse_update_desktop_file org.kde.renku Utility TimeUtility +%if %{with lang} + %find_lang %{name} +%endif %files %defattr(-,root,root) @@ -100,4 +105,9 @@ %{_kf5_kxmlguidir}/renku/ %{_kf5_kxmlguidir}/zanshin/ +%if %{with lang} +%files lang -f %{name}.lang +%doc COPYING +%endif + %changelog ++++++ findKF5sooner.patch ++++++ --- /var/tmp/diff_new_pack.AD6rfx/_old 2018-01-09 14:52:35.125511771 +0100 +++ /var/tmp/diff_new_pack.AD6rfx/_new 2018-01-09 14:52:35.129511584 +0100 @@ -1,6 +1,6 @@ --- 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,17 @@ include(ECMMarkAsTest) +@@ -16,6 +16,20 @@ include(ECMMarkAsTest) include(ECMPoQmTools) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Gui Widgets Qml Test) @@ -13,12 +13,15 @@ + 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,18 +75,6 @@ include_directories ( +@@ -64,21 +75,6 @@ include_directories ( 3rdparty/kdepim/libkdepim/ ) @@ -31,6 +34,9 @@ - Ldap - Runner - Wallet +- WindowSystem +- I18n +- KDELibs4Support -) -find_package(KF5Akonadi "5.1" CONFIG REQUIRED) - ++++++ fix-build-with-Qt-5.6.patch ++++++

From 55c7126edf9e956c14ed5c82973399c7db48d965 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer 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 ++++++ qpointerconnect.diff ++++++ --- /var/tmp/diff_new_pack.AD6rfx/_old 2018-01-09 14:52:35.153510458 +0100 +++ /var/tmp/diff_new_pack.AD6rfx/_new 2018-01-09 14:52:35.153510458 +0100 @@ -1,5 +1,5 @@ ---- zanshin-0.4.1/src/widgets/applicationcomponents.cpp 2016-09-06 16:21:19.000000000 +0200 -+++ zanshin-0.4.1.new/src/widgets/applicationcomponents.cpp 2016-11-21 16:36:19.092641290 +0100 +--- 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(this); self->m_availablePagesView = availablePagesView; @@ -9,3 +9,14 @@ } 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;