diff --git a/0001-runner-Don-t-match-if-just-one-query-word-matches.patch b/0001-runner-Don-t-match-if-just-one-query-word-matches.patch deleted file mode 100644 index c3b9622..0000000 --- a/0001-runner-Don-t-match-if-just-one-query-word-matches.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0641dee0947355d4a242364628079a2ae7e042b7 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -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 - diff --git a/systemsettings-6.1.3.tar.xz b/systemsettings-6.1.3.tar.xz deleted file mode 100644 index 2d2509f..0000000 --- a/systemsettings-6.1.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65ba04f22ab4dbfeb8c9a06b540b2ea9d56fe7e9ba295344a5c7e6b63f182131 -size 213572 diff --git a/systemsettings-6.1.3.tar.xz.sig b/systemsettings-6.1.3.tar.xz.sig deleted file mode 100644 index fe7f377..0000000 --- a/systemsettings-6.1.3.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmaWVVoACgkQ11dEg7tX -sY1XaBAAgSxD89g8BUx7cvJbjSCZq2wbPEl/jsmX12tQr7CqifXfT+YNarHg/do6 -7sAooDtXrwOf7DDShFcX2PofvniFlZyXJPij9fhGOUbhzxx137rjpqOIihUx/gkI -waiYJulTpSt1cEUFPBgo5M8yt+kwjBr1XOlwH75Z/VJtiTQXxs/tvNGnWpq5m4l1 -2eAHo8MShdhLOsw+Cgh1ZQZQ+a7iV6KUOfWTnVTK9M2U8Wzm2bPYQHp4nGBomZDO -89a1HM5RbZJ8Vkj3RDGu/73pWQXg1ASwgfmKNR7nVj7zfgoZTu3QmaWQPhgaTQDT -Ewxs4E+FW3Ix+/VviMyjWCEgssHBhlYV8QTBjBYh7dIMAt+uUIJDdnE/gkS6kGns -hkP+0F1XuE6UPcb78Mqu1D4JqWbUr/y2R+/M7YLfSvKwl8suhRJsFNGUxmwcVnYK -22INbzQTDO0BgyJ4z7jLbu0nN58fctbQ4nb20VaiQw47J4hBRhH99klCLBbw9oA5 -YZ9+gIcEB4n4FsxfBNzmVaNMXeeC6PrNMmIMV6U79uEY3lblP/3O87p8i1xbJnFU -yRyZXyWisQgoKuJMJNcXw5SgyNXnhZGqW0WFLiEI4ItJ6uzAeqwzdigCvkhGvEO5 -Cy8myMgR/y/bT2NN++7BmqnmWqWzLwL9y11tWA8I7Zrm8iDvmDA= -=WkZ+ ------END PGP SIGNATURE----- diff --git a/systemsettings-6.1.4.tar.xz b/systemsettings-6.1.4.tar.xz new file mode 100644 index 0000000..0fc1c4c --- /dev/null +++ b/systemsettings-6.1.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0ea266277ccb759a7b3b9c589d6099674f3e3f603e7aa471ed89dc6ad007da3 +size 213700 diff --git a/systemsettings-6.1.4.tar.xz.sig b/systemsettings-6.1.4.tar.xz.sig new file mode 100644 index 0000000..0b4a38c --- /dev/null +++ b/systemsettings-6.1.4.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmayGOEACgkQ11dEg7tX +sY1TfQ/+Pb9jMTQW0SHZJ3y7SvCsX/6Mwq5H6+Ns+k3JFsVMsHif2h0i3htpNUCw +39jJlHcZPM2BY4Lx3VD+xIedTo516tD6lXIZD2TFCMW3c4EFIPOpoS7S3gP9mf44 +xOvGfeTcIcQMzhwv3GqT/f0Tat9QmQAmPJ1omzqIhC0d3Ys63zndIyNkIQZ67hKq +0tIfcLJYejXvFgmQ6ee4qEL5HVIdI3t1GeaOl76IvcGB2zcCkdW1GK//6djzmkxI +lPMgprsy9aeC98tOy+rB+10+EPJAXJ6kPyth0eZZvWlnwIaGre/WjZXwFkaO/Wdw +i+zmLBi2nTzKrXKuGGJnknLsX7WMnyxYyW0MIAAauo+Waukrk9fxXLbt/FfoGKha +chj4C/bK7eEurgIS/8orw3i8y7L7en+b0rZDdHvIeMAjS5e79HFfsK2k9q6WeuZv +tRLSFIJny9QOUzx0kYcYDT+DzD2eRi2EU6ofx3lUyWy7bDTHtOOwH/Z2Ku6wR5ky +KY9e1e0k6reCu/rB31vr0YtUjWL/HM7D00kidIFcZ/WYTYggFZ+rtkSMKmNqFMh9 +Lvj/KGeBG74Ro2go1LDvY7lk++pqd0B2EfxDUv2TCtpbLYMTIlxTkUTDGs6iyNlm +EONlVLQdWAhe7RhVskaBLE1nqREgGtsgMmNl6SOE/+gdHNiebAA= +=CjRW +-----END PGP SIGNATURE----- diff --git a/systemsettings6.changes b/systemsettings6.changes index af1ee16..4a50f9a 100644 --- a/systemsettings6.changes +++ b/systemsettings6.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Aug 6 13:29:14 UTC 2024 - Fabian Vogt + +- Update to 6.1.4: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.1.4 +- Changes since 6.1.3: + * update version for new release + * Actually start the KAuth::ExecuteJob (kde#490507) + * runner: Don't match if just one query word matches (kde#488676) +- Drop patches, now upstream: + * 0001-runner-Don-t-match-if-just-one-query-word-matches.patch + ------------------------------------------------------------------- Tue Jul 16 13:25:45 UTC 2024 - Fabian Vogt diff --git a/systemsettings6.spec b/systemsettings6.spec index 70b216c..641995e 100644 --- a/systemsettings6.spec +++ b/systemsettings6.spec @@ -28,7 +28,7 @@ %{!?_plasma6_version: %define _plasma6_version %(echo %{_plasma6_bugfix} | awk -F. '{print $1"."$2}')} %bcond_without released Name: systemsettings6 -Version: 6.1.3 +Version: 6.1.4 Release: 0 Summary: KDE's control center License: GPL-2.0-or-later @@ -38,8 +38,6 @@ Source: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{ver Source1: https://download.kde.org/stable/plasma/%{version}/%{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}