diff --git a/kde/frameworks/tier3/kactivities-stats/kactivities-stats-5.55.0-20190320.diff b/kde/frameworks/tier3/kactivities-stats/kactivities-stats-5.55.0-20190320.diff deleted file mode 100644 index 82b4b196..00000000 --- a/kde/frameworks/tier3/kactivities-stats/kactivities-stats-5.55.0-20190320.diff +++ /dev/null @@ -1,56 +0,0 @@ -diff -Nrub -x '*~' -x '*\.rej' -x '*\.orig' -x '*\.o' -x '*\.pyc' kactivities-stats-5.55.0.orig/src/resultset.h kactivities-stats-5.55.0/src/resultset.h ---- kactivities-stats-5.55.0.orig/src/resultset.h 2019-02-02 18:19:28.000000000 +0100 -+++ kactivities-stats-5.55.0/src/resultset.h 2019-03-20 08:35:33.434938100 +0100 -@@ -162,16 +162,16 @@ - - reference operator[](difference_type n) const; - -- friend bool operator==(const const_iterator &left, const const_iterator &right); -- friend bool operator!=(const const_iterator &left, const const_iterator &right); -+ KACTIVITIESSTATS_EXPORT friend bool operator==(const const_iterator &left, const const_iterator &right); -+ KACTIVITIESSTATS_EXPORT friend bool operator!=(const const_iterator &left, const const_iterator &right); - -- friend bool operator<(const const_iterator &left, const const_iterator &right); -- friend bool operator>(const const_iterator &left, const const_iterator &right); -+ KACTIVITIESSTATS_EXPORT friend bool operator<(const const_iterator &left, const const_iterator &right); -+ KACTIVITIESSTATS_EXPORT friend bool operator>(const const_iterator &left, const const_iterator &right); - -- friend bool operator<=(const const_iterator &left, const const_iterator &right); -- friend bool operator>=(const const_iterator &left, const const_iterator &right); -+ KACTIVITIESSTATS_EXPORT friend bool operator<=(const const_iterator &left, const const_iterator &right); -+ KACTIVITIESSTATS_EXPORT friend bool operator>=(const const_iterator &left, const const_iterator &right); - -- friend difference_type operator-(const const_iterator &left, const const_iterator &right); -+ KACTIVITIESSTATS_EXPORT friend difference_type operator-(const const_iterator &left, const const_iterator &right); - - private: - const_iterator(const ResultSet *resultSet, int currentRow); -diff -Nrub -x '*~' -x '*\.rej' -x '*\.orig' -x '*\.o' -x '*\.pyc' kactivities-stats-5.55.0.orig/src/resultset_iterator.cpp kactivities-stats-5.55.0/src/resultset_iterator.cpp ---- kactivities-stats-5.55.0.orig/src/resultset_iterator.cpp 2019-02-02 18:19:28.000000000 +0100 -+++ kactivities-stats-5.55.0/src/resultset_iterator.cpp 2019-03-20 08:35:05.530836500 +0100 -@@ -72,10 +72,9 @@ - friend void swap(ResultSet_IteratorPrivate &left, - ResultSet_IteratorPrivate &right) - { -- using namespace std; -- swap(left.resultSet, right.resultSet); -- swap(left.currentRow, right.currentRow); -- swap(left.currentValue, right.currentValue); -+ std::swap(left.resultSet, right.resultSet); -+ std::swap(left.currentRow, right.currentRow); -+ std::swap(left.currentValue, right.currentValue); - } - - bool operator==(const ResultSet_IteratorPrivate &other) const -diff -Nrub -x '*~' -x '*\.rej' -x '*\.orig' -x '*\.o' -x '*\.pyc' kactivities-stats-5.55.0.orig/src/utils/lazy_val.h kactivities-stats-5.55.0/src/utils/lazy_val.h ---- kactivities-stats-5.55.0.orig/src/utils/lazy_val.h 2019-02-02 18:19:28.000000000 +0100 -+++ kactivities-stats-5.55.0/src/utils/lazy_val.h 2019-03-20 08:41:11.181896400 +0100 -@@ -38,7 +38,7 @@ - mutable bool valueRetrieved; - - public: -- operator decltype(_f()) () const -+ operator auto() const -> decltype(_f()) - { - if (!valueRetrieved) { - valueRetrieved = true; diff --git a/kde/frameworks/tier3/kactivities-stats/kactivities-stats.py b/kde/frameworks/tier3/kactivities-stats/kactivities-stats.py index b3f47ee9..384d64d9 100644 --- a/kde/frameworks/tier3/kactivities-stats/kactivities-stats.py +++ b/kde/frameworks/tier3/kactivities-stats/kactivities-stats.py @@ -1,34 +1,22 @@ import info class subinfo(info.infoclass): def setTargets(self): self.versionInfo.setDefaultValues() - if CraftCore.compiler.isMSVC(): - self.patchToApply["5.55.0"] = [("kactivities-stats-5.55.0-20190320.diff", 1)] - self.patchToApply["5.56.0"] = [("kactivities-stats-5.55.0-20190320.diff", 1)] - self.patchToApply["5.57.0"] = [("kactivities-stats-5.55.0-20190320.diff", 1)] - self.patchToApply["5.58.0"] = [("kactivities-stats-5.55.0-20190320.diff", 1)] - self.patchToApply["5.59.0"] = [("kactivities-stats-5.55.0-20190320.diff", 1)] - self.patchToApply["5.60.0"] = [("kactivities-stats-5.55.0-20190320.diff", 1)] - self.patchToApply["5.61.0"] = [("kactivities-stats-5.55.0-20190320.diff", 1)] - self.patchToApply["5.62.0"] = [("kactivities-stats-5.55.0-20190320.diff", 1)] - self.patchToApply["5.63.0"] = [("kactivities-stats-5.55.0-20190320.diff", 1)] - - self.description = "A library for accessing the usage data collected by the activities system" def setDependencies(self): self.buildDependencies["virtual/base"] = None self.buildDependencies["kde/frameworks/extra-cmake-modules"] = None self.runtimeDependencies["kde/frameworks/tier1/kconfig"] = None self.runtimeDependencies["kde/frameworks/tier3/kactivities"] = None self.runtimeDependencies["libs/boost/boost-headers"] = None from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__(self): CMakePackageBase.__init__(self) self.subinfo.options.configure.args = "-DBUILD_TESTING=OFF "