Hello community,
here is the log from the commit of package kactivities-stats for
openSUSE:Factory checked in at 2020-12-15 12:28:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kactivities-stats (Old)
and /work/SRC/openSUSE:Factory/.kactivities-stats.new.2328 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kactivities-stats"
Tue Dec 15 12:28:02 2020 rev:57 rq:855406 version:5.77.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kactivities-stats/kactivities-stats.changes
2020-11-23 10:31:33.117431097 +0100
+++
/work/SRC/openSUSE:Factory/.kactivities-stats.new.2328/kactivities-stats.changes
2020-12-15 12:29:53.447976442 +0100
@@ -1,0 +2,14 @@
+Sat Dec 5 18:56:12 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.77.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/kde-frameworks-5.77.0
+- Changes since 5.76.0:
+ * Port deprecated method
+ * Port QRegExp to QRegularExpression
+ * Removed debugging output
+ * ResultModel: expose resource MimeType
+ * Add event filtering for files and directories (kde#428085)
+
+-------------------------------------------------------------------
Old:
----
kactivities-stats-5.76.0.tar.xz
kactivities-stats-5.76.0.tar.xz.sig
New:
----
kactivities-stats-5.77.0.tar.xz
kactivities-stats-5.77.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kactivities-stats.spec ++++++
--- /var/tmp/diff_new_pack.GsbMe4/_old 2020-12-15 12:29:54.159977016 +0100
+++ /var/tmp/diff_new_pack.GsbMe4/_new 2020-12-15 12:29:54.167977023 +0100
@@ -17,7 +17,7 @@
%define lname libKF5ActivitiesStats1
-%define _tar_path 5.76
+%define _tar_path 5.77
# 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.76.0
+Version: 5.77.0
Release: 0
Summary: KDE Plasma Activities support
License: LGPL-2.0-or-later
@@ -44,9 +44,9 @@
BuildRequires: xz
BuildRequires: cmake(KF5Activities) >= %{_kf5_bugfix_version}
BuildRequires: cmake(KF5Config) >= %{_kf5_bugfix_version}
-BuildRequires: cmake(Qt5Core) >= 5.12.0
-BuildRequires: cmake(Qt5DBus) >= 5.12.0
-BuildRequires: cmake(Qt5Sql) >= 5.12.0
+BuildRequires: cmake(Qt5Core) >= 5.13.0
+BuildRequires: cmake(Qt5DBus) >= 5.13.0
+BuildRequires: cmake(Qt5Sql) >= 5.13.0
%description
Kactivities provides an API for using and interacting with the Plasma
Activities Manager.
@@ -63,7 +63,7 @@
Group: Development/Libraries/KDE
Requires: %{lname} = %{version}
Requires: extra-cmake-modules >= 1.7.0
-Requires: cmake(Qt5Core) >= 5.12.0
+Requires: cmake(Qt5Core) >= 5.13.0
%description devel
Kactivities provides an API for using and interacting with the Plasma
Activities Manager.
++++++ kactivities-stats-5.76.0.tar.xz -> kactivities-stats-5.77.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.76.0/CMakeLists.txt
new/kactivities-stats-5.77.0/CMakeLists.txt
--- old/kactivities-stats-5.76.0/CMakeLists.txt 2020-11-07 12:32:44.000000000
+0100
+++ new/kactivities-stats-5.77.0/CMakeLists.txt 2020-12-05 11:02:10.000000000
+0100
@@ -2,11 +2,11 @@
cmake_minimum_required(VERSION 3.5)
-set(KF5_VERSION "5.76.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.76.0") # handled by release scripts
+set(KF5_VERSION "5.77.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.77.0") # handled by release scripts
project (KActivitiesStats VERSION ${KF5_VERSION})
-set (REQUIRED_QT_VERSION 5.12.0)
+set (REQUIRED_QT_VERSION 5.13.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.76.0 NO_MODULE)
+find_package (ECM 5.77.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)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kactivities-stats-5.76.0/src/common/database/Database.h
new/kactivities-stats-5.77.0/src/common/database/Database.h
--- old/kactivities-stats-5.76.0/src/common/database/Database.h 2020-11-07
12:32:44.000000000 +0100
+++ new/kactivities-stats-5.77.0/src/common/database/Database.h 2020-12-05
11:02:10.000000000 +0100
@@ -10,7 +10,7 @@
#include <utils/d_ptr.h>
#include <memory>
#include <QSqlQuery>
-#include <QRegExp>
+#include <QRegularExpression>
namespace Common {
@@ -127,9 +127,11 @@
return parseStarPattern(pattern, QStringLiteral("%"),
escapeSqliteLikePattern);
}
-inline QRegExp starPatternToRegex(const QString &pattern)
+inline QRegularExpression starPatternToRegex(const QString &pattern)
{
- return QRegExp(parseStarPattern(pattern, QStringLiteral(".*"),
QRegExp::escape));
+ const QString parsed = parseStarPattern(pattern, QStringLiteral(".*"),
+ QOverload<const QString
&>::of(&QRegularExpression::escape));
+ return QRegularExpression(QRegularExpression::anchoredPattern(parsed));
}
} // namespace Common
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.76.0/src/resultmodel.cpp
new/kactivities-stats-5.77.0/src/resultmodel.cpp
--- old/kactivities-stats-5.76.0/src/resultmodel.cpp 2020-11-07
12:32:44.000000000 +0100
+++ new/kactivities-stats-5.77.0/src/resultmodel.cpp 2020-12-05
11:02:10.000000000 +0100
@@ -967,7 +967,8 @@
{ FirstUpdateRole , "created" },
{ LastUpdateRole , "modified" },
{ LinkStatusRole , "linkStatus" },
- { LinkedActivitiesRole , "linkedActivities" }
+ { LinkedActivitiesRole , "linkedActivities" },
+ { MimeType , "mimeType" },
};
}
@@ -994,6 +995,7 @@
: role == LastUpdateRole ? result.lastUpdate()
: role == LinkStatusRole ? result.linkStatus()
: role == LinkedActivitiesRole ? result.linkedActivities()
+ : role == MimeType ? result.mimetype()
: QVariant()
;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.76.0/src/resultmodel.h
new/kactivities-stats-5.77.0/src/resultmodel.h
--- old/kactivities-stats-5.76.0/src/resultmodel.h 2020-11-07
12:32:44.000000000 +0100
+++ new/kactivities-stats-5.77.0/src/resultmodel.h 2020-12-05
11:02:10.000000000 +0100
@@ -45,7 +45,8 @@
FirstUpdateRole = Qt::UserRole + 3,
LastUpdateRole = Qt::UserRole + 4,
LinkStatusRole = Qt::UserRole + 5,
- LinkedActivitiesRole = Qt::UserRole + 6
+ LinkedActivitiesRole = Qt::UserRole + 6,
+ MimeType = Qt::UserRole + 7 // @since 5.77
};
int rowCount(const QModelIndex &parent
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.76.0/src/resultwatcher.cpp
new/kactivities-stats-5.77.0/src/resultwatcher.cpp
--- old/kactivities-stats-5.76.0/src/resultwatcher.cpp 2020-11-07
12:32:44.000000000 +0100
+++ new/kactivities-stats-5.77.0/src/resultwatcher.cpp 2020-12-05
11:02:10.000000000 +0100
@@ -12,7 +12,7 @@
#include <QSqlError>
#include <QCoreApplication>
#include <QList>
-#include <QRegExp>
+#include <QRegularExpression>
// Local
#include <common/database/Database.h>
@@ -49,7 +49,7 @@
class ResultWatcherPrivate {
public:
mutable ActivitiesSync::ConsumerPtr activities;
- QList<QRegExp> urlFilters;
+ QList<QRegularExpression> urlFilters;
ResultWatcherPrivate(ResultWatcher *parent, Query query)
: linking(new KAMD_DBUS_CLASS_INTERFACE(Resources/Linking,
ResourcesLinking, nullptr))
@@ -132,8 +132,8 @@
#endif
return kamd::utils::debug_and_return(DEBUG_MATCHERS, " -> returning ",
- any_of(urlFilters, [&] (const QRegExp &matcher) {
- return matcher.exactMatch(url);
+ any_of(urlFilters, [&] (const QRegularExpression &matcher) {
+ return matcher.match(url).hasMatch();
}
));
}
@@ -169,7 +169,15 @@
return kamd::utils::debug_and_return(DEBUG_MATCHERS, " -> returning ",
any_of(query.types(), [&] (const QString &matcher) {
- return matcher == ANY_TYPE_TAG || matcher == type;
+ if (matcher == ANY_TYPE_TAG) {
+ return true;
+ }
+
+ const QString _type = type;
+ return matcher == ANY_TYPE_TAG
+ || (matcher == FILES_TYPE_TAG && !_type.isEmpty() && _type
!= QStringLiteral("inode/directory"))
+ || (matcher == DIRECTORIES_TYPE_TAG && _type ==
QLatin1String("inode/directory"))
+ || matcher == type;
}
));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.76.0/tests/model/window.cpp
new/kactivities-stats-5.77.0/tests/model/window.cpp
--- old/kactivities-stats-5.76.0/tests/model/window.cpp 2020-11-07
12:32:44.000000000 +0100
+++ new/kactivities-stats-5.77.0/tests/model/window.cpp 2020-12-05
11:02:10.000000000 +0100
@@ -339,7 +339,11 @@
Activity(ui->comboActivity->currentText().split(QLatin1Char(','))) |
// And URL filters
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
Url(ui->textUrl->text().split(QLatin1Char(','),
QString::SkipEmptyParts)) |
+#else
+ Url(ui->textUrl->text().split(QLatin1Char(','), Qt::SkipEmptyParts)) |
+#endif
// And date filter
(
_______________________________________________
openSUSE Commits mailing list -- [email protected]
To unsubscribe, email [email protected]
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/[email protected]
