Hello community, here is the log from the commit of package kactivities-stats for openSUSE:Factory checked in at 2018-04-19 15:14:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kactivities-stats (Old) and /work/SRC/openSUSE:Factory/.kactivities-stats.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kactivities-stats" Thu Apr 19 15:14:12 2018 rev:24 rq:596847 version:5.45.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kactivities-stats/kactivities-stats.changes 2018-03-20 21:44:46.403354581 +0100 +++ /work/SRC/openSUSE:Factory/.kactivities-stats.new/kactivities-stats.changes 2018-04-19 15:15:33.516767853 +0200 @@ -1,0 +2,12 @@ +Sat Apr 14 13:19:02 CEST 2018 - [email protected] + +- Update to 5.45.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.45.0.php +- Changes since 5.44.0: + * Fix build + * Remove not necessary QtCore and co + * Do not assume SQLite works and do not terminate on errors + +------------------------------------------------------------------- Old: ---- kactivities-stats-5.44.0.tar.xz New: ---- kactivities-stats-5.45.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kactivities-stats.spec ++++++ --- /var/tmp/diff_new_pack.WJp13v/_old 2018-04-19 15:15:34.164742140 +0200 +++ /var/tmp/diff_new_pack.WJp13v/_new 2018-04-19 15:15:34.168741981 +0200 @@ -17,13 +17,13 @@ %define lname libKF5ActivitiesStats1 -%define _tar_path 5.44 +%define _tar_path 5.45 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kactivities-stats -Version: 5.44.0 +Version: 5.45.0 Release: 0 Summary: KDE Plasma Activities support License: LGPL-2.0-or-later ++++++ kactivities-stats-5.44.0.tar.xz -> kactivities-stats-5.45.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.44.0/CMakeLists.txt new/kactivities-stats-5.45.0/CMakeLists.txt --- old/kactivities-stats-5.44.0/CMakeLists.txt 2018-03-03 10:51:44.000000000 +0100 +++ new/kactivities-stats-5.45.0/CMakeLists.txt 2018-04-07 09:46:35.000000000 +0200 @@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.44.0") # handled by release scripts -set(KF5_DEP_VERSION "5.44.0") # handled by release scripts +set(KF5_VERSION "5.45.0") # handled by release scripts +set(KF5_DEP_VERSION "5.45.0") # handled by release scripts project (KActivitiesStats VERSION ${KF5_VERSION}) -set (REQUIRED_QT_VERSION 5.7.0) +set (REQUIRED_QT_VERSION 5.8.0) # 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.44.0 NO_MODULE) +find_package (ECM 5.45.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.44.0/autotests/main.cpp new/kactivities-stats-5.45.0/autotests/main.cpp --- old/kactivities-stats-5.44.0/autotests/main.cpp 2018-03-03 10:51:44.000000000 +0100 +++ new/kactivities-stats-5.45.0/autotests/main.cpp 2018-04-07 09:46:35.000000000 +0200 @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <QtTest/QtTest> +#include <QtTest> #include <QCoreApplication> #include <QList> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.44.0/src/common/database/Database.cpp new/kactivities-stats-5.45.0/src/common/database/Database.cpp --- old/kactivities-stats-5.44.0/src/common/database/Database.cpp 2018-03-03 10:51:44.000000000 +0100 +++ new/kactivities-stats-5.45.0/src/common/database/Database.cpp 2018-04-07 09:46:35.000000000 +0200 @@ -202,9 +202,11 @@ auto walResult = ptr->pragma(QStringLiteral("journal_mode = WAL")); if (walResult != "wal") { - qFatal("KActivities: Database can not be opened in WAL mode. Check the " - "SQLite version (required >3.7.0). And whether your filesystem " - "supports shared memory"); + qWarning("KActivities: Database can not be opened in WAL mode. Check the " + "SQLite version (required >3.7.0). And whether your filesystem " + "supports shared memory"); + + return nullptr; } // We don't have a big database, lets flush the WAL when diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.44.0/src/resultmodel.cpp new/kactivities-stats-5.45.0/src/resultmodel.cpp --- old/kactivities-stats-5.44.0/src/resultmodel.cpp 2018-03-03 10:51:44.000000000 +0100 +++ new/kactivities-stats-5.45.0/src/resultmodel.cpp 2018-04-07 09:46:35.000000000 +0200 @@ -891,6 +891,8 @@ //_ Title and mimetype functions void fillTitleAndMimetype(ResultSet::Result &result) { + if (!database) return; + auto query = database->execQuery( "SELECT " "title, mimetype " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.44.0/src/resultset.cpp new/kactivities-stats-5.45.0/src/resultset.cpp --- old/kactivities-stats-5.44.0/src/resultset.cpp 2018-03-03 10:51:44.000000000 +0100 +++ new/kactivities-stats-5.45.0/src/resultset.cpp 2018-04-07 09:46:35.000000000 +0200 @@ -134,10 +134,8 @@ : QString())); if (query.lastError().isValid()) { - qDebug() << "Error: " << query.lastError(); + qWarning() << "[Error at ResultSetPrivate::initQuery]: " << query.lastError(); } - - Q_ASSERT_X(query.isActive(), "ResultSet initQuery", "Query is not valid"); } QString agentClause(const QString &agent) const @@ -245,13 +243,13 @@ QStringList mimetypeFilter = transformedList( queryDefinition.types(), &ResultSetPrivate::mimetypeClause); - auto query = _query; + auto queryString = _query; - query.replace("ORDER_BY_CLAUSE", "ORDER BY $orderingColumn resource ASC") - .replace("LIMIT_CLAUSE", limitOffsetSuffix()); + queryString.replace("ORDER_BY_CLAUSE", "ORDER BY $orderingColumn resource ASC") + .replace("LIMIT_CLAUSE", limitOffsetSuffix()); return kamd::utils::debug_and_return(DEBUG_QUERIES, "Query: ", - query + queryString .replace(QLatin1String("$orderingColumn"), orderingColumn) .replace(QLatin1String("$agentsFilter"), agentsFilter.join(QStringLiteral(" OR "))) .replace(QLatin1String("$activitiesFilter"), activitiesFilter.join(QStringLiteral(" OR "))) @@ -265,7 +263,7 @@ // TODO: We need to correct the scores based on the time that passed // since the cache was last updated, although, for this query, // scores are not that important. - static const QString query = + static const QString queryString = R"sql( SELECT rl.targettedResource as resource @@ -302,14 +300,14 @@ )sql" ; - return query; + return queryString; } static const QString &usedResourcesQuery() { // TODO: We need to correct the scores based on the time that passed // since the cache was last updated - static const QString query = + static const QString queryString = R"sql( SELECT rsc.targettedResource as resource @@ -341,7 +339,7 @@ )sql" ; - return query; + return queryString; } static const QString &allResourcesQuery() @@ -349,7 +347,7 @@ // TODO: We need to correct the scores based on the time that passed // since the cache was last updated, although, for this query, // scores are not that important. - static const QString query = + static const QString queryString = R"sql( WITH LinkedResourcesResults AS ( @@ -431,12 +429,15 @@ )sql" ; - return query; + return queryString; } ResultSet::Result currentResult() const { ResultSet::Result result; + + if (!database || !query.isActive()) return result; + result.setResource(query.value(QStringLiteral("resource")).toString()); result.setTitle(query.value(QStringLiteral("title")).toString()); result.setMimetype(query.value(QStringLiteral("mimetype")).toString()); @@ -448,19 +449,19 @@ result.setLinkStatus( (ResultSet::Result::LinkStatus)query.value(QStringLiteral("linkStatus")).toInt()); - auto query = database->createQuery(); + auto linkedActivitiesQuery = database->createQuery(); - query.prepare(R"sql( + linkedActivitiesQuery.prepare(R"sql( SELECT usedActivity FROM ResourceLink WHERE targettedResource = :resource )sql"); - query.bindValue(":resource", result.resource()); - query.exec(); + linkedActivitiesQuery.bindValue(":resource", result.resource()); + linkedActivitiesQuery.exec(); QStringList linkedActivities; - for (const auto &item: query) { + for (const auto &item: linkedActivitiesQuery) { linkedActivities << item[0].toString(); } @@ -471,7 +472,7 @@ } }; -ResultSet::ResultSet(Query query) +ResultSet::ResultSet(Query queryDefinition) : d(new ResultSetPrivate()) { using namespace Common; @@ -483,10 +484,9 @@ "that you do not have the Activity Manager running, or that " "something else is broken on your system. Recent documents and " "alike will not work!"; - Q_ASSERT_X((bool)d->database, "ResultSet constructor", "Database is NULL"); } - d->queryDefinition = query; + d->queryDefinition = queryDefinition; d->initQuery(); } @@ -515,7 +515,7 @@ ResultSet::Result ResultSet::at(int index) const { - Q_ASSERT_X(d->query.isActive(), "ResultSet::at", "Query is not active"); + if (!d->query.isActive()) return Result(); d->query.seek(index); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.44.0/src/resultwatcher.cpp new/kactivities-stats-5.45.0/src/resultwatcher.cpp --- old/kactivities-stats-5.44.0/src/resultwatcher.cpp 2018-03-03 10:51:44.000000000 +0100 +++ new/kactivities-stats-5.45.0/src/resultwatcher.cpp 2018-04-07 09:46:35.000000000 +0200 @@ -159,11 +159,15 @@ auto type = kamd::utils::make_lazy_val([&] () -> QString { using Common::Database; - auto query + auto database = Database::instance(Database::ResourcesDatabase, - Database::ReadOnly) - ->execQuery("SELECT mimetype FROM ResourceInfo WHERE " - "targettedResource = '" + resource + "'"); + Database::ReadOnly); + + if (!database) return QString(); + + auto query + = database->execQuery("SELECT mimetype FROM ResourceInfo WHERE " + "targettedResource = '" + resource + "'"); for (const auto &item : query) { return item[0].toString(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.44.0/tests/model/modeltest.cpp new/kactivities-stats-5.45.0/tests/model/modeltest.cpp --- old/kactivities-stats-5.44.0/tests/model/modeltest.cpp 2018-03-03 10:51:44.000000000 +0100 +++ new/kactivities-stats-5.45.0/tests/model/modeltest.cpp 2018-04-07 09:46:35.000000000 +0200 @@ -41,8 +41,8 @@ #include "modeltest.h" -#include <QtCore/QtCore> -#include <QtTest/QtTest> +#include <QtCore> +#include <QtTest> /*! Connect to all of the models signals. Whenever anything happens recheck everything. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.44.0/tests/model/modeltest.h new/kactivities-stats-5.45.0/tests/model/modeltest.h --- old/kactivities-stats-5.44.0/tests/model/modeltest.h 2018-03-03 10:51:44.000000000 +0100 +++ new/kactivities-stats-5.45.0/tests/model/modeltest.h 2018-04-07 09:46:35.000000000 +0200 @@ -43,9 +43,9 @@ #ifndef MODELTEST_H #define MODELTEST_H -#include <QtCore/QObject> -#include <QtCore/QAbstractItemModel> -#include <QtCore/QStack> +#include <QObject> +#include <QAbstractItemModel> +#include <QStack> class ModelTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.44.0/tests/model/window.cpp new/kactivities-stats-5.45.0/tests/model/window.cpp --- old/kactivities-stats-5.44.0/tests/model/window.cpp 2018-03-03 10:51:44.000000000 +0100 +++ new/kactivities-stats-5.45.0/tests/model/window.cpp 2018-04-07 09:46:35.000000000 +0200 @@ -22,6 +22,7 @@ #include "ui_window.h" #include "modeltest.h" +#include <QAction> #include <QListView> #include <QDebug> #include <QCoreApplication>
