Hello community,
here is the log from the commit of package kactivities-stats for
openSUSE:Factory checked in at 2019-11-12 11:42:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kactivities-stats (Old)
and /work/SRC/openSUSE:Factory/.kactivities-stats.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kactivities-stats"
Tue Nov 12 11:42:05 2019 rev:44 rq:747084 version:5.64.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kactivities-stats/kactivities-stats.changes
2019-10-14 13:34:13.146536343 +0200
+++
/work/SRC/openSUSE:Factory/.kactivities-stats.new.2990/kactivities-stats.changes
2019-11-12 11:43:27.186601997 +0100
@@ -1,0 +2,12 @@
+Sun Nov 3 15:46:47 UTC 2019 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.64.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.64.0.php
+- Changes since 5.63.0:
+ * tests: fix macos build failure
+ * Windows MSVC compile fix
+ * Add a utility accessor to get a QUrl from a ResultSet::Result
+
+-------------------------------------------------------------------
Old:
----
kactivities-stats-5.63.0.tar.xz
kactivities-stats-5.63.0.tar.xz.sig
New:
----
kactivities-stats-5.64.0.tar.xz
kactivities-stats-5.64.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kactivities-stats.spec ++++++
--- /var/tmp/diff_new_pack.KkSHoz/_old 2019-11-12 11:43:27.738602578 +0100
+++ /var/tmp/diff_new_pack.KkSHoz/_new 2019-11-12 11:43:27.746602587 +0100
@@ -17,7 +17,7 @@
%define lname libKF5ActivitiesStats1
-%define _tar_path 5.63
+%define _tar_path 5.64
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -25,7 +25,7 @@
# Only needed for the package signature condition
%bcond_without lang
Name: kactivities-stats
-Version: 5.63.0
+Version: 5.64.0
Release: 0
Summary: KDE Plasma Activities support
License: LGPL-2.0-or-later
++++++ kactivities-stats-5.63.0.tar.xz -> kactivities-stats-5.64.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.63.0/CMakeLists.txt
new/kactivities-stats-5.64.0/CMakeLists.txt
--- old/kactivities-stats-5.63.0/CMakeLists.txt 2019-10-06 11:33:27.000000000
+0200
+++ new/kactivities-stats-5.64.0/CMakeLists.txt 2019-11-02 12:42:02.000000000
+0100
@@ -2,8 +2,8 @@
cmake_minimum_required(VERSION 3.5)
-set(KF5_VERSION "5.63.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.63.0") # handled by release scripts
+set(KF5_VERSION "5.64.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.64.0") # handled by release scripts
project (KActivitiesStats VERSION ${KF5_VERSION})
set (REQUIRED_QT_VERSION 5.11.0)
@@ -20,7 +20,7 @@
# Extra CMake stuff
include (FeatureSummary)
-find_package (ECM 5.63.0 NO_MODULE)
+find_package (ECM 5.64.0 NO_MODULE)
set_package_properties (ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL
"https://projects.kde.org/projects/kdesupport/extra-cmake-modules";)
feature_summary (WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -84,6 +84,7 @@
)
add_definitions(-DQT_NO_FOREACH)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
+add_definitions(-DQT_DEPRECATED_WARNINGS_SINCE=0x060000)
add_subdirectory (src)
if(BUILD_TESTING)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.63.0/src/resultset.cpp
new/kactivities-stats-5.64.0/src/resultset.cpp
--- old/kactivities-stats-5.63.0/src/resultset.cpp 2019-10-06
11:33:27.000000000 +0200
+++ new/kactivities-stats-5.64.0/src/resultset.cpp 2019-11-02
12:42:02.000000000 +0100
@@ -25,6 +25,8 @@
#include <QSqlQuery>
#include <QSqlError>
#include <QCoreApplication>
+#include <QDir>
+#include <QUrl>
// Local
#include <common/database/Database.h>
@@ -112,6 +114,14 @@
#undef CREATE_GETTER_AND_SETTER
+QUrl ResultSet::Result::url() const
+{
+ if (QDir::isAbsolutePath(d->resource)) {
+ return QUrl::fromLocalFile(d->resource);
+ } else {
+ return QUrl(d->resource);
+ }
+}
class ResultSetPrivate {
public:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.63.0/src/resultset.h
new/kactivities-stats-5.64.0/src/resultset.h
--- old/kactivities-stats-5.63.0/src/resultset.h 2019-10-06
11:33:27.000000000 +0200
+++ new/kactivities-stats-5.64.0/src/resultset.h 2019-11-02
12:42:02.000000000 +0100
@@ -74,7 +74,9 @@
Linked = 2
};
- QString resource() const; ///< URL of the resource
+ // TODO: KF6 rething the function names, and maybe their signature,
perhaps leverage std::variant or std::optional to add semantics to the API
+ QString resource() const; ///< String representation of
resource (can represent an url or a path)
+ QUrl url() const; ///< Url representation of a
resource based on internal resource, readonly, @since 5.64
QString title() const; ///< Title of the resource, or
URL if title is not known
QString mimetype() const; ///< Mimetype of the resource,
or URL if title is not known
double score() const; ///< The score calculated based
on the usage statistics
@@ -164,16 +166,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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.63.0/src/resultset_iterator.cpp
new/kactivities-stats-5.64.0/src/resultset_iterator.cpp
--- old/kactivities-stats-5.63.0/src/resultset_iterator.cpp 2019-10-06
11:33:27.000000000 +0200
+++ new/kactivities-stats-5.64.0/src/resultset_iterator.cpp 2019-11-02
12:42:02.000000000 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.63.0/src/utils/lazy_val.h
new/kactivities-stats-5.64.0/src/utils/lazy_val.h
--- old/kactivities-stats-5.63.0/src/utils/lazy_val.h 2019-10-06
11:33:27.000000000 +0200
+++ new/kactivities-stats-5.64.0/src/utils/lazy_val.h 2019-11-02
12:42:02.000000000 +0100
@@ -38,7 +38,11 @@
mutable bool valueRetrieved;
public:
+#ifdef _MSC_VER
+ operator auto() const -> decltype(_f())
+#else
operator decltype(_f()) () const
+#endif
{
if (!valueRetrieved) {
valueRetrieved = true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.63.0/tests/model/CMakeLists.txt
new/kactivities-stats-5.64.0/tests/model/CMakeLists.txt
--- old/kactivities-stats-5.63.0/tests/model/CMakeLists.txt 2019-10-06
11:33:27.000000000 +0200
+++ new/kactivities-stats-5.64.0/tests/model/CMakeLists.txt 2019-11-02
12:42:02.000000000 +0100
@@ -7,6 +7,7 @@
${KASTATS_CURRENT_ROOT_SOURCE_DIR}/src
${KASTATS_CURRENT_ROOT_SOURCE_DIR}/autotests
${CMAKE_BINARY_DIR}/src
+ ${Boost_INCLUDE_DIR}
)
set (
