Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package systemsettings6 for openSUSE:Factory
checked in at 2024-06-22 13:22:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemsettings6 (Old)
and /work/SRC/openSUSE:Factory/.systemsettings6.new.18349 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemsettings6"
Sat Jun 22 13:22:45 2024 rev:6 rq:1182508 version:6.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/systemsettings6/systemsettings6.changes
2024-05-27 11:50:18.869607181 +0200
+++
/work/SRC/openSUSE:Factory/.systemsettings6.new.18349/systemsettings6.changes
2024-06-22 13:23:17.186366425 +0200
@@ -1,0 +2,26 @@
+Fri Jun 21 18:46:45 UTC 2024 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Add patch to avoid krunner result pollution (kde#488676):
+ * 0001-runner-Don-t-match-if-just-one-query-word-matches.patch
+
+-------------------------------------------------------------------
+Thu Jun 13 10:59:02 UTC 2024 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Update to 6.1.0:
+ * New bugfix release
+ * For more details see https://kde.org/announcements/plasma/6/6.1.0
+- Changes since 6.0.90:
+ * update version for new release
+ * appstream versions
+ * update version for new release
+ * join keywords lists using ZERO WIDTH SPACE instead of empty string
(kde#487855)
+
+-------------------------------------------------------------------
+Sat May 25 11:20:17 UTC 2024 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Update to 6.0.90:
+ * New feature release
+ * For more details see https://kde.org/announcements/plasma/6/6.0.90
+- Too many changes to list here
+
+-------------------------------------------------------------------
Old:
----
systemsettings-6.0.5.tar.xz
systemsettings-6.0.5.tar.xz.sig
New:
----
0001-runner-Don-t-match-if-just-one-query-word-matches.patch
systemsettings-6.1.0.tar.xz
systemsettings-6.1.0.tar.xz.sig
BETA DEBUG BEGIN:
New:- Add patch to avoid krunner result pollution (kde#488676):
* 0001-runner-Don-t-match-if-just-one-query-word-matches.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ systemsettings6.spec ++++++
--- /var/tmp/diff_new_pack.YacdD1/_old 2024-06-22 13:23:18.106400065 +0200
+++ /var/tmp/diff_new_pack.YacdD1/_new 2024-06-22 13:23:18.110400212 +0200
@@ -18,7 +18,7 @@
%global __requires_exclude qt6qmlimport\\(org\\.kde\\.systemsettings.*
-%define kf6_version 6.0.0
+%define kf6_version 6.2.0
%define qt6_version 6.6.0
%define rname systemsettings
@@ -28,16 +28,18 @@
%{!?_plasma6_version: %define _plasma6_version %(echo %{_plasma6_bugfix} | awk
-F. '{print $1"."$2}')}
%bcond_without released
Name: systemsettings6
-Version: 6.0.5
+Version: 6.1.0
Release: 0
Summary: KDE's control center
License: GPL-2.0-or-later
URL: https://www.kde.org/
-Source:
https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz
+Source: %{rname}-%{version}.tar.xz
%if %{with released}
-Source1:
https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz.sig
+Source1: %{rname}-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
+# PATCH-FIX-UPSTREAM
+Patch1: 0001-runner-Don-t-match-if-just-one-query-word-matches.patch
BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
BuildRequires: update-desktop-files
BuildRequires: cmake(KF6Auth) >= %{kf6_version}
@@ -90,8 +92,6 @@
%suse_update_desktop_file kdesystemsettings X-SuSE-core
-%ldconfig_scriptlets
-
%files
%license LICENSES/*
%doc %lang(en) %{_kf6_htmldir}/en/systemsettings/
@@ -103,7 +103,6 @@
%{_kf6_appstreamdir}/org.kde.systemsettings.metainfo.xml
%{_kf6_bindir}/systemsettings
%{_kf6_debugdir}/systemsettings.categories
-%{_kf6_libdir}/libsystemsettingsview.so.3
%dir %{_kf6_plugindir}/kf6/krunner
%{_kf6_plugindir}/kf6/krunner/krunner_systemsettings.so
%{_kf6_sharedir}/kglobalaccel/systemsettings.desktop
++++++ 0001-runner-Don-t-match-if-just-one-query-word-matches.patch ++++++
>From 0641dee0947355d4a242364628079a2ae7e042b7 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fab...@ritter-vogt.de>
Date: Fri, 21 Jun 2024 20:43:57 +0200
Subject: [PATCH] runner: Don't match if just one query word matches
If someone types in "foo asdf start bar", it should not show the autostart
KCM for instance.
This runner is part of the default favorites in Plasma 6.1, so it's
shown above others and must avoid polluting results.
BUG: 488676
---
runner/systemsettingsrunner.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/runner/systemsettingsrunner.cpp b/runner/systemsettingsrunner.cpp
index 826194f9..d33b7906 100644
--- a/runner/systemsettingsrunner.cpp
+++ b/runner/systemsettingsrunner.cpp
@@ -51,12 +51,12 @@ void SystemsettingsRunner::match(KRunner::RunnerContext
&context)
return true;
}
for (const QString &queryWord : queryWords) {
- if (relevance == -1 && queryWord.length() > 3 &&
value.contains(queryWord, Qt::CaseInsensitive)) {
- relevance = relevanceValue;
- return true;
+ if (!value.contains(queryWord, Qt::CaseInsensitive)) {
+ return false;
}
}
- return false;
+ relevance = relevanceValue;
+ return true;
};
const QString name = data.name();
@@ -71,8 +71,8 @@ void SystemsettingsRunner::match(KRunner::RunnerContext
&context)
}
} else if (name.compare(query, Qt::CaseInsensitive) == 0) {
relevance = 1;
- } else if (checkMatchAndRelevance(name, 0.8)) { // name starts with
query or contains any query word
- } else if (checkMatchAndRelevance(description, 0.5)) { // description
starts with query or contains any query word
+ } else if (checkMatchAndRelevance(name, 0.8)) { // name starts with
query or contains all query words
+ } else if (checkMatchAndRelevance(description, 0.5)) { // description
starts with query or contains all query words
} else if (std::any_of(keywords.begin(), keywords.end(),
[&query](const QString &keyword) {
return keyword.startsWith(query, Qt::CaseInsensitive);
})) {
--
2.45.2
++++++ systemsettings-6.0.5.tar.xz -> systemsettings-6.1.0.tar.xz ++++++
++++ 27805 lines of diff (skipped)
