Hello community, here is the log from the commit of package kactivities-stats for openSUSE:Factory checked in at 2017-03-28 15:07:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kactivities-stats (Old) and /work/SRC/openSUSE:Factory/.kactivities-stats.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kactivities-stats" Tue Mar 28 15:07:55 2017 rev:11 rq:481487 version:5.32.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kactivities-stats/kactivities-stats.changes 2017-03-03 15:09:34.452840471 +0100 +++ /work/SRC/openSUSE:Factory/.kactivities-stats.new/kactivities-stats.changes 2017-03-28 15:08:50.543280287 +0200 @@ -1,0 +2,14 @@ +Sun Mar 19 14:50:14 CET 2017 - lbeltr...@kde.org + +- Update to 5.32.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.32.0.php +- Changes since 5.31.0: + * Upgrade ECM and KF5 version requirements for 5.32.0 release. + * Less debugging output + * Allow to plan ahead and set the order for an item not yet in the list + * Add Boost_INCLUDE_DIR to kactivities-stats autotests. + * Upgrade KF5 version to 5.32.0. + +------------------------------------------------------------------- Old: ---- kactivities-stats-5.31.0.tar.xz New: ---- kactivities-stats-5.32.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kactivities-stats.spec ++++++ --- /var/tmp/diff_new_pack.l3sNpk/_old 2017-03-28 15:08:51.007214560 +0200 +++ /var/tmp/diff_new_pack.l3sNpk/_new 2017-03-28 15:08:51.007214560 +0200 @@ -17,9 +17,9 @@ %define lname libKF5ActivitiesStats1 -%define _tar_path 5.31 +%define _tar_path 5.32 Name: kactivities-stats -Version: 5.31.0 +Version: 5.32.0 Release: 0 %define kf5_version %{version} Summary: KDE Plasma Activities support ++++++ kactivities-stats-5.31.0.tar.xz -> kactivities-stats-5.32.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.31.0/CMakeLists.txt new/kactivities-stats-5.32.0/CMakeLists.txt --- old/kactivities-stats-5.31.0/CMakeLists.txt 2017-02-04 19:04:24.000000000 +0100 +++ new/kactivities-stats-5.32.0/CMakeLists.txt 2017-03-03 13:40:54.000000000 +0100 @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.31.0") # handled by release scripts -set(KF5_DEP_VERSION "5.31.0") # handled by release scripts +set(KF5_VERSION "5.32.0") # handled by release scripts +set(KF5_DEP_VERSION "5.32.0") # handled by release scripts project (KActivitiesStats VERSION ${KF5_VERSION}) set (REQUIRED_QT_VERSION 5.6.0) @@ -20,7 +20,7 @@ # Extra CMake stuff include (FeatureSummary) -find_package (ECM 5.31.0 NO_MODULE) +find_package (ECM 5.32.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.31.0/autotests/CMakeLists.txt new/kactivities-stats-5.32.0/autotests/CMakeLists.txt --- old/kactivities-stats-5.31.0/autotests/CMakeLists.txt 2017-02-04 19:04:24.000000000 +0100 +++ new/kactivities-stats-5.32.0/autotests/CMakeLists.txt 2017-03-03 13:40:54.000000000 +0100 @@ -7,6 +7,7 @@ ${KASTATS_CURRENT_ROOT_SOURCE_DIR}/src ${KASTATS_CURRENT_ROOT_SOURCE_DIR}/autotests ${CMAKE_BINARY_DIR}/src + ${Boost_INCLUDE_DIR} ) set ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.31.0/src/resultmodel.cpp new/kactivities-stats-5.32.0/src/resultmodel.cpp --- old/kactivities-stats-5.31.0/src/resultmodel.cpp 2017-02-04 19:04:24.000000000 +0100 +++ new/kactivities-stats-5.32.0/src/resultmodel.cpp 2017-03-03 13:40:54.000000000 +0100 @@ -130,15 +130,11 @@ qDebug() << "Searching for " << resource; auto resourcePosition = find(resource); + qDebug() << "Was resource found? " << (bool)resourcePosition; if (resourcePosition) { qDebug() << "What is the status? " << resourcePosition.iterator->linkStatus(); } - if (!resourcePosition - || resourcePosition.iterator->linkStatus() == ResultSet::Result::NotLinked) { - qWarning("Trying to reposition a resource that we do not have, or is not linked"); - return; - } // Lets make a list of linked items - we can only reorder them, // not others @@ -155,20 +151,37 @@ position = linkedItems.size(); } - auto oldPosition = linkedItems.indexOf(resource); + // We have two options: + // - we are planning to add an item to the desired position, + // but the item is not yet in the model + // - we want to move an existing item + if (!resourcePosition + || resourcePosition.iterator->linkStatus() == ResultSet::Result::NotLinked) { + + qDebug() << "Trying to reposition a resource that we do not have, or is not linked"; + + linkedItems.insert(position, resource); - kamd::utils::slide_one( - linkedItems.begin() + oldPosition, - linkedItems.begin() + position); + m_fixedItems = linkedItems; - m_fixedItems = linkedItems; + } else { + + auto oldPosition = linkedItems.indexOf(resource); + + kamd::utils::slide_one( + linkedItems.begin() + oldPosition, + linkedItems.begin() + position); + + m_fixedItems = linkedItems; + + // We are prepared to reorder the cache + d->repositionResult(resourcePosition, + d->destinationFor(*resourcePosition)); + } m_config.writeEntry("kactivitiesLinkedItemsOrder", m_fixedItems); m_config.sync(); - // We are prepared to reorder the cache - d->repositionResult(resourcePosition, - d->destinationFor(*resourcePosition)); } inline void debug() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.31.0/src/resultset.cpp new/kactivities-stats-5.32.0/src/resultset.cpp --- old/kactivities-stats-5.31.0/src/resultset.cpp 2017-02-04 19:04:24.000000000 +0100 +++ new/kactivities-stats-5.32.0/src/resultset.cpp 2017-03-03 13:40:54.000000000 +0100 @@ -402,7 +402,7 @@ } result.setLinkedActivities(linkedActivities); - qDebug() << result.resource() << "linked to activities" << result.linkedActivities(); + // qDebug() << result.resource() << "linked to activities" << result.linkedActivities(); return result; }
