commit 1cde08b11b93f5141b21d3fa6aeb3ae1a8fc912d642e5ed178de1cc09ab59ad0 Author: Christophe Marin Date: Wed Jul 3 06:31:45 2024 +0000 Plasma 6.1.2 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/systemsettings6?expand=0&rev=21 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc 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 new file mode 100644 index 0000000..c3b9622 --- /dev/null +++ b/0001-runner-Don-t-match-if-just-one-query-word-matches.patch @@ -0,0 +1,51 @@ +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/plasma.keyring b/plasma.keyring new file mode 100644 index 0000000..df40fb7 Binary files /dev/null and b/plasma.keyring differ diff --git a/systemsettings-6.1.2.tar.xz b/systemsettings-6.1.2.tar.xz new file mode 100644 index 0000000..58ab955 --- /dev/null +++ b/systemsettings-6.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:907addec0baf4026d7741a0db3380d388f5cf69984dac07c0fa05e11058b46b6 +size 213576 diff --git a/systemsettings-6.1.2.tar.xz.sig b/systemsettings-6.1.2.tar.xz.sig new file mode 100644 index 0000000..e63213a --- /dev/null +++ b/systemsettings-6.1.2.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmaDxUcACgkQ11dEg7tX +sY1gyRAAp7Gq4O/+6kkzgsq/xaHzElS6v6B5fEaPB07Jtw4oi20Q3YGwEZT1UgOC +FrhpnILsiTzmnngtUk9HsU3cV6ULvC0/BNiNnluLBZCokm7eYu5vZxLF5NFG9CEx +YImleISU/3UkWw74j2ukKATdRwrwtezj4jB0md6doVbvcQXSih0Cgb7d9NlA8Y0z +3po3nik/cpW69D+TJvJ2sne1HxWg7Fbg2HCewr3LL6BXNx0gF4fqEQCf8eUTq00r +YCfRdGcUogJGeM8wtB75YVAeznoUlf3jsUJ52cVp2mxehFaaqUTKbxQ1NZRKls4i +IRqtjvmqUtoA8NKM2mzpiVDAsKOUquOgNjKQHRN0Y0PEUyzm9xbjN4rD8OMtEtls +Cy6uSWghTgz4ur//W2iBYACApZO/XeZWB8GTOJiglQsXHJ+hjPXrdhbnvjtF5kiI +tjtnzp9E5Z/JfcNYyy8f3asQHsjBsJtGAscOMsFyPNYRJC0Qr/Z1V/1X1j4Kd5di +9qERmYdLGX0V6eNTs0dttCpxMsX4+LprWOkLif7x45cEneDSFxuxXWaV5clJNXLd +3OxHbjZ504xYJ48PF+QtjEGNytafF2HsCxur+8Td9AOIvA7qyu6UHHbC8HAazpYV +wx3oGWT1PW6WZX4sGJ3d6+i76/jDS02E86W3QDDF9pfCCbURyo0= +=OzQu +-----END PGP SIGNATURE----- diff --git a/systemsettings6.changes b/systemsettings6.changes new file mode 100644 index 0000000..234a8b2 --- /dev/null +++ b/systemsettings6.changes @@ -0,0 +1,143 @@ +------------------------------------------------------------------- +Tue Jul 2 17:34:35 UTC 2024 - Fabian Vogt + +- Update to 6.1.2: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.1.2 +- Changes since 6.1.1: + * update version for new release + * Fix sub-category view remaining visible when moving to a top-level KCM (kde#434345) + * update version for new release + +------------------------------------------------------------------- +Tue Jun 25 17:15:59 UTC 2024 - Fabian Vogt + +- Update to 6.1.1: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.1.1 +- Changes since 6.1.0: + * update version for new release + * remove dup appstream version + * update version for new release + +------------------------------------------------------------------- +Fri Jun 21 18:46:45 UTC 2024 - Fabian Vogt + +- 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 + +- 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 + +- 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 + +------------------------------------------------------------------- +Wed May 22 07:43:23 UTC 2024 - Fabian Vogt + +- Update to 6.0.5: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.0.5 +- Changes since 6.0.4: + * revert duplicate version + * update version for new release + * Fix subcategory pane opening when exiting search (kde#487156) + +------------------------------------------------------------------- +Wed Apr 17 08:14:00 UTC 2024 - Fabian Vogt + +- Update to 6.0.4: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.0.4 +- Changes since 6.0.3: + * update version for new release + * revert premature appstream update + * update version for new release + +------------------------------------------------------------------- +Tue Mar 26 18:07:02 UTC 2024 - Fabian Vogt + +- Update to 6.0.3: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.0.3 +- Changes since 6.0.2: + * revert double appstream update + * update version for new release + +------------------------------------------------------------------- +Wed Mar 13 09:10:42 UTC 2024 - Fabian Vogt + +- 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 + +------------------------------------------------------------------- +Wed Mar 6 08:40:34 UTC 2024 - Fabian Vogt + +- Update to 6.0.1: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.0.1 +- Changes since 6.0.0: + * update version for new release + * runner: Improve granularity of relevance and category relevance + * Improve page separator in header + +------------------------------------------------------------------- +Mon Mar 4 18:52:33 UTC 2024 - Christophe Marin + +- Add Provides/Obsoletes to replace Plasma 5 + +------------------------------------------------------------------- +Wed Feb 21 18:36:41 UTC 2024 - Fabian Vogt + +- Update to 6.0.0: + * New bugfix release + * Release announcement not available yet +- Changes since 5.93.0: + * update version for new release + * SideBarMode: return false in eventFilter if qqw is nullptr (kde#480006) + * Use Header color set for separators as with drawers and ColumnView (kde#438175) + * update version for new release + +------------------------------------------------------------------- +Wed Jan 31 17:38:31 UTC 2024 - Fabian Vogt + +- Update to 5.93.0 (6.0 RC 2): + * New bugfix release + * See https://kde.org/announcements/megarelease/6/rc2/ for details +- Changes since 5.92.0: + * Remove some unused header includes + * Do not use static_cast to downcast from a base to a derived class + * Replaced deprecated signal with events handling + * RC 1 version dep + * add a version for dependencies so it does not break CI https://invent.kde.org/plasma/bluedevil/-/merge_requests/156 + * Remove unused System Settings categories + * Use standard spacing for QDialogButtonBox + +------------------------------------------------------------------- +Mon Jan 15 21:09:19 UTC 2024 - Fabian Vogt + +- Update to 5.92.0 (6.0 RC 1) + * For more details please see: + https://kde.org/announcements/megarelease/6/rc1/ + +------------------------------------------------------------------- +Sun Jul 9 11:14:07 UTC 2023 - Christophe Marin + +- Init systemsettings6 diff --git a/systemsettings6.spec b/systemsettings6.spec new file mode 100644 index 0000000..b903f61 --- /dev/null +++ b/systemsettings6.spec @@ -0,0 +1,114 @@ +# +# spec file for package systemsettings6 +# +# 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%global __requires_exclude qt6qmlimport\\(org\\.kde\\.systemsettings.* + +%define kf6_version 6.2.0 +%define qt6_version 6.6.0 + +%define rname systemsettings +# Full Plasma 6 version (e.g. 6.0.0) +%{!?_plasma6_bugfix: %global _plasma6_bugfix %{version}} +# Latest ABI-stable Plasma (e.g. 6.0 in KF6, but 6.0.80 in KUF) +%{!?_plasma6_version: %define _plasma6_version %(echo %{_plasma6_bugfix} | awk -F. '{print $1"."$2}')} +%bcond_without released +Name: systemsettings6 +Version: 6.1.2 +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 +%if %{with released} +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} +BuildRequires: cmake(KF6Config) >= %{kf6_version} +BuildRequires: cmake(KF6Crash) >= %{kf6_version} +BuildRequires: cmake(KF6DBusAddons) >= %{kf6_version} +BuildRequires: cmake(KF6DocTools) >= %{kf6_version} +BuildRequires: cmake(KF6GuiAddons) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6IconThemes) >= %{kf6_version} +BuildRequires: cmake(KF6ItemModels) >= %{kf6_version} +BuildRequires: cmake(KF6ItemViews) >= %{kf6_version} +BuildRequires: cmake(KF6JobWidgets) >= %{kf6_version} +BuildRequires: cmake(KF6KCMUtils) >= %{kf6_version} +BuildRequires: cmake(KF6KIO) >= %{kf6_version} +BuildRequires: cmake(KF6KirigamiPlatform) >= %{kf6_version} +BuildRequires: cmake(KF6Runner) >= %{kf6_version} +BuildRequires: cmake(KF6Service) >= %{kf6_version} +BuildRequires: cmake(KF6WidgetsAddons) >= %{kf6_version} +BuildRequires: cmake(KF6WindowSystem) >= %{kf6_version} +BuildRequires: cmake(KF6XmlGui) >= %{kf6_version} +BuildRequires: cmake(PlasmaActivities) >= %{_plasma6_bugfix} +BuildRequires: cmake(Qt6Qml) >= %{qt6_version} +BuildRequires: cmake(Qt6Quick) >= %{qt6_version} +BuildRequires: cmake(Qt6QuickWidgets) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} +Requires: kf6-kirigami-imports >= %{kf6_version} +Provides: systemsettings5 = %{version} +Obsoletes: systemsettings5 < %{version} +Obsoletes: systemsettings5-lang < %{version} + +%description +This package provides modules to control settings of Plasma and other +applications by KDE. + +%lang_package + +%prep +%autosetup -p1 -n %{rname}-%{version} + +%build +%cmake_kf6 + +%kf6_build + +%install +%kf6_install + +%find_lang %{name} --all-name --with-html + +%suse_update_desktop_file kdesystemsettings X-SuSE-core + +%files +%license LICENSES/* +%doc %lang(en) %{_kf6_htmldir}/en/systemsettings/ +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/site-functions +%{_datadir}/zsh/site-functions/_systemsettings +%{_kf6_applicationsdir}/kdesystemsettings.desktop +%{_kf6_applicationsdir}/systemsettings.desktop +%{_kf6_appstreamdir}/org.kde.systemsettings.metainfo.xml +%{_kf6_bindir}/systemsettings +%{_kf6_debugdir}/systemsettings.categories +%dir %{_kf6_plugindir}/kf6/krunner +%{_kf6_plugindir}/kf6/krunner/krunner_systemsettings.so +%{_kf6_sharedir}/kglobalaccel/systemsettings.desktop +%{_kf6_sharedir}/systemsettings/ + +%files lang -f %{name}.lang +%exclude %{_kf6_htmldir}/en/systemsettings + +%changelog