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 2022-02-24 18:19:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kactivities-stats (Old)
and /work/SRC/openSUSE:Factory/.kactivities-stats.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kactivities-stats"
Thu Feb 24 18:19:15 2022 rev:71 rq:954224 version:5.91.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kactivities-stats/kactivities-stats.changes
2022-01-11 21:18:16.580916910 +0100
+++
/work/SRC/openSUSE:Factory/.kactivities-stats.new.1958/kactivities-stats.changes
2022-02-24 18:21:17.350692993 +0100
@@ -1,0 +2,12 @@
+Sun Feb 6 10:16:47 UTC 2022 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.91.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.91.0
+- Changes since 5.90.0:
+ * Add Linux Qt6 CI
+ * Utilize ECMDeprecationSettings to manage deprecate Qt/KF API
+ * reduce boost
+
+-------------------------------------------------------------------
Old:
----
kactivities-stats-5.90.0.tar.xz
kactivities-stats-5.90.0.tar.xz.sig
New:
----
kactivities-stats-5.91.0.tar.xz
kactivities-stats-5.91.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kactivities-stats.spec ++++++
--- /var/tmp/diff_new_pack.vSKu0H/_old 2022-02-24 18:21:17.906692844 +0100
+++ /var/tmp/diff_new_pack.vSKu0H/_new 2022-02-24 18:21:17.910692843 +0100
@@ -17,7 +17,7 @@
%define lname libKF5ActivitiesStats1
-%define _tar_path 5.90
+%define _tar_path 5.91
# 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 released
Name: kactivities-stats
-Version: 5.90.0
+Version: 5.91.0
Release: 0
Summary: KDE Plasma Activities support
License: LGPL-2.0-or-later
@@ -39,7 +39,6 @@
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes
BuildRequires: kf5-filesystem
-BuildRequires: libboost_headers-devel
BuildRequires: xz
BuildRequires: cmake(KF5Activities) >= %{_kf5_bugfix_version}
BuildRequires: cmake(KF5Config) >= %{_kf5_bugfix_version}
@@ -91,9 +90,7 @@
%files devel
%{_kf5_libdir}/libKF5ActivitiesStats.so
%{_kf5_libdir}/cmake/KF5ActivitiesStats/
-%dir %{_kf5_includedir}/*/
-%{_kf5_includedir}/*/
-%{_kf5_includedir}/*.h
+%{_kf5_includedir}/KActivitiesStats/
%{_kf5_libdir}/pkgconfig/libKActivitiesStats.pc
%{_kf5_mkspecsdir}/qt_KActivitiesStats.pri
++++++ kactivities-stats-5.90.0.tar.xz -> kactivities-stats-5.91.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.90.0/.gitignore
new/kactivities-stats-5.91.0/.gitignore
--- old/kactivities-stats-5.90.0/.gitignore 2022-01-01 13:11:13.000000000
+0100
+++ new/kactivities-stats-5.91.0/.gitignore 2022-02-05 16:09:23.000000000
+0100
@@ -22,3 +22,4 @@
.idea
/cmake-build*
.cache
+/build*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.90.0/.gitlab-ci.yml
new/kactivities-stats-5.91.0/.gitlab-ci.yml
--- old/kactivities-stats-5.90.0/.gitlab-ci.yml 2022-01-01 13:11:13.000000000
+0100
+++ new/kactivities-stats-5.91.0/.gitlab-ci.yml 2022-02-05 16:09:23.000000000
+0100
@@ -4,3 +4,4 @@
include:
-
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
-
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
+ -
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.90.0/CMakeLists.txt
new/kactivities-stats-5.91.0/CMakeLists.txt
--- old/kactivities-stats-5.90.0/CMakeLists.txt 2022-01-01 13:11:13.000000000
+0100
+++ new/kactivities-stats-5.91.0/CMakeLists.txt 2022-02-05 16:09:23.000000000
+0100
@@ -2,8 +2,8 @@
cmake_minimum_required(VERSION 3.16)
-set(KF_VERSION "5.90.0") # handled by release scripts
-set(KF_DEP_VERSION "5.90.0") # handled by release scripts
+set(KF_VERSION "5.91.0") # handled by release scripts
+set(KF_DEP_VERSION "5.91.0") # handled by release scripts
project (KActivitiesStats VERSION ${KF_VERSION})
set (REQUIRED_QT_VERSION 5.15.2)
@@ -20,7 +20,7 @@
# Extra CMake stuff
include (FeatureSummary)
-find_package (ECM 5.90.0 NO_MODULE)
+find_package (ECM 5.91.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)
@@ -35,6 +35,7 @@
include (ECMGeneratePkgConfigFile)
include (ECMAddQch)
include (ECMQtDeclareLoggingCategory)
+include(ECMDeprecationSettings)
option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt
Assistant, Qt Creator & KDevelop)" OFF)
add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g.
Qt Assistant, Qt Creator & KDevelop)")
@@ -50,7 +51,7 @@
find_package (KF5Activities ${KF_DEP_VERSION} CONFIG REQUIRED)
set(Boost_NO_BOOST_CMAKE ON)
-find_package (Boost 1.49 REQUIRED)
+find_package (Boost 1.49)
# Basic includes
include (CPack)
@@ -83,12 +84,17 @@
PACKAGE_VERSION_FILE
"${CMAKE_CURRENT_BINARY_DIR}/KF5ActivitiesStatsConfigVersion.cmake"
SOVERSION 1
)
-add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)
-add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055900)
+ecm_set_disabled_deprecation_versions(
+ QT 5.15.2
+ KF 5.90.0
+)
+
add_subdirectory (src)
if(BUILD_TESTING)
- add_subdirectory (autotests)
+ if (Boost_FOUND)
+ add_subdirectory (autotests)
+ endif ()
add_subdirectory (tests)
endif (BUILD_TESTING)
@@ -126,7 +132,7 @@
install (
FILES ${CMAKE_CURRENT_BINARY_DIR}/kactivitiesstats_version.h
- DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KActivitiesStats COMPONENT Devel
)
# Write out the features
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kactivities-stats-5.90.0/autotests/ResultSetQuickCheckTest.h
new/kactivities-stats-5.91.0/autotests/ResultSetQuickCheckTest.h
--- old/kactivities-stats-5.90.0/autotests/ResultSetQuickCheckTest.h
2022-01-01 13:11:13.000000000 +0100
+++ new/kactivities-stats-5.91.0/autotests/ResultSetQuickCheckTest.h
2022-02-05 16:09:23.000000000 +0100
@@ -13,15 +13,12 @@
#include <memory>
#include <QScopedPointer>
-#include <boost/container/flat_set.hpp>
#include <set>
#include "quickcheck/tables/ResourceInfo.h"
#include "quickcheck/tables/ResourceLink.h"
#include "quickcheck/tables/ResourceScoreCache.h"
-using boost::container::flat_set;
-
class ResultSetQuickCheckTest : public Test
{
Q_OBJECT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.90.0/autotests/ResultSetTest.cpp
new/kactivities-stats-5.91.0/autotests/ResultSetTest.cpp
--- old/kactivities-stats-5.90.0/autotests/ResultSetTest.cpp 2022-01-01
13:11:13.000000000 +0100
+++ new/kactivities-stats-5.91.0/autotests/ResultSetTest.cpp 2022-02-05
16:09:23.000000000 +0100
@@ -14,16 +14,14 @@
#include <QTemporaryDir>
#include <QTest>
-#include <boost/range/adaptor/transformed.hpp>
-#include <boost/range/algorithm.hpp>
-#include <boost/range/numeric.hpp>
-
#include <query.h>
#include <resultset.h>
#include <common/database/Database.h>
#include <common/database/schema/ResourcesDatabaseSchema.h>
+#include <numeric>
+
namespace KAStats = KActivities::Stats;
ResultSetTest::ResultSetTest(QObject *parent)
@@ -33,17 +31,15 @@
namespace
{
-QString getBarredUri(const KAStats::ResultSet::Result &result)
+QString getBarredUri(QString lhs, const KAStats::ResultSet::Result &result)
{
- return result.resource() + QStringLiteral("|");
+ return lhs + result.resource() + QStringLiteral("|");
}
QString concatenateResults(const KAStats::ResultSet &results)
{
- using boost::accumulate;
- using boost::adaptors::transformed;
-
- return accumulate(results | transformed(getBarredUri),
QStringLiteral("|"));
+ return std::accumulate(results.cbegin(), results.cend(),
QStringLiteral("|"),
+ getBarredUri);
}
}
@@ -57,11 +53,11 @@
ResultSet::Result r;
r.setResource(QStringLiteral("quack"));
- QCOMPARE(getBarredUri(KAStats::ResultSet::Result{}),
QStringLiteral("|"));
- QCOMPARE(getBarredUri(r), QStringLiteral("quack|"));
+ QCOMPARE(getBarredUri(QString(), KAStats::ResultSet::Result{}),
QStringLiteral("|"));
+ QCOMPARE(getBarredUri(QString(), r), QStringLiteral("quack|"));
r.setResource(QStringLiteral("http://www.kde.org";));
- QVERIFY(getBarredUri(r).startsWith(QStringLiteral("http://";)));
- QVERIFY(getBarredUri(r).endsWith(QStringLiteral("org|")));
+ QVERIFY(getBarredUri(QString(),
r).startsWith(QStringLiteral("http://";)));
+ QVERIFY(getBarredUri(QString(), r).endsWith(QStringLiteral("org|")));
}
TEST_CHUNK(QStringLiteral("Checking empty concatenation"))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kactivities-stats-5.90.0/autotests/ResultWatcherTest.cpp
new/kactivities-stats-5.91.0/autotests/ResultWatcherTest.cpp
--- old/kactivities-stats-5.90.0/autotests/ResultWatcherTest.cpp
2022-01-01 13:11:13.000000000 +0100
+++ new/kactivities-stats-5.91.0/autotests/ResultWatcherTest.cpp
2022-02-05 16:09:23.000000000 +0100
@@ -15,10 +15,6 @@
#include <QTest>
#include <QTime>
-#include <boost/range/adaptor/transformed.hpp>
-#include <boost/range/algorithm.hpp>
-#include <boost/range/numeric.hpp>
-
#include <KActivities/ResourceInstance>
#include <query.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.90.0/metainfo.yaml
new/kactivities-stats-5.91.0/metainfo.yaml
--- old/kactivities-stats-5.90.0/metainfo.yaml 2022-01-01 13:11:13.000000000
+0100
+++ new/kactivities-stats-5.91.0/metainfo.yaml 2022-02-05 16:09:23.000000000
+0100
@@ -4,9 +4,9 @@
type: solution
platforms:
- name: Linux
- note: Needs QtDBus, QtSql, KActivities, boost
- - name: FreeBSD
- note: Needs QtDBus, QtSql, KActivities, boost
+ note: Needs QtDBus, QtSql, KActivities, Boost (optional, for autotests)
+ - name: FreeBSD
+ note: Needs QtDBus, QtSql, KActivities, Boost (optional, for autotests)
portingAid: false
deprecated: false
release: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.90.0/src/CMakeLists.txt
new/kactivities-stats-5.91.0/src/CMakeLists.txt
--- old/kactivities-stats-5.90.0/src/CMakeLists.txt 2022-01-01
13:11:13.000000000 +0100
+++ new/kactivities-stats-5.91.0/src/CMakeLists.txt 2022-02-05
16:09:23.000000000 +0100
@@ -64,7 +64,6 @@
PUBLIC
Qt${QT_MAJOR_VERSION}::Core
PRIVATE
- Boost::boost
Qt${QT_MAJOR_VERSION}::DBus
Qt${QT_MAJOR_VERSION}::Sql
KF5::Activities
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.90.0/src/resultmodel.cpp
new/kactivities-stats-5.91.0/src/resultmodel.cpp
--- old/kactivities-stats-5.90.0/src/resultmodel.cpp 2022-01-01
13:11:13.000000000 +0100
+++ new/kactivities-stats-5.91.0/src/resultmodel.cpp 2022-02-05
16:09:23.000000000 +0100
@@ -13,10 +13,8 @@
#include <QCoreApplication>
#include <QFile>
-// STL and Boost
+// STL
#include <functional>
-#include <boost/range/algorithm/find_if.hpp>
-#include <boost/range/algorithm/count_if.hpp>
// KDE
#include <KSharedConfig>
@@ -265,10 +263,10 @@
inline FindCacheResult find(const QString &resource)
{
using namespace kamd::utils::member_matcher;
- using boost::find_if;
+ // Non-const iterator because the result is constructed from it
return FindCacheResult(
- this, find_if(m_items, member(&ResultSet::Result::resource)
+ this, std::find_if(m_items.begin(), m_items.end(),
member(&ResultSet::Result::resource)
== resource));
}
@@ -276,7 +274,7 @@
inline FindCacheResult lowerBoundWithSkippedResource(Predicate
&&lessThanPredicate)
{
using namespace kamd::utils::member_matcher;
- const int count = boost::count_if(m_items,
+ const int count = std::count_if(m_items.cbegin(), m_items.cend(),
[&] (const ResultSet::Result &result) {
return lessThanPredicate(result, _);
});
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.90.0/src/resultset.cpp
new/kactivities-stats-5.91.0/src/resultset.cpp
--- old/kactivities-stats-5.90.0/src/resultset.cpp 2022-01-01
13:11:13.000000000 +0100
+++ new/kactivities-stats-5.91.0/src/resultset.cpp 2022-02-05
16:09:23.000000000 +0100
@@ -20,8 +20,7 @@
#include <utils/qsqlquery_iterator.h>
#include "kactivities-stats-logsettings.h"
-// Boost and STL
-#include <boost/range/algorithm/transform.hpp>
+// STL
#include <iterator>
#include <functional>
#include <mutex>
@@ -231,7 +230,7 @@
using namespace std::placeholders;
QStringList result;
- boost::transform(input,
+ std::transform(input.cbegin(), input.cend(),
std::back_inserter(result),
std::bind(f, this, _1));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.90.0/src/resultset.h
new/kactivities-stats-5.91.0/src/resultset.h
--- old/kactivities-stats-5.90.0/src/resultset.h 2022-01-01
13:11:13.000000000 +0100
+++ new/kactivities-stats-5.91.0/src/resultset.h 2022-02-05
16:09:23.000000000 +0100
@@ -88,7 +88,7 @@
/**
* ResultSet is a container. This notifies the generic algorithms
- * from STLboost, and others of the contained type.
+ * from STL and others of the contained type.
*/
typedef Result value_type;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.90.0/src/resultset_iterator.cpp
new/kactivities-stats-5.91.0/src/resultset_iterator.cpp
--- old/kactivities-stats-5.90.0/src/resultset_iterator.cpp 2022-01-01
13:11:13.000000000 +0100
+++ new/kactivities-stats-5.91.0/src/resultset_iterator.cpp 2022-02-05
16:09:23.000000000 +0100
@@ -4,7 +4,7 @@
SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR
LicenseRef-KDE-Accepted-LGPL
*/
-#include <boost/optional.hpp>
+#include <optional>
namespace KActivities
{
@@ -28,7 +28,7 @@
const ResultSet *resultSet;
int currentRow;
- boost::optional<ResultSet::Result> currentValue;
+ std::optional<ResultSet::Result> currentValue;
inline void moveTo(int row)
{
@@ -45,14 +45,12 @@
void updateValue()
{
- using namespace boost;
-
if (!resultSet || !resultSet->d->query.seek(currentRow)) {
- currentValue = none;
+ currentValue.reset();
} else {
auto value = resultSet->d->currentResult();
- currentValue = make_optional(std::move(value));
+ currentValue = std::move(value);
}
}
@@ -65,8 +63,8 @@
bool operator==(const ResultSet_IteratorPrivate &other) const
{
- bool thisValid = currentValue.is_initialized();
- bool otherValid = other.currentValue.is_initialized();
+ bool thisValid = currentValue.has_value();
+ bool otherValid = other.currentValue.has_value();
return
// If one is valid, and the other is not,
@@ -83,7 +81,7 @@
bool isValid() const
{
- return currentValue.is_initialized();
+ return currentValue.has_value();
}
static bool sameSource(const ResultSet_IteratorPrivate &left, const
ResultSet_IteratorPrivate &right)
@@ -126,12 +124,12 @@
iterator::reference iterator::operator*() const
{
- return d->currentValue.get();
+ return d->currentValue.value();
}
iterator::pointer iterator::operator->() const
{
- return &d->currentValue.get();
+ return &d->currentValue.value();
}
// prefix
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.90.0/src/resultwatcher.cpp
new/kactivities-stats-5.91.0/src/resultwatcher.cpp
--- old/kactivities-stats-5.90.0/src/resultwatcher.cpp 2022-01-01
13:11:13.000000000 +0100
+++ new/kactivities-stats-5.91.0/src/resultwatcher.cpp 2022-02-05
16:09:23.000000000 +0100
@@ -18,8 +18,7 @@
#include <common/database/Database.h>
#include <utils/debug_and_return.h>
-// Boost and STL
-#include <boost/range/algorithm/transform.hpp>
+// STL
#include <functional>
#include <iterator>
#include <limits>
@@ -67,7 +66,6 @@
QObject::connect(&m_resultInvalidationTimer, &QTimer::timeout, q,
Q_EMIT & ResultWatcher::resultsInvalidated);
}
- // Like boost any_of, but returning true if the range is empty
template<typename Collection, typename Predicate>
inline bool any_of(const Collection &collection, Predicate &&predicate)
const
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.90.0/tests/model/CMakeLists.txt
new/kactivities-stats-5.91.0/tests/model/CMakeLists.txt
--- old/kactivities-stats-5.90.0/tests/model/CMakeLists.txt 2022-01-01
13:11:13.000000000 +0100
+++ new/kactivities-stats-5.91.0/tests/model/CMakeLists.txt 2022-02-05
16:09:23.000000000 +0100
@@ -34,7 +34,6 @@
target_link_libraries (
KActivitiesStatsTestApp
- Boost::boost
Qt${QT_MAJOR_VERSION}::Core
Qt${QT_MAJOR_VERSION}::Gui
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kactivities-stats-5.90.0/tests/model/window.cpp
new/kactivities-stats-5.91.0/tests/model/window.cpp
--- old/kactivities-stats-5.90.0/tests/model/window.cpp 2022-01-01
13:11:13.000000000 +0100
+++ new/kactivities-stats-5.91.0/tests/model/window.cpp 2022-02-05
16:09:23.000000000 +0100
@@ -23,8 +23,6 @@
#include <KActivities/Consumer>
-#include <boost/range/numeric.hpp>
-
namespace KAStats = KActivities::Stats;
using namespace KAStats;
