Hello community, here is the log from the commit of package kactivities5 for openSUSE:Factory checked in at 2019-03-21 09:43:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kactivities5 (Old) and /work/SRC/openSUSE:Factory/.kactivities5.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kactivities5" Thu Mar 21 09:43:11 2019 rev:64 rq:686715 version:5.56.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kactivities5/kactivities5.changes 2019-02-28 21:27:18.777854653 +0100 +++ /work/SRC/openSUSE:Factory/.kactivities5.new.28833/kactivities5.changes 2019-03-21 09:44:15.742925711 +0100 @@ -1,0 +2,10 @@ +Sun Mar 10 20:15:35 UTC 2019 - [email protected] + +- Update to 5.56.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.56.0.php +- Changes since 5.55.0: + * Use natural sorting in ActivityModel + +------------------------------------------------------------------- Old: ---- kactivities-5.55.0.tar.xz New: ---- kactivities-5.56.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kactivities5.spec ++++++ --- /var/tmp/diff_new_pack.Hx8PNi/_old 2019-03-21 09:44:16.218925602 +0100 +++ /var/tmp/diff_new_pack.Hx8PNi/_new 2019-03-21 09:44:16.218925602 +0100 @@ -17,13 +17,13 @@ %define lname libKF5Activities5 -%define _tar_path 5.55 +%define _tar_path 5.56 # 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: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kactivities5 -Version: 5.55.0 +Version: 5.56.0 Release: 0 Summary: KDE Plasma Activities support License: GPL-2.0-or-later ++++++ kactivities-5.55.0.tar.xz -> kactivities-5.56.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.55.0/CMakeLists.txt new/kactivities-5.56.0/CMakeLists.txt --- old/kactivities-5.55.0/CMakeLists.txt 2019-02-02 18:19:22.000000000 +0100 +++ new/kactivities-5.56.0/CMakeLists.txt 2019-03-02 14:24:04.000000000 +0100 @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.5) # KDE Frameworks -set(KF5_VERSION "5.55.0") # handled by release scripts -set(KF5_DEP_VERSION "5.55.0") # handled by release scripts +set(KF5_VERSION "5.56.0") # handled by release scripts +set(KF5_DEP_VERSION "5.56.0") # handled by release scripts project (KActivities VERSION ${KF5_VERSION}) option (KACTIVITIES_LIBRARY_ONLY "If true, compiles only the KActivities library, without the QML imports." OFF) @@ -24,7 +24,7 @@ # Extra CMake stuff include(FeatureSummary) -find_package(ECM 5.55.0 NO_MODULE) +find_package(ECM 5.56.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) @@ -71,7 +71,7 @@ SOVERSION 5 ) - +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) add_subdirectory (src) if (BUILD_TESTING) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.55.0/src/imports/activitymodel.h new/kactivities-5.56.0/src/imports/activitymodel.h --- old/kactivities-5.55.0/src/imports/activitymodel.h 2019-02-02 18:19:22.000000000 +0100 +++ new/kactivities-5.56.0/src/imports/activitymodel.h 2019-03-02 14:24:04.000000000 +0100 @@ -24,6 +24,7 @@ #include <QObject> #include <QAbstractListModel> #include <QJSValue> +#include <QCollator> // STL and Boost #include <boost/container/flat_set.hpp> @@ -130,12 +131,14 @@ struct InfoPtrComparator { bool operator() (const InfoPtr& left, const InfoPtr& right) const { - const QString &leftName = left->name().toLower(); - const QString &rightName = right->name().toLower(); - - return - (leftName < rightName) || - (leftName == rightName && left->id() < right->id()); + QCollator c; + c.setCaseSensitivity(Qt::CaseInsensitive); + c.setNumericMode(true); + int rc = c.compare(left->name(), right->name()); + if (rc == 0) { + return left->id() < right->id(); + } + return rc < 0; } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.55.0/src/lib/activitiesmodel_p.h new/kactivities-5.56.0/src/lib/activitiesmodel_p.h --- old/kactivities-5.55.0/src/lib/activitiesmodel_p.h 2019-02-02 18:19:22.000000000 +0100 +++ new/kactivities-5.56.0/src/lib/activitiesmodel_p.h 2019-03-02 14:24:04.000000000 +0100 @@ -28,6 +28,8 @@ #include "utils/qflatset.h" +#include <QCollator> + namespace KActivities { class ActivitiesModelPrivate : public QObject { @@ -57,12 +59,14 @@ struct InfoPtrComparator { bool operator() (const InfoPtr& left, const InfoPtr& right) const { - const QString &leftName = left->name().toLower(); - const QString &rightName = right->name().toLower(); - - return - (leftName < rightName) || - (leftName == rightName && left->id() < right->id()); + QCollator c; + c.setCaseSensitivity(Qt::CaseInsensitive); + c.setNumericMode(true); + int rc = c.compare(left->name(), right->name()); + if (rc == 0) { + return left->id() < right->id(); + } + return rc < 0; } };
