Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package milou6 for openSUSE:Factory checked in at 2024-03-14 17:43:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/milou6 (Old) and /work/SRC/openSUSE:Factory/.milou6.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "milou6" Thu Mar 14 17:43:32 2024 rev:2 rq:1157709 version:6.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/milou6/milou6.changes 2024-03-11 15:32:07.578417199 +0100 +++ /work/SRC/openSUSE:Factory/.milou6.new.1905/milou6.changes 2024-03-14 17:44:03.723183020 +0100 @@ -1,0 +2,11 @@ +Wed Mar 13 09:09:58 UTC 2024 - Fabian Vogt <[email protected]> + +- Update to 6.0.2: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.0.2 +- Changes since 6.0.1: + * update version for new release + * resultsmodel: Read plasma settings for KRunner favorites (kde#480750) + * update version for new release + +------------------------------------------------------------------- Old: ---- milou-6.0.1.tar.xz milou-6.0.1.tar.xz.sig New: ---- milou-6.0.2.tar.xz milou-6.0.2.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ milou6.spec ++++++ --- /var/tmp/diff_new_pack.sGiu2a/_old 2024-03-14 17:44:05.367243298 +0100 +++ /var/tmp/diff_new_pack.sGiu2a/_new 2024-03-14 17:44:05.371243445 +0100 @@ -1,7 +1,7 @@ # # spec file for package milou6 # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ %{!?_plasma6_version: %define _plasma6_version %(echo %{_plasma6_bugfix} | awk -F. '{print $1"."$2}')} %bcond_without released Name: milou6 -Version: 6.0.1 +Version: 6.0.2 Release: 0 Summary: Dedicated search application built on top of Baloo License: GPL-2.0-or-later AND LGPL-2.1-or-later ++++++ milou-6.0.1.tar.xz -> milou-6.0.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-6.0.1/.kde-ci.yml new/milou-6.0.2/.kde-ci.yml --- old/milou-6.0.1/.kde-ci.yml 2024-03-05 23:36:07.000000000 +0100 +++ new/milou-6.0.2/.kde-ci.yml 2024-03-12 13:44:33.000000000 +0100 @@ -7,6 +7,7 @@ 'frameworks/extra-cmake-modules': '@latest-kf6' 'frameworks/ki18n': '@latest-kf6' 'frameworks/krunner': '@latest-kf6' + 'frameworks/kconfig': '@latest-kf6' 'plasma/libplasma': '@same' Options: require-passing-tests-on: [ 'Linux', 'FreeBSD'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-6.0.1/CMakeLists.txt new/milou-6.0.2/CMakeLists.txt --- old/milou-6.0.1/CMakeLists.txt 2024-03-05 23:36:07.000000000 +0100 +++ new/milou-6.0.2/CMakeLists.txt 2024-03-12 13:44:33.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) project(Milou) -set(PROJECT_VERSION "6.0.1") +set(PROJECT_VERSION "6.0.2") set(PROJECT_VERSION_MAJOR 6) -set(PROJECT_DEP_VERSION "6.0.1") +set(PROJECT_DEP_VERSION "6.0.2") set(QT_MIN_VERSION "6.6.0") set(KF6_MIN_VERSION "6.0.0") set(KDE_COMPILERSETTINGS_LEVEL "5.82") @@ -27,7 +27,7 @@ include(ECMQmlModule) find_package(Qt6 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Qml Quick Widgets) -find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS I18n Runner Svg) +find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS I18n Runner Svg Config) find_package(Plasma ${PROJECT_DEP_VERSION} REQUIRED) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-6.0.1/lib/CMakeLists.txt new/milou-6.0.2/lib/CMakeLists.txt --- old/milou-6.0.1/lib/CMakeLists.txt 2024-03-05 23:36:07.000000000 +0100 +++ new/milou-6.0.2/lib/CMakeLists.txt 2024-03-12 13:44:33.000000000 +0100 @@ -14,6 +14,7 @@ Qt::Quick Qt::Widgets KF6::Runner + KF6::ConfigCore ) add_subdirectory(qml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-6.0.1/lib/resultsmodel.cpp new/milou-6.0.2/lib/resultsmodel.cpp --- old/milou-6.0.1/lib/resultsmodel.cpp 2024-03-05 23:36:07.000000000 +0100 +++ new/milou-6.0.2/lib/resultsmodel.cpp 2024-03-12 13:44:33.000000000 +0100 @@ -8,9 +8,27 @@ using namespace Milou; +using namespace Qt::StringLiterals; + ResultsModel::ResultsModel(QObject *parent) : KRunner::ResultsModel(parent) { + const auto config = KSharedConfig::openConfig(u"krunnerrc"_s); + m_configWatcher = KConfigWatcher::create(config); + const auto assignFavoriteIds = [this, config]() { + const KConfigGroup grp = config->group(u"General"_s).parent().group(u"Plugins"_s).group(u"Favorites"_s); + m_configFavoriteIds = grp.readEntry("plugins", QStringList(u"krunner_services"_s)); + if (!m_favoritesExplicitlySet) { + KRunner::ResultsModel::setFavoriteIds(m_configFavoriteIds); + } + }; + connect(m_configWatcher.data(), &KConfigWatcher::configChanged, this, [assignFavoriteIds](const KConfigGroup &group) { + const QLatin1String pluginsGrp("Plugins"); + if (group.name() == QLatin1String("Favorites") && group.parent().name() == pluginsGrp) { + assignFavoriteIds(); + } + }); + assignFavoriteIds(); } -ResultsModel::~ResultsModel() = default; +#include "moc_resultsmodel.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-6.0.1/lib/resultsmodel.h new/milou-6.0.2/lib/resultsmodel.h --- old/milou-6.0.1/lib/resultsmodel.h 2024-03-05 23:36:07.000000000 +0100 +++ new/milou-6.0.2/lib/resultsmodel.h 2024-03-12 13:44:33.000000000 +0100 @@ -6,6 +6,7 @@ #pragma once +#include <KConfigWatcher> #include <KRunner/ResultsModel> namespace Milou @@ -13,9 +14,25 @@ class ResultsModel : public KRunner::ResultsModel { Q_OBJECT + Q_PROPERTY(QStringList favoriteIds READ favoriteIds WRITE setFavoriteIds NOTIFY favoriteIdsChanged RESET resetFavoriteIds) public: explicit ResultsModel(QObject *parent = nullptr); - ~ResultsModel() override; + + void setFavoriteIds(const QStringList &ids) + { + m_favoritesExplicitlySet = true; + KRunner::ResultsModel::setFavoriteIds(ids); + } + void resetFavoriteIds() + { + m_favoritesExplicitlySet = false; + KRunner::ResultsModel::setFavoriteIds(m_configFavoriteIds); + } + +private: + KConfigWatcher::Ptr m_configWatcher; + QStringList m_configFavoriteIds; + bool m_favoritesExplicitlySet = false; }; } // namespace Milou
