Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kactivities-stats for
openSUSE:Factory checked in at 2021-09-16 23:13:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kactivities-stats (Old)
and /work/SRC/openSUSE:Factory/.kactivities-stats.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kactivities-stats"
Thu Sep 16 23:13:45 2021 rev:66 rq:919170 version:5.86.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kactivities-stats/kactivities-stats.changes
2021-08-16 10:11:12.835124700 +0200
+++
/work/SRC/openSUSE:Factory/.kactivities-stats.new.1899/kactivities-stats.changes
2021-09-16 23:15:26.179845814 +0200
@@ -1,0 +2,14 @@
+Wed Sep 15 08:23:56 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Drop the unneeded baselibs.conf.
+
+-------------------------------------------------------------------
+Mon Sep 6 06:21:52 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.86.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.86.0
+- No code change since 5.85.0
+
+-------------------------------------------------------------------
Old:
----
baselibs.conf
kactivities-stats-5.85.0.tar.xz
kactivities-stats-5.85.0.tar.xz.sig
New:
----
kactivities-stats-5.86.0.tar.xz
kactivities-stats-5.86.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kactivities-stats.spec ++++++
--- /var/tmp/diff_new_pack.mJ7am3/_old 2021-09-16 23:15:26.739846394 +0200
+++ /var/tmp/diff_new_pack.mJ7am3/_new 2021-09-16 23:15:26.739846394 +0200
@@ -17,7 +17,7 @@
%define lname libKF5ActivitiesStats1
-%define _tar_path 5.85
+%define _tar_path 5.86
# 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.85.0
+Version: 5.86.0
Release: 0
Summary: KDE Plasma Activities support
License: LGPL-2.0-or-later
@@ -36,7 +36,6 @@
Source1:
https://download.kde.org/stable/frameworks/%{_tar_path}/kactivities-stats-%{version}.tar.xz.sig
Source2: frameworks.keyring
%endif
-Source99: baselibs.conf
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes
BuildRequires: kf5-filesystem
++++++ kactivities-stats-5.85.0.tar.xz -> kactivities-stats-5.86.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.85.0/.git-blame-ignore-revs
new/kactivities-stats-5.86.0/.git-blame-ignore-revs
--- old/kactivities-stats-5.85.0/.git-blame-ignore-revs 2021-07-20
00:07:21.000000000 +0200
+++ new/kactivities-stats-5.86.0/.git-blame-ignore-revs 2021-09-04
17:40:59.000000000 +0200
@@ -1,3 +1,4 @@
-#clang-format
+#clang-format/tidy
d56958d57537355c2c75c9504c1c650d429e0b2a
49283f7eb8f3c66f8710f33c6e464ffefa44b621
+4c5aeeac5428f687764db0ec68833dba800d4469
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.85.0/CMakeLists.txt
new/kactivities-stats-5.86.0/CMakeLists.txt
--- old/kactivities-stats-5.85.0/CMakeLists.txt 2021-07-20 00:07:21.000000000
+0200
+++ new/kactivities-stats-5.86.0/CMakeLists.txt 2021-09-04 17:40:59.000000000
+0200
@@ -2,11 +2,11 @@
cmake_minimum_required(VERSION 3.16)
-set(KF_VERSION "5.85.0") # handled by release scripts
-set(KF_DEP_VERSION "5.85.0") # handled by release scripts
+set(KF_VERSION "5.86.0") # handled by release scripts
+set(KF_DEP_VERSION "5.86.0") # handled by release scripts
project (KActivitiesStats VERSION ${KF_VERSION})
-set (REQUIRED_QT_VERSION 5.15.0)
+set (REQUIRED_QT_VERSION 5.15.2)
# We don't build in-source
if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
@@ -20,7 +20,7 @@
# Extra CMake stuff
include (FeatureSummary)
-find_package (ECM 5.85.0 NO_MODULE)
+find_package (ECM 5.86.0 NO_MODULE)
set_package_properties (ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL "https://commits.kde.org/extra-cmake-modules";)
feature_summary (WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -82,7 +82,7 @@
PACKAGE_VERSION_FILE
"${CMAKE_CURRENT_BINARY_DIR}/KF5ActivitiesStatsConfigVersion.cmake"
SOVERSION 1
)
-add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00)
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)
add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100)
add_subdirectory (src)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kactivities-stats-5.85.0/autotests/ResultSetQuickCheckTest.cpp
new/kactivities-stats-5.86.0/autotests/ResultSetQuickCheckTest.cpp
--- old/kactivities-stats-5.85.0/autotests/ResultSetQuickCheckTest.cpp
2021-07-20 00:07:21.000000000 +0200
+++ new/kactivities-stats-5.86.0/autotests/ResultSetQuickCheckTest.cpp
2021-09-04 17:40:59.000000000 +0200
@@ -313,8 +313,9 @@
auto *generator = QRandomGenerator::global();
for (const QString &resource : qAsConst(resourcesList)) {
// We want every n-th or so to be without the title
- if (generator->bounded(3))
+ if (generator->bounded(3)) {
continue;
+ }
ResourceInfo::Item ri;
ri.targettedResource = resource;
@@ -349,8 +350,9 @@
for (const QString &resource : qAsConst(resourcesList)) {
// We don't want all the resources to be linked
// to something
- if (generator->bounded(2))
+ if (generator->bounded(2)) {
continue;
+ }
ResourceLink::Item rl;
@@ -399,7 +401,9 @@
for (const auto &rsc : qAsConst(resourceScoreCaches)) {
std::cerr << '.';
- if (++i % 10 == 0) std::cerr << i;
+ if (++i % 10 == 0) {
+ std::cerr << i;
+ }
/* clang-format off */
database->execQuery(QStringLiteral(
@@ -440,7 +444,9 @@
for (const auto &ri : qAsConst(resourceInfos)) {
std::cerr << '.';
- if (++i % 10 == 0) std::cerr << i;
+ if (++i % 10 == 0) {
+ std::cerr << i;
+ }
/* clang-format off */
database->execQuery(QStringLiteral(
@@ -473,7 +479,9 @@
for (const auto &rl : qAsConst(resourceLinks)) {
std::cerr << '.';
- if (++i % 10 == 0) std::cerr << i;
+ if (++i % 10 == 0) {
+ std::cerr << i;
+ }
/* clang-format off */
database->execQuery(QStringLiteral(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.85.0/autotests/main.cpp
new/kactivities-stats-5.86.0/autotests/main.cpp
--- old/kactivities-stats-5.85.0/autotests/main.cpp 2021-07-20
00:07:21.000000000 +0200
+++ new/kactivities-stats-5.86.0/autotests/main.cpp 2021-09-04
17:40:59.000000000 +0200
@@ -25,8 +25,9 @@
TestRunner &addTest(Test *test)
{
- if (m_nextToStart == 0)
+ if (m_nextToStart == 0) {
m_tests << test;
+ }
return *this;
}
@@ -38,8 +39,9 @@
void start()
{
- if (m_nextToStart)
+ if (m_nextToStart) {
return;
+ }
if (m_tests.size() == 0) {
// We do not have a QCoreApplication here, calling system exit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.85.0/src/resultmodel.cpp
new/kactivities-stats-5.86.0/src/resultmodel.cpp
--- old/kactivities-stats-5.85.0/src/resultmodel.cpp 2021-07-20
00:07:21.000000000 +0200
+++ new/kactivities-stats-5.86.0/src/resultmodel.cpp 2021-09-04
17:40:59.000000000 +0200
@@ -124,7 +124,9 @@
QStringList linkedItems;
for (const ResultSet::Result &item : qAsConst(m_items)) {
- if (item.linkStatus() == ResultSet::Result::NotLinked) break;
+ if (item.linkStatus() == ResultSet::Result::NotLinked) {
+ break;
+ }
linkedItems << item.resource();
}
@@ -327,7 +329,9 @@
inline void clear()
{
- if (m_items.size() == 0) return;
+ if (m_items.size() == 0) {
+ return;
+ }
d->q->beginRemoveRows(QModelIndex(), 0, m_items.size() - 1);
m_items.clear();
@@ -391,7 +395,9 @@
// in the case where somebody called this with too much new items.
const int maxToReplace = m_countLimit - from;
- if (maxToReplace <= 0) return;
+ if (maxToReplace <= 0) {
+ return;
+ }
const auto newItemsEnd =
newItems.size() <= maxToReplace ? newItems.cend() :
@@ -504,7 +510,9 @@
inline void trim(int limit)
{
- if (m_items.size() <= limit) return;
+ if (m_items.size() <= limit) {
+ return;
+ }
// Example:
// limit is 5,
@@ -709,7 +717,9 @@
count = query.limit() - from;
}
- if (count <= 0) return;
+ if (count <= 0) {
+ return;
+ }
// In order to see whether there are more results, we need to pass
// the count increased by one
@@ -845,7 +855,9 @@
{
const auto result = cache.find(resource);
- if (!result) return;
+ if (!result) {
+ return;
+ }
if (query.selection() == Terms::UsedResources
|| result->linkStatus() != ResultSet::Result::Linked) {
@@ -864,7 +876,9 @@
{
const auto result = cache.find(resource);
- if (!result) return;
+ if (!result) {
+ return;
+ }
if (query.selection() == Terms::LinkedResources) {
removeResult(result);
@@ -886,7 +900,9 @@
//_ Title and mimetype functions
void fillTitleAndMimetype(ResultSet::Result &result)
{
- if (!database) return;
+ if (!database) {
+ return;
+ }
/* clang-format off */
auto query = database->execQuery(
@@ -910,7 +926,9 @@
{
const auto result = cache.find(resource);
- if (!result) return;
+ if (!result) {
+ return;
+ }
result->setTitle(title);
@@ -923,7 +941,9 @@
const auto result = cache.find(resource);
- if (!result) return;
+ if (!result) {
+ return;
+ }
result->setMimetype(mimetype);
@@ -1029,7 +1049,9 @@
void ResultModel::fetchMore(const QModelIndex &parent)
{
- if (parent.isValid()) return;
+ if (parent.isValid()) {
+ return;
+ }
d->fetch(ResultModelPrivate::FetchMore);
}
@@ -1059,7 +1081,9 @@
void ResultModel::forgetResource(int row)
{
- if (row >= d->cache.size()) return;
+ if (row >= d->cache.size()) {
+ return;
+ }
const auto lstActivities = d->query.activities();
for (const QString &activity : lstActivities) {
const auto lstAgents = d->query.agents();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.85.0/src/resultset.cpp
new/kactivities-stats-5.86.0/src/resultset.cpp
--- old/kactivities-stats-5.85.0/src/resultset.cpp 2021-07-20
00:07:21.000000000 +0200
+++ new/kactivities-stats-5.86.0/src/resultset.cpp 2021-09-04
17:40:59.000000000 +0200
@@ -141,7 +141,9 @@
QString agentClause(const QString &agent) const
{
- if (agent == QLatin1String(":any")) return QStringLiteral("1");
+ if (agent == QLatin1String(":any")) {
+ return QStringLiteral("1");
+ }
/* clang-format off */
return QStringLiteral("agent = '") + (
@@ -153,7 +155,9 @@
QString activityClause(const QString &activity) const
{
- if (activity == QLatin1String(":any")) return QStringLiteral("1");
+ if (activity == QLatin1String(":any")) {
+ return QStringLiteral("1");
+ }
/* clang-format off */
return QStringLiteral("activity = '") + (
@@ -172,17 +176,23 @@
QString urlFilterClause(const QString &urlFilter) const
{
- if (urlFilter == QLatin1String("*")) return QStringLiteral("1");
+ if (urlFilter == QLatin1String("*")) {
+ return QStringLiteral("1");
+ }
return QStringLiteral("resource LIKE '") +
Common::starPatternToLike(urlFilter) + QStringLiteral("' ESCAPE '\\'");
}
QString mimetypeClause(const QString &mimetype) const
{
- if (mimetype == ANY_TYPE_TAG || mimetype == QLatin1String("*")) return
QStringLiteral("1");
+ if (mimetype == ANY_TYPE_TAG || mimetype == QLatin1String("*")) {
+ return QStringLiteral("1");
- else if (mimetype == FILES_TYPE_TAG) return QStringLiteral("mimetype
!= 'inode/directory' AND mimetype != ''");
- else if (mimetype == DIRECTORIES_TYPE_TAG) return
QStringLiteral("mimetype = 'inode/directory'");
+ } else if (mimetype == FILES_TYPE_TAG) {
+ return QStringLiteral("mimetype != 'inode/directory' AND mimetype
!= ''");
+ } else if (mimetype == DIRECTORIES_TYPE_TAG) {
+ return QStringLiteral("mimetype = 'inode/directory'");
+ }
return QStringLiteral("mimetype LIKE '") +
Common::starPatternToLike(mimetype) + QStringLiteral("' ESCAPE '\\'");
}
@@ -275,7 +285,8 @@
QStringList mimetypeFilter = transformedList(
queryDefinition.types(), &ResultSetPrivate::mimetypeClause);
- QString dateColumn = QStringLiteral("1"), resourceEventJoin;
+ QString dateColumn = QStringLiteral("1");
+ QString resourceEventJoin;
// WHERE clause for access date filtering and ResourceEvent table Join
if (!queryDefinition.dateStart().isNull()) {
dateColumn = dateClause(queryDefinition.dateStart(),
queryDefinition.dateEnd());
@@ -492,7 +503,9 @@
{
ResultSet::Result result;
- if (!database || !query.isActive()) return result;
+ if (!database || !query.isActive()) {
+ return result;
+ }
result.setResource(query.value(QStringLiteral("resource")).toString());
result.setTitle(query.value(QStringLiteral("title")).toString());
@@ -570,7 +583,9 @@
ResultSet::Result ResultSet::at(int index) const
{
- if (!d->query.isActive()) return Result();
+ if (!d->query.isActive()) {
+ return Result();
+ }
d->query.seek(index);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.85.0/src/resultwatcher.cpp
new/kactivities-stats-5.86.0/src/resultwatcher.cpp
--- old/kactivities-stats-5.85.0/src/resultwatcher.cpp 2021-07-20
00:07:21.000000000 +0200
+++ new/kactivities-stats-5.86.0/src/resultwatcher.cpp 2021-09-04
17:40:59.000000000 +0200
@@ -135,8 +135,9 @@
auto database = Database::instance(Database::ResourcesDatabase,
Database::ReadOnly);
- if (!database)
+ if (!database) {
return QString();
+ }
auto query = database->execQuery(QStringLiteral("SELECT mimetype
FROM ResourceInfo WHERE "
"targettedResource
= '")
@@ -184,11 +185,13 @@
#endif
// The used resources do not really care about the linked ones
- if (query.selection() == Terms::UsedResources)
+ if (query.selection() == Terms::UsedResources) {
return;
+ }
- if (!eventMatches(agent, resource, activity))
+ if (!eventMatches(agent, resource, activity)) {
return;
+ }
// TODO: See whether it makes sense to have
// lastUpdate/firstUpdate here as well
@@ -202,11 +205,13 @@
#endif
// The used resources do not really care about the linked ones
- if (query.selection() == Terms::UsedResources)
+ if (query.selection() == Terms::UsedResources) {
return;
+ }
- if (!eventMatches(agent, resource, activity))
+ if (!eventMatches(agent, resource, activity)) {
return;
+ }
Q_EMIT q->resultUnlinked(resource);
}
@@ -220,11 +225,13 @@
"The activity should be always specified here, no magic
values");
// The linked resources do not really care about the stats
- if (query.selection() == Terms::LinkedResources)
+ if (query.selection() == Terms::LinkedResources) {
return;
+ }
- if (!eventMatches(agent, resource, activity))
+ if (!eventMatches(agent, resource, activity)) {
return;
+ }
Q_EMIT q->resultScoreUpdated(resource, score, lastUpdate, firstUpdate);
}
@@ -232,8 +239,9 @@
void onEarlierStatsDeleted(QString, int)
{
// The linked resources do not really care about the stats
- if (query.selection() == Terms::LinkedResources)
+ if (query.selection() == Terms::LinkedResources) {
return;
+ }
scheduleResultsInvalidation();
}
@@ -241,16 +249,18 @@
void onRecentStatsDeleted(QString, int, QString)
{
// The linked resources do not really care about the stats
- if (query.selection() == Terms::LinkedResources)
+ if (query.selection() == Terms::LinkedResources) {
return;
+ }
scheduleResultsInvalidation();
}
void onStatsForResourceDeleted(const QString &activity, const QString
&agent, const QString &resource)
{
- if (query.selection() == Terms::LinkedResources)
+ if (query.selection() == Terms::LinkedResources) {
return;
+ }
if (activityMatches(activity) && agentMatches(agent)) {
if (resource.contains(QLatin1Char('*'))) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.85.0/tests/model/window.cpp
new/kactivities-stats-5.86.0/tests/model/window.cpp
--- old/kactivities-stats-5.85.0/tests/model/window.cpp 2021-07-20
00:07:21.000000000 +0200
+++ new/kactivities-stats-5.86.0/tests/model/window.cpp 2021-09-04
17:40:59.000000000 +0200
@@ -211,8 +211,8 @@
/* clang-format on */
ui->comboPreset->addItem(QStringLiteral("Choose a preset"), QVariant());
- for (const auto& presetId: presets.keys()) {
- ui->comboPreset->addItem(presetId, presetId);
+ for (auto it = presets.cbegin(); it != presets.cend(); ++it) {
+ ui->comboPreset->addItem(it.key(), it.key());
}
connect(ui->comboPreset, SIGNAL(activated(int)),
@@ -227,7 +227,9 @@
{
const auto id = ui->comboPreset->currentData().toString();
- if (id.isEmpty()) return;
+ if (id.isEmpty()) {
+ return;
+ }
const auto &query = presets[id];
qDebug() << "Id: " << id;
