From 83401a32664ba9638bf1d397b01eeee5e68fefc58d33de6f7e585ee9c7abbf1a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 13 Dec 2016 18:33:06 +0000 Subject: [PATCH] Accepting request 441246 from KDE:Extra New package: zanshin OBS-URL: https://build.opensuse.org/request/show/441246 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zanshin?expand=0&rev=1 --- .gitattributes | 23 +++++++++ .gitignore | 1 + findKF5sooner.patch | 39 +++++++++++++++ qpointerconnect.diff | 11 +++++ useknownGCCflag.patch | 15 ++++++ zanshin-0.4.1.tar.bz2 | 3 ++ zanshin.changes | 107 ++++++++++++++++++++++++++++++++++++++++++ zanshin.spec | 103 ++++++++++++++++++++++++++++++++++++++++ 8 files changed, 302 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 findKF5sooner.patch create mode 100644 qpointerconnect.diff create mode 100644 useknownGCCflag.patch create mode 100644 zanshin-0.4.1.tar.bz2 create mode 100644 zanshin.changes create mode 100644 zanshin.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/findKF5sooner.patch b/findKF5sooner.patch new file mode 100644 index 0000000..3a3c552 --- /dev/null +++ b/findKF5sooner.patch @@ -0,0 +1,39 @@ +--- 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) + include(ECMPoQmTools) + + find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Gui Widgets Qml Test) ++find_package(KF5 REQUIRED COMPONENTS ++ AkonadiCalendar ++ AkonadiNotes ++ AkonadiSearch ++ IdentityManagement ++ KontactInterface ++ Ldap ++ Runner ++ Wallet ++) ++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 ( + 3rdparty/kdepim/libkdepim/ + ) + +-find_package(KF5 REQUIRED COMPONENTS +- AkonadiCalendar +- AkonadiNotes +- AkonadiSearch +- IdentityManagement +- KontactInterface +- Ldap +- Runner +- Wallet +-) +-find_package(KF5Akonadi "5.1" CONFIG REQUIRED) +- + add_subdirectory(3rdparty) + add_subdirectory(src) + diff --git a/qpointerconnect.diff b/qpointerconnect.diff new file mode 100644 index 0000000..7fbce8c --- /dev/null +++ b/qpointerconnect.diff @@ -0,0 +1,11 @@ +--- 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 +@@ -112,7 +112,7 @@ AvailablePagesView *ApplicationComponent + ApplicationComponents *self = const_cast(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; diff --git a/useknownGCCflag.patch b/useknownGCCflag.patch new file mode 100644 index 0000000..8d15525 --- /dev/null +++ b/useknownGCCflag.patch @@ -0,0 +1,15 @@ +--- 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() diff --git a/zanshin-0.4.1.tar.bz2 b/zanshin-0.4.1.tar.bz2 new file mode 100644 index 0000000..0208de3 --- /dev/null +++ b/zanshin-0.4.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a1980e2021c8f494c70f035f91e87f710ebf1cdfcad9a5f8eadc24a38a998d2 +size 366671 diff --git a/zanshin.changes b/zanshin.changes new file mode 100644 index 0000000..4668bf1 --- /dev/null +++ b/zanshin.changes @@ -0,0 +1,107 @@ +------------------------------------------------------------------- +Mon Nov 21 09:16:22 UTC 2016 - lbeltrame@kde.org + +- Remove not needed requirement on gcc5 + +------------------------------------------------------------------- +Sun Nov 20 16:28:28 UTC 2016 - mailaender@opensuse.org + +- adhere to https://spdx.org/licenses/ + +------------------------------------------------------------------- +Tue Sep 6 15:02:43 UTC 2016 - Kevin Ottens + +- Upgrading to 0.4.1 + +------------------------------------------------------------------- +Tue Apr 19 06:33:27 UTC 2016 - Kevin Ottens + +- Upgrading to 0.4.0 + +------------------------------------------------------------------- +Sat Apr 9 08:37:57 UTC 2016 - Kevin Ottens + +- Upgrading to 0.3.91 + +------------------------------------------------------------------- +Sat Apr 2 12:28:37 UTC 2016 - Kevin Ottens + +- Upgrading to 0.3.81 + +------------------------------------------------------------------- +Tue Jan 12 09:45:40 UTC 2016 - Kevin Ottens + +- Upgrading to 0.3.1 + +------------------------------------------------------------------- +Fri Jan 1 15:00:17 UTC 2016 - Kevin Ottens + +- Upgrading to 0.3.0 + +------------------------------------------------------------------- +Thu Dec 24 16:01:16 UTC 2015 - Kevin Ottens + +- Upgrading to 0.2.91 + +------------------------------------------------------------------- +Wed Dec 16 21:15:25 UTC 2015 - Kevin Ottens + +- Upgrading to 0.2.80 + +------------------------------------------------------------------- +Thu Jan 8 09:53:50 UTC 2015 - Kevin Ottens + +- Upgrading to 0.2.2 + +------------------------------------------------------------------- +Wed Aug 8 13:45:40 UTC 2012 - cgiboudeaux@gmx.com + +- Update translations +- Spec cleanup + + +------------------------------------------------------------------- +Mon Oct 3 22:49:18 UTC 2011 - Kevin Ottens + +- Upgrading to 0.2rc1 + +------------------------------------------------------------------- +Wed Aug 31 06:15:00 UTC 2011 - Kevin Ottens + +- Upgrading to 0.2beta2 + +------------------------------------------------------------------- +Tue Aug 2 09:52:00 UTC 2011 - cgiboudeaux@gmx.com + +- Add translations + +------------------------------------------------------------------- +Wed Jul 27 15:02:08 UTC 2011 - cgiboudeaux@gmx.com + +- Spec cleanup, fixed some rpmlint warnings + +------------------------------------------------------------------- +Mon Jul 18 2011 - Kevin Ottens + +- upgrading to 0.2beta1 + +------------------------------------------------------------------- +Tue May 10 2011 - Kevin Ottens + +- upgrading to 0.2alpha2 + +------------------------------------------------------------------- +Mon Feb 7 2011 - Kevin Ottens + +- Spec cleanup, fixed some rpmlint warnings + +------------------------------------------------------------------- +Wed Oct 14 2009 - Kevin Ottens + +- upgrading to latest svn + +------------------------------------------------------------------- +Fri Jan 30 2009 - Kevin Ottens + +- first packaging + diff --git a/zanshin.spec b/zanshin.spec new file mode 100644 index 0000000..4b32bcc --- /dev/null +++ b/zanshin.spec @@ -0,0 +1,103 @@ +# +# spec file for package zanshin +# +# Copyright (c) 2016 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# 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/ +# + + +Name: zanshin +Version: 0.4.1 +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 +Patch0: findKF5sooner.patch +Patch1: useknownGCCflag.patch +Patch2: qpointerconnect.diff +BuildRequires: boost-devel +BuildRequires: kf5-filesystem +BuildRequires: update-desktop-files +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(KF5IdentityManagement) +BuildRequires: cmake(KF5KCMUtils) +BuildRequires: cmake(KF5KHtml) +BuildRequires: cmake(KF5KontactInterface) +BuildRequires: cmake(KF5Ldap) +BuildRequires: cmake(KF5PimTextEdit) +BuildRequires: cmake(KF5Plasma) +BuildRequires: cmake(KF5Runner) +BuildRequires: cmake(KF5Wallet) +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Script) +BuildRequires: cmake(Qt5Test) +BuildRequires: cmake(Qt5Widgets) +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +Zanshin Todo is a powerful yet simple application for managing your day to day actions. +It helps you organize and reduce the cognitive pressure of what one has to do in his +job and personal life. You'll never forget anything anymore, getting your mind like water. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +%build + %cmake_kf5 -d build + %make_jobs + +%install + %kf5_makeinstall -C build + %suse_update_desktop_file org.kde.zanshin Utility TimeUtility + %suse_update_desktop_file org.kde.renku Utility TimeUtility + +%files +%defattr(-,root,root) +%doc AUTHORS COPYING gpl-*.txt +%{_kf5_bindir}/renku +%{_kf5_bindir}/zanshin +%{_kf5_bindir}/zanshin-migrator +%{_kf5_plugindir}/kontact_renkuplugin.so +%{_kf5_plugindir}/kontact_zanshinplugin.so +%{_kf5_plugindir}/krunner_zanshin.so +%{_kf5_plugindir}/renku_part.so +%{_kf5_plugindir}/zanshin_part.so +%{_kf5_appstreamdir}/ +%{_kf5_applicationsdir}/org.kde.renku.desktop +%{_kf5_applicationsdir}/org.kde.zanshin.desktop +%dir %{_kf5_iconsdir}/hicolor/256x256 +%dir %{_kf5_iconsdir}/hicolor/256x256/apps +%{_kf5_iconsdir}/hicolor/*/apps/zanshin.png +%{_kf5_iconsdir}/hicolor/scalable/apps/zanshin.svgz +%{_kf5_servicesdir}/kontact/ +%{_kf5_servicesdir}/plasma-runner-zanshin.desktop +%{_kf5_servicesdir}/renku_part.desktop +%{_kf5_servicesdir}/zanshin_part.desktop +%{_kf5_kxmlguidir}/renku/ +%{_kf5_kxmlguidir}/zanshin/ + +%changelog