Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package plasma5-desktop.15893 for openSUSE:Leap:15.2:Update checked in at 2021-03-09 14:05:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2:Update/plasma5-desktop.15893 (Old) and /work/SRC/openSUSE:Leap:15.2:Update/.plasma5-desktop.15893.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-desktop.15893" Tue Mar 9 14:05:30 2021 rev:1 rq:877392 version:5.18.6 Changes: -------- New Changes file: --- /dev/null 2021-02-22 01:36:22.145178436 +0100 +++ /work/SRC/openSUSE:Leap:15.2:Update/.plasma5-desktop.15893.new.2378/plasma5-desktop.changes 2021-03-09 14:05:33.628099324 +0100 @@ -0,0 +1,2278 @@ +------------------------------------------------------------------- +Fri Mar 5 19:48:37 UTC 2021 - Fabian Vogt <fab...@ritter-vogt.de> + +- Add patch to fix selection in various KCMs (boo#1182944): + * 0001-Pass-Qt-MatchExactly-when-calling-QAbstractItemModel.patch + +------------------------------------------------------------------- +Wed Jan 20 11:23:06 UTC 2021 - Wolfgang Bauer <wba...@tmo.at> + +- Add upstream patch to properly save keyboard shortcuts for + activities (boo#1172261, kde#374575): + * kcms_activities-Use-correct-method-to-set-active-global-shortcut.patch + +------------------------------------------------------------------- +Wed Dec 23 08:14:41 UTC 2020 - Wolfgang Bauer <wba...@tmo.at> + +- Add upstream patch to fix keyboard repeat settings not being + applied immediately (boo#1164739, kde#418175): + * Reparse-the-key-repeat-rate-config-when-we-try-to-load-it.patch + +------------------------------------------------------------------- +Tue Sep 29 11:52:07 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 5.18.6 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma-5.18.6 +- Changes since 5.18.5: + * kcm_fonts: Make the font selection dialog select the correct "Regular"-like style + * [kcms/desktoppath] Use folder dialogs instead of file dialogs (kde#424438) + * [kcm cursortheme] Also clear default theme when resetting + * Fix blurry icons in KColorSchemeEditor (kde#418165) + +------------------------------------------------------------------- +Thu May 14 13:22:23 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Leap 15.2 also has ibus-dict-emoji + +------------------------------------------------------------------- +Mon May 11 15:07:16 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Add patch to fix animations with Frameworks 5.70: + * 0001-Stop-multiplying-duration-values.patch + +------------------------------------------------------------------- +Tue May 5 13:01:54 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 5.18.5 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.18.5.php +- Changes since 5.18.4.1: + * [Runners KCM] Notify history deletion + * KCM Icons : Use KIconloader::emitChange() instead of deprecated newIconLoader() (kde#420577) + * [Task Manager] Avoid crash with QStringBuilder (kde#420452) + * KCM LookAndFeel check if splash screen is provided before applying it. (kde#414417) + * KCM LookAndFeel check widgetStyle availability before applying it (kde#419552,kde#418698) + * [Folder View] Update popup dialog's hardcoded scrollbar width to fix faulty sizing (kde#420385) + * [Kickoff] Disable tabBar's mouseArea when searching (kde#401861) + * Revert "Make accidental panel and panel widget deletion more difficult" + * [KCMs/Standard Actions] Give KCMShell window a sane default size (kde#377653) + * Make accidental panel and panel widget deletion more difficult (kde#419853) + * KCM Colors fix apply button always disabled (kde#418604) + +------------------------------------------------------------------- +Fri Apr 24 13:21:54 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Add patch to fix GTK2 application appearance (kde#412331, boo#1169968): + * 0001-krdb-Drop-GTK2-colour-exporting.patch + +------------------------------------------------------------------- +Tue Mar 31 15:16:36 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 5.18.4.1: + * Version fixed + +------------------------------------------------------------------- +Tue Mar 31 14:47:42 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 5.18.4 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.18.4.php +- Changes since 5.18.3: + * Enable wrapping of error messages which use KMessageWidget + * KCM/touchpad: Disables the middleEmulation when not supported + * KCM/Mouse: fix the middleEmulation checkbox status + * [Colors KCM] Also save colors when active scheme was edited + * [Cursor Theme KCM] Use standardized pointer and help cursor for preview + * [Icons KCM] Floor delegate height + * Make panel edit mode tooltip not unexpectedly disappear under certain circumstances (kde#413736) + +------------------------------------------------------------------- +Tue Mar 10 14:55:32 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 5.18.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.18.3.php +- Changes since 5.18.2: + * [applets/taskmanager] Show PA-related features even when audio indicators are disabled (kde#418164) + * [emojier] Set minimum window height and width (kde#418195) + +------------------------------------------------------------------- +Wed Mar 4 15:51:14 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- ibus-dict-emoji is available in Tumbleweed now, use it + +------------------------------------------------------------------- +Tue Feb 25 14:07:18 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 5.18.2 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.18.2.php +- Changes since 5.18.1: + * Calculate needsSave on checkbox toggle not on change (kde#411584) + * Remove attempt to start long gone baloo_file_cleaner + * [kcm/baloo] Clip ListView + * [kcm/activities] Clip ListView + * emojier: use proper scoping for QPixmap + * KCM look and feel : set proper default values for kwin kdecoration when applying global style + * emojier: --warnings + * emojier: improve the fallback mechanism to detect languages (kde#417713) + * emojier: properly specify the application component name to KAboutData (kde#416669) + * emojier: Only fit text when we know it's a very complex emoji (kde#417454) + * emojier: make it possible to filter by annotation + * [Folder view]Make shadow scale aware + * Set good default value for cursor theme and size in KRDB (kde#414109) + +------------------------------------------------------------------- +Tue Feb 18 14:05:57 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 5.18.1 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.18.1.php +- Changes since 5.18.0: + * [desktoppackage] Fix layout when an applet has no custom config modules (kde#410770) + * Set toolbox to invisble when it's hidden (kde#416695) + * [kcm/standardactions] Don't register kcminit hook when we don't have one + * [KCM Fonts] force need save to false during load to avoid state to be true too early (kde#416358) + * Baloo KCM: Do not anchor fill ScrollView (kde#417437) + * [Styles KCM] Set style display name as window title (kde#417563) + * unlock widgets (kde#417424) + * Remove a typo in the previous commit + * Replace plasma.kde.org with kde.org/plasma-desktop + * [kcms/cursortheme] Don't skip everything because of lack of XFixes + * [Sessions KCM] Fix firmware setup + * [KSplash KCM] Fix ghns button label (kde#417224) +- Drop patches, now upstream: + * 0001-KCM-Fonts-force-need-save-to-false-during-load-to-av.patch + * 0001-unlock-widgets.patch + * Set-toolbox-to-invisible-when-its-hidden.patch + +------------------------------------------------------------------- +Fri Feb 14 22:40:49 UTC 2020 - Wolfgang Bauer <wba...@tmo.at> + +- Add patch to fix Alt+D shortcut handling (kde#416695): + * Set-toolbox-to-invisible-when-its-hidden.patch + +------------------------------------------------------------------- +Fri Feb 14 13:01:17 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Add patch to fix saving font settings (kde#416358): + * 0001-KCM-Fonts-force-need-save-to-false-during-load-to-av.patch + +------------------------------------------------------------------- +Fri Feb 14 09:00:22 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Add %exclude for ibus-emoji-dicts to avoid file conflicts + +------------------------------------------------------------------- +Wed Feb 12 08:37:04 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Ship ibus emoji dicts as part of the emojier subpackage, + recommend it by default now +- Recommend noto-coloremoji-fonts for emojier +- Drop superfluous -lang recommends + +------------------------------------------------------------------- +Tue Feb 11 16:51:58 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Add patch to unlock widgets by default as the GUI option got + dropped (kde#417424): + * 0001-unlock-widgets.patch + +------------------------------------------------------------------- +Thu Feb 6 15:10:05 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 5.18.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.18.0.php +- Changes since 5.17.90: + * [krdb] Hardcode Breeze default in kde4 migration + * always normal colorgroup on tooltips ++++ 2081 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Leap:15.2:Update/.plasma5-desktop.15893.new.2378/plasma5-desktop.changes New: ---- 0001-Pass-Qt-MatchExactly-when-calling-QAbstractItemModel.patch 0001-Stop-multiplying-duration-values.patch 0001-Use-themed-user-face-icon-in-kickoff.patch 0001-krdb-Drop-GTK2-colour-exporting.patch Reparse-the-key-repeat-rate-config-when-we-try-to-load-it.patch _constraints kcms_activities-Use-correct-method-to-set-active-global-shortcut.patch plasma-desktop-5.18.6.tar.xz plasma-desktop-5.18.6.tar.xz.sig plasma.keyring plasma5-desktop.changes plasma5-desktop.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-desktop.spec ++++++ # # spec file for package plasma5-desktop # # Copyright (c) 2020 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/ # %define kf5_version 5.58.0 %global have_ibus_dict_emoji_pkg (0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200) %bcond_without lang Name: plasma5-desktop Version: 5.18.6 Release: 0 # Full Plasma 5 version (e.g. 5.9.3) %{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}} # Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.3 in KUF) %{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')} Summary: The KDE Plasma Workspace Components License: GPL-2.0-only Group: System/GUI/KDE URL: http://www.kde.org/ Source: https://download.kde.org/stable/plasma/%{version}/plasma-desktop-%{version}.tar.xz %if %{with lang} Source1: https://download.kde.org/stable/plasma/%{version}/plasma-desktop-%{version}.tar.xz.sig Source2: plasma.keyring %endif # PATCH-FIX-OPENSUSE Patch1: 0001-Use-themed-user-face-icon-in-kickoff.patch # PATCH-FIX-UPSTREAM Patch2: 0001-krdb-Drop-GTK2-colour-exporting.patch Patch3: 0001-Stop-multiplying-duration-values.patch Patch4: Reparse-the-key-repeat-rate-config-when-we-try-to-load-it.patch Patch5: kcms_activities-Use-correct-method-to-set-active-global-shortcut.patch Patch6: 0001-Pass-Qt-MatchExactly-when-calling-QAbstractItemModel.patch BuildRequires: extra-cmake-modules >= 1.8.0 BuildRequires: fdupes BuildRequires: glib2-devel BuildRequires: kf5-filesystem BuildRequires: libboost_headers-devel BuildRequires: libtag-devel BuildRequires: update-desktop-files BuildRequires: xz BuildRequires: cmake(AppStreamQt) >= 0.10.4 BuildRequires: cmake(KDED) >= %{kf5_version} BuildRequires: cmake(KF5Activities) >= %{kf5_version} BuildRequires: cmake(KF5ActivitiesStats) >= %{kf5_version} BuildRequires: cmake(KF5Attica) >= %{kf5_version} BuildRequires: cmake(KF5Auth) >= %{kf5_version} BuildRequires: cmake(KF5Baloo) >= %{kf5_version} BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5DBusAddons) >= %{kf5_version} BuildRequires: cmake(KF5Declarative) >= %{kf5_version} BuildRequires: cmake(KF5DocTools) >= %{kf5_version} BuildRequires: cmake(KF5Emoticons) BuildRequires: cmake(KF5GlobalAccel) >= %{kf5_version} BuildRequires: cmake(KF5GuiAddons) BuildRequires: cmake(KF5I18n) >= %{kf5_version} BuildRequires: cmake(KF5ItemModels) BuildRequires: cmake(KF5KCMUtils) >= %{kf5_version} BuildRequires: cmake(KF5KDELibs4Support) >= %{kf5_version} BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5NewStuff) >= %{kf5_version} BuildRequires: cmake(KF5NewStuffQuick) >= %{kf5_version} BuildRequires: cmake(KF5Notifications) >= %{kf5_version} BuildRequires: cmake(KF5NotifyConfig) >= %{kf5_version} BuildRequires: cmake(KF5People) >= %{kf5_version} BuildRequires: cmake(KF5Plasma) >= %{kf5_version} BuildRequires: cmake(KF5PlasmaQuick) >= %{kf5_version} BuildRequires: cmake(KF5Runner) >= %{kf5_version} BuildRequires: cmake(KF5Wallet) >= %{kf5_version} BuildRequires: cmake(KF5WindowSystem) >= %{kf5_version} BuildRequires: cmake(KRunnerAppDBusInterface) >= %{_plasma5_version} BuildRequires: cmake(KSMServerDBusInterface) >= %{_plasma5_version} BuildRequires: cmake(KWinDBusInterface) >= %{_plasma5_version} BuildRequires: cmake(LibKWorkspace) >= %{_plasma5_bugfix} BuildRequires: cmake(LibTaskManager) >= %{_plasma5_bugfix} BuildRequires: cmake(Phonon4Qt5) >= 4.6.60 BuildRequires: cmake(Qt5Concurrent) >= 5.4.0 BuildRequires: cmake(Qt5DBus) >= 5.4.0 BuildRequires: cmake(Qt5Qml) >= 5.4.0 BuildRequires: cmake(Qt5Quick) >= 5.4.0 BuildRequires: cmake(Qt5QuickWidgets) >= 5.4.0 BuildRequires: cmake(Qt5Sql) >= 5.4.0 BuildRequires: cmake(Qt5Svg) >= 5.4.0 BuildRequires: cmake(Qt5Test) >= 5.4.0 BuildRequires: cmake(Qt5Widgets) >= 5.4.0 BuildRequires: cmake(Qt5X11Extras) >= 5.4.0 BuildRequires: cmake(ScreenSaverDBusInterface) >= %{_plasma5_version} BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(ibus-1.0) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-image) BuildRequires: pkgconfig(xcb-keysyms) BuildRequires: pkgconfig(xcb-shm) BuildRequires: pkgconfig(xcb-util) BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xft) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(xorg-evdev) BuildRequires: pkgconfig(xorg-libinput) BuildRequires: pkgconfig(xorg-server) BuildRequires: pkgconfig(xorg-synaptics) %ifarch %arm aarch64 BuildRequires: pkgconfig(glesv2) %else BuildRequires: pkgconfig(gl) %endif #BuildRequires: pkgconfig(xrender) BuildRequires: breeze5-icons BuildRequires: xkeyboard-config # Includes some plugins for kpackage needed during build BuildRequires: plasma5-workspace >= %{_plasma5_bugfix} Requires: %{name}-branding = %{version} Requires: libqt5-qtgraphicaleffects Requires: plasma5-workspace >= %{_plasma5_bugfix} # hardcode versions of plasma-framework-componets and plasma-framework-private packages, as upstream doesn't keep backwards compability there %requires_ge plasma-framework-components %requires_ge plasma-framework-private Requires: kde-user-manager # Various KCMs use it Requires: kinfocenter5 Requires: kirigami2 Requires: kmenuedit5 Requires: ksysguard5 # kcm_style does DBus calls to the KDED module. # However, that depends on xsettingsd and gio, so # let the Supplements in kde-gtk-config5 handle it. # Requires: kde-gtk-config5 >= %{_plasma5_version} # needed for the ActivityManager Requires: kactivities5-imports # Needed for several KCMs Requires: knewstuff-imports Conflicts: kactivities5 < 5.20.0 Recommends: plasma5-addons Recommends: %{name}-emojier Provides: kdebase4-workspace = 5.3.0 Obsoletes: kdebase4-workspace < 5.3.0 Provides: kcm-touchpad = %{version} Obsoletes: kcm-touchpad < %{version} Provides: kdebase4-workspace-plasma-calendar = %{version} Obsoletes: kdebase4-workspace-plasma-calendar < %{version} Provides: kdebase4-workspace-plasma-engine-akonadi = %{version} Obsoletes: kdebase4-workspace-plasma-engine-akonadi < %{version} Conflicts: kio-extras5 <= 5.3.2 Provides: kcm-touchpad5 = %{version} Obsoletes: kcm-touchpad5 < %{version} # libinput configuration is lacking in comparision Recommends: xf86-input-synaptics Provides: %{name}-branding = %{version} Provides: %{name}-branding-upstream = %{version} Obsoletes: %{name}-branding-upstream < %{version} Provides: plasma5-addons-kimpanel = %{version} Obsoletes: plasma5-addons-kimpanel < %{version} Provides: %{name}-kimpanel = %{version} Obsoletes: %{name}-kimpanel < %{version} Obsoletes: synaptiks %description This package contains the basic packages for a Plasma workspace. %package emojier Summary: Selection window for emoji text input Group: System/GUI/KDE Requires: %{name} = %{version} # Other color fonts don't really work that well Recommends: noto-coloremoji-fonts %if %{have_ibus_dict_emoji_pkg} Requires: ibus-dict-emoji %endif %description emojier Press Meta+. to open an emoji selection window. %lang_package %prep %autosetup -p1 -n plasma-desktop-%{version} # Workaround for boo#1038368 sed -i"" "s/Name=Desktop/Name=Desktop Containment/g" containments/desktop/package/metadata.desktop %build %if !%{have_ibus_dict_emoji_pkg} # Reference the local copy (see the comment in the install section) sed -i"" 's#ibus/dicts/#plasma/ibus-emoji-dicts/#g' applets/kimpanel/backend/ibus/emojier/emojier.cpp %endif %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} %cmake_build %install %kf5_makeinstall -C build %if %{with lang} %kf5_find_lang %kf5_find_htmldocs %endif # Copy the icon for kcolorschemeeditor.desktop mkdir -p %{buildroot}%{_kf5_iconsdir}/hicolor/scalable/apps mkdir -p %{buildroot}%{_kf5_iconsdir}/hicolor/scalable/preferences if [ -f %{_kf5_iconsdir}/breeze/apps/32/preferences-desktop-color.svg ]; then cp %{_kf5_iconsdir}/breeze/apps/32/preferences-desktop-color.svg %{buildroot}%{_kf5_iconsdir}/hicolor/scalable/apps/ else cp %{_kf5_iconsdir}/breeze/preferences/32/preferences-desktop-color.svg %{buildroot}%{_kf5_iconsdir}/hicolor/scalable/preferences/ fi # remove empty/invalid appstream xml files. kpackagetool5 generates invalid files sometimes... # remove this once kpackagetool5 is fixed find %{buildroot}%{_kf5_appstreamdir} -type f -size 0 -print -delete %if !%{have_ibus_dict_emoji_pkg} # The emojier needs .dict files from ibus, which are part of the ibus package. # That's a huge dep tree and is also known to break things such as keyboard layout selection. # So until that is fixed (boo#1161584) install the files as part of the package. mkdir -p %{buildroot}%{_kf5_sharedir}/plasma/ibus-emoji-dicts/ cp %{_datadir}/ibus/dicts/emoji-*.dict %{buildroot}%{_kf5_sharedir}/plasma/ibus-emoji-dicts/ %endif # no devel files needed here rm -rfv %{buildroot}%{_kf5_sharedir}/dbus-1/interfaces/ %fdupes %{buildroot}/%{_prefix} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %license COPYING* %{_kf5_dbuspolicydir}/org.kde.fontinst.conf %{_kf5_dbuspolicydir}/org.kde.kcontrol.kcmclock.conf %{_kf5_knsrcfilesdir}/colorschemes.knsrc %{_kf5_knsrcfilesdir}/emoticons.knsrc %{_kf5_knsrcfilesdir}/icons.knsrc %{_kf5_knsrcfilesdir}/kfontinst.knsrc %{_kf5_knsrcfilesdir}/plasma-themes.knsrc %{_kf5_knsrcfilesdir}/lookandfeel.knsrc %{_kf5_knsrcfilesdir}/xcursor.knsrc %{_kf5_knsrcfilesdir}/ksplash.knsrc %{_kf5_knsrcfilesdir}/gtk2_themes.knsrc %{_kf5_knsrcfilesdir}/gtk3_themes.knsrc %{_kf5_bindir}/kaccess %{_kf5_bindir}/kapplymousetheme %{_kf5_bindir}/kfontinst %{_kf5_bindir}/kfontview %{_kf5_bindir}/knetattach %{_kf5_bindir}/krdb %{_kf5_bindir}/kcm-touchpad-list-devices %{_kf5_bindir}/solid-action-desktop-gen %{_kf5_bindir}/lookandfeeltool %{_kf5_bindir}/kcolorschemeeditor %{_kf5_bindir}/tastenbrett %{_kf5_libdir}/kconf_update_bin/krdb_clearlibrarypath %{_kf5_libdir}/libexec/ %{_kf5_libdir}/libkdeinit5_kaccess.so %exclude %{_kf5_libdir}/libkfontinst.so %{_kf5_libdir}/libkfontinst.so.* %exclude %{_kf5_libdir}/libkfontinstui.so %{_kf5_libdir}/libkfontinstui.so.* %{_kf5_plugindir}/ %{_kf5_qmldir}/ %{_kf5_applicationsdir}/org.kde.kfontview.desktop %{_kf5_applicationsdir}/org.kde.knetattach.desktop %{_kf5_applicationsdir}/org.kde.kcolorschemeeditor.desktop %{_kf5_sharedir}/dbus-1/services/org.kde.fontinst.service %{_kf5_sharedir}/dbus-1/system-services/org.kde.fontinst.service %{_kf5_sharedir}/dbus-1/system-services/org.kde.kcontrol.kcmclock.service %{_kf5_sharedir}/polkit-1/actions/org.kde.fontinst.policy %{_kf5_sharedir}/polkit-1/actions/org.kde.kcontrol.kcmclock.policy %dir %{_kf5_htmldir}/en %dir %{_kf5_htmldir} %doc %{_kf5_htmldir}/en/*/ %dir %{_kf5_iconsdir}/hicolor/*/ %dir %{_kf5_iconsdir}/hicolor/*/*/ %{_kf5_iconsdir}/hicolor/*/*/*.* %{_kf5_configkcfgdir}/ %{_kf5_sharedir}/kcm_componentchooser/ %{_kf5_sharedir}/kcmkeys/ %{_kf5_sharedir}/kcmsolidactions/ %{_kf5_sharedir}/kconf_update/ %{_kf5_sharedir}/kcontrol/ %{_kf5_sharedir}/kdisplay/ %{_kf5_sharedir}/kfontinst/ %{_kf5_sharedir}/kxmlgui5/ %{_kf5_sharedir}/kpackage/ %{_kf5_sharedir}/kcmmouse/ %{_kf5_sharedir}/kcmkeyboard/ %{_kf5_notifydir}/ %{_kf5_sharedir}/konqsidebartng/ %{_kf5_servicesdir}/ %{_kf5_servicetypesdir}/ %{_kf5_datadir}/ %{_kf5_sharedir}/solid/ %exclude %{_kf5_plasmadir}/ibus-emoji-dicts/ %{_kf5_plasmadir}/ %{_kf5_appstreamdir}/ %{_kf5_libdir}/libexec/kimpanel-ibus-panel %{_kf5_qmldir}/org/kde/plasma/private/kimpanel/ %{_kf5_servicesdir}/*kimpanel* %{_kf5_plasmadir}/services/kimpanel.operations %{_kf5_plasmadir}/plasmoids/org.kde.plasma.kimpanel/ %{_kf5_plugindir}/plasma/dataengine/plasma_engine_kimpanel.so %files emojier %{_kf5_bindir}/ibus-ui-emojier-plasma %{_kf5_applicationsdir}/org.kde.plasma.emojier.desktop %dir %{_kf5_sharedir}/kglobalaccel %{_kf5_sharedir}/kglobalaccel/org.kde.plasma.emojier.desktop %if !%{have_ibus_dict_emoji_pkg} %{_kf5_plasmadir}/ibus-emoji-dicts/ %endif %if %{with lang} %files lang -f %{name}.lang %endif %changelog ++++++ 0001-Pass-Qt-MatchExactly-when-calling-QAbstractItemModel.patch ++++++ >From edf0b4ae99c5957667d58dc55fdeac69087331d3 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fab...@ritter-vogt.de> Date: Thu, 4 Mar 2021 21:52:46 +0100 Subject: [PATCH] Pass Qt::MatchExactly when calling QAbstractItemModel::match for strings It defaults to Qt::MatchStartsWith and thus returns the wrong result. --- kcms/colors/colors.cpp | 2 +- kcms/colors/filterproxymodel.cpp | 2 +- kcms/desktoptheme/filterproxymodel.cpp | 2 +- kcms/desktoptheme/themesmodel.cpp | 2 +- kcms/icons/main.cpp | 2 +- kcms/keys/kglobalshortcutseditor.cpp | 4 ++-- kcms/ksplash/kcm.cpp | 2 +- kcms/lookandfeel/kcm.cpp | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kcms/colors/colors.cpp b/kcms/colors/colors.cpp index dc38a8463..ddde28ba3 100644 --- a/kcms/colors/colors.cpp +++ b/kcms/colors/colors.cpp @@ -243,7 +243,7 @@ void KCMColors::installSchemeFile(const QString &path) m_model->load(); - const auto results = m_model->match(m_model->index(0, 0), ColorsModel::SchemeNameRole, newName); + const auto results = m_model->match(m_model->index(0, 0), ColorsModel::SchemeNameRole, newName, 1, Qt::MatchExactly); if (!results.isEmpty()) { m_model->setSelectedScheme(newName); } diff --git a/kcms/colors/filterproxymodel.cpp b/kcms/colors/filterproxymodel.cpp index 5b1c3d711..168363bf9 100644 --- a/kcms/colors/filterproxymodel.cpp +++ b/kcms/colors/filterproxymodel.cpp @@ -49,7 +49,7 @@ void FilterProxyModel::setSelectedScheme(const QString &scheme) int FilterProxyModel::selectedSchemeIndex() const { // We must search in the source model and then map the index to our proxy model. - const auto results = sourceModel()->match(sourceModel()->index(0, 0), ColorsModel::SchemeNameRole, m_selectedScheme); + const auto results = sourceModel()->match(sourceModel()->index(0, 0), ColorsModel::SchemeNameRole, m_selectedScheme, 1, Qt::MatchExactly); if (results.count() == 1) { const QModelIndex result = mapFromSource(results.first()); diff --git a/kcms/desktoptheme/filterproxymodel.cpp b/kcms/desktoptheme/filterproxymodel.cpp index 5f6211863..03a2dffda 100644 --- a/kcms/desktoptheme/filterproxymodel.cpp +++ b/kcms/desktoptheme/filterproxymodel.cpp @@ -53,7 +53,7 @@ void FilterProxyModel::setSelectedTheme(const QString &pluginName) int FilterProxyModel::selectedThemeIndex() const { // We must search in the source model and then map the index to our proxy model. - const auto results = sourceModel()->match(sourceModel()->index(0, 0), ThemesModel::PluginNameRole, m_selectedTheme); + const auto results = sourceModel()->match(sourceModel()->index(0, 0), ThemesModel::PluginNameRole, m_selectedTheme, 1, Qt::MatchExactly); if (results.count() == 1) { const QModelIndex result = mapFromSource(results.first()); diff --git a/kcms/desktoptheme/themesmodel.cpp b/kcms/desktoptheme/themesmodel.cpp index f2b3fa8dd..fbaec9ba2 100644 --- a/kcms/desktoptheme/themesmodel.cpp +++ b/kcms/desktoptheme/themesmodel.cpp @@ -135,7 +135,7 @@ void ThemesModel::setSelectedTheme(const QString &pluginName) int ThemesModel::pluginIndex(const QString &pluginName) const { - const auto results = match(index(0, 0), PluginNameRole, pluginName); + const auto results = match(index(0, 0), PluginNameRole, pluginName, 1, Qt::MatchExactly); if (results.count() == 1) { return results.first().row(); } diff --git a/kcms/icons/main.cpp b/kcms/icons/main.cpp index aec4a091a..7e1cdae6d 100644 --- a/kcms/icons/main.cpp +++ b/kcms/icons/main.cpp @@ -494,7 +494,7 @@ QPixmap IconModule::getBestIcon(KIconTheme &theme, const QStringList &iconNames, int IconModule::pluginIndex(const QString &themeName) const { - const auto results = m_model->match(m_model->index(0, 0), ThemeNameRole, themeName); + const auto results = m_model->match(m_model->index(0, 0), ThemeNameRole, themeName, 1, Qt::MatchExactly); if (results.count() == 1) { return results.first().row(); } diff --git a/kcms/keys/kglobalshortcutseditor.cpp b/kcms/keys/kglobalshortcutseditor.cpp index 5a92e6977..da6ebc3c9 100644 --- a/kcms/keys/kglobalshortcutseditor.cpp +++ b/kcms/keys/kglobalshortcutseditor.cpp @@ -406,7 +406,7 @@ void KGlobalShortcutsEditor::activateComponent(const QString &component) Q_ASSERT(iter != d->components.end()); return; } else { - QModelIndexList results = d->proxyModel->match(d->proxyModel->index(0, 0), Qt::DisplayRole, component); + QModelIndexList results = d->proxyModel->match(d->proxyModel->index(0, 0), Qt::DisplayRole, component, 1, Qt::MatchExactly); Q_ASSERT(!results.isEmpty()); if (results.first().isValid()) { // Known component. Get it. @@ -831,7 +831,7 @@ void KGlobalShortcutsEditor::KGlobalShortcutsEditorPrivate::removeComponent( if (components.value(text)->uniqueName() == componentUnique) { // Remove from QComboBox - QModelIndexList results = proxyModel->match(proxyModel->index(0, 0), Qt::DisplayRole, text); + QModelIndexList results = proxyModel->match(proxyModel->index(0, 0), Qt::DisplayRole, text, 1, Qt::MatchExactly); Q_ASSERT(!results.isEmpty()); model->removeRow(proxyModel->mapToSource(results.first()).row()); diff --git a/kcms/ksplash/kcm.cpp b/kcms/ksplash/kcm.cpp index 389900159..d4f04d4c5 100644 --- a/kcms/ksplash/kcm.cpp +++ b/kcms/ksplash/kcm.cpp @@ -132,7 +132,7 @@ void KCMSplashScreen::save() int KCMSplashScreen::pluginIndex(const QString &pluginName) const { - const auto results = m_model->match(m_model->index(0, 0), PluginNameRole, pluginName); + const auto results = m_model->match(m_model->index(0, 0), PluginNameRole, pluginName, 1, Qt::MatchExactly); if (results.count() == 1) { return results.first().row(); } diff --git a/kcms/lookandfeel/kcm.cpp b/kcms/lookandfeel/kcm.cpp index 8b0a7a7b9..17f00d662 100644 --- a/kcms/lookandfeel/kcm.cpp +++ b/kcms/lookandfeel/kcm.cpp @@ -121,7 +121,7 @@ QStandardItemModel *KCMLookandFeel::lookAndFeelModel() const int KCMLookandFeel::pluginIndex(const QString &pluginName) const { - const auto results = m_model->match(m_model->index(0, 0), PluginNameRole, pluginName); + const auto results = m_model->match(m_model->index(0, 0), PluginNameRole, pluginName, 1, Qt::MatchExactly); if (results.count() == 1) { return results.first().row(); } -- 2.25.1 ++++++ 0001-Stop-multiplying-duration-values.patch ++++++ >From 757df5031279ac7ebe608bf5a43fbc0b0088a202 Mon Sep 17 00:00:00 2001 From: Nate Graham <n...@kde.org> Date: Tue, 24 Mar 2020 08:15:12 -0600 Subject: [PATCH] Stop multiplying duration values Summary: After D28144, some animations are now too long because they were inappropriately multiplying a duration value. That's no longer necessary, so let's remove the multiplication. Depends on D28144 Test Plan: Various things that were a bit too slow before feel just right now Reviewers: #vdg, #plasma Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D28239 --- applets/taskmanager/package/contents/ui/Task.qml | 2 +- applets/taskmanager/package/contents/ui/TaskList.qml | 2 +- .../contents/configuration/PanelConfiguration.qml | 4 ++-- desktoppackage/contents/explorer/WidgetExplorer.qml | 7 +++---- toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml | 6 +++--- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/applets/taskmanager/package/contents/ui/Task.qml b/applets/taskmanager/package/contents/ui/Task.qml index 1327f35e0..b85578d13 100644 --- a/applets/taskmanager/package/contents/ui/Task.qml +++ b/applets/taskmanager/package/contents/ui/Task.qml @@ -293,7 +293,7 @@ MouseArea { Timer { id: timer - interval: units.longDuration * 2 + interval: units.longDuration repeat: false onTriggered: { diff --git a/applets/taskmanager/package/contents/ui/TaskList.qml b/applets/taskmanager/package/contents/ui/TaskList.qml index 594420baa..6d6bc456c 100644 --- a/applets/taskmanager/package/contents/ui/TaskList.qml +++ b/applets/taskmanager/package/contents/ui/TaskList.qml @@ -34,7 +34,7 @@ Flow { NumberAnimation { properties: "x, y" easing.type: Easing.OutQuad - duration: units.longDuration * 2 + duration: units.longDuration } PropertyAction { target: taskList; property: "animating"; value: false } diff --git a/desktoppackage/contents/configuration/PanelConfiguration.qml b/desktoppackage/contents/configuration/PanelConfiguration.qml index 0e11a964d..33e3fbc05 100644 --- a/desktoppackage/contents/configuration/PanelConfiguration.qml +++ b/desktoppackage/contents/configuration/PanelConfiguration.qml @@ -103,7 +103,7 @@ PlasmaCore.FrameSvgItem { return panel.screenGeometry.y + panel.screenGeometry.height - panel.height - panel.distance } } - duration: units.shortDuration * 3 + duration: units.shortDuration } NumberAnimation { @@ -122,7 +122,7 @@ PlasmaCore.FrameSvgItem { return panel.screenGeometry.y + panel.screenGeometry.height - panel.height - configDialog.height - panel.distance } } - duration: units.shortDuration * 3 + duration: units.shortDuration } } //END Animations diff --git a/desktoppackage/contents/explorer/WidgetExplorer.qml b/desktoppackage/contents/explorer/WidgetExplorer.qml index 1b531dc6f..0c5c6be26 100644 --- a/desktoppackage/contents/explorer/WidgetExplorer.qml +++ b/desktoppackage/contents/explorer/WidgetExplorer.qml @@ -306,8 +306,7 @@ Item { properties: "x" from: -list.width to: 0 - duration: units.shortDuration * 3 - + duration: units.shortDuration } } @@ -316,7 +315,7 @@ Item { NumberAnimation { properties: "x" to: list.width - duration: units.shortDuration * 3 + duration: units.shortDuration } } @@ -329,7 +328,7 @@ Item { displaced: Transition { NumberAnimation { properties: "y" - duration: units.shortDuration * 3 + duration: units.shortDuration } } } diff --git a/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml b/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml index e8055ec1e..3549a077d 100644 --- a/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml +++ b/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml @@ -54,14 +54,14 @@ Item { } Behavior on rotation { NumberAnimation { - duration: units.shortDuration * 3; + duration: units.shortDuration; easing.type: Easing.InOutExpo; } enabled: visible } Behavior on x { NumberAnimation { - duration: units.shortDuration * 3; + duration: units.shortDuration; easing.type: Easing.InOutExpo; } enabled: visible @@ -69,7 +69,7 @@ Item { } Behavior on y { NumberAnimation { - duration: units.shortDuration * 3; + duration: units.shortDuration; easing.type: Easing.InOutExpo; } enabled: visible -- 2.25.1 ++++++ 0001-Use-themed-user-face-icon-in-kickoff.patch ++++++ >From 2517af35b8e51758c1e20a768bd8914e3fd06762 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fab...@ritter-vogt.de> Date: Sat, 18 Mar 2017 17:45:51 +0100 Subject: [PATCH] Use themed user face icon in kickoff - Same as sddm. Fits better. - kde#377332 --- applets/kickoff/package/contents/ui/Header.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/applets/kickoff/package/contents/ui/Header.qml b/applets/kickoff/package/contents/ui/Header.qml index a072793f0..b20823a10 100644 --- a/applets/kickoff/package/contents/ui/Header.qml +++ b/applets/kickoff/package/contents/ui/Header.qml @@ -116,7 +116,6 @@ Item { visible: faceIcon.status !== Image.Ready anchors.fill: faceIcon anchors.bottomMargin: units.smallSpacing - usesPlasmaTheme: false } MouseArea { ++++++ 0001-krdb-Drop-GTK2-colour-exporting.patch ++++++ >From acf7b1d2278586b2b05c2e09866452be418edb49 Mon Sep 17 00:00:00 2001 From: Carson Black <uhh...@gmail.com> Date: Fri, 17 Apr 2020 11:45:04 -0400 Subject: [PATCH] [krdb] Drop GTK2 colour exporting Summary: With the vast supermajority of modern GTK2 themes using pixmaps, exporting colours is only likely to result in breakage. BUG: 412331 FIXED-IN: 5.19.0 (or should we consider this a bugfix and land it on the stable branch?) Reviewers: #plasma, ngraham, gikari, davidedmundson Reviewed By: #plasma, ngraham, davidedmundson Subscribers: gikari, fvogt, ngraham, plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D28658 --- kcms/krdb/krdb.cpp | 66 +++------------------------------------------- 1 file changed, 3 insertions(+), 63 deletions(-) diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp index 82a51a032..30c7b2578 100644 --- a/kcms/krdb/krdb.cpp +++ b/kcms/krdb/krdb.cpp @@ -255,7 +255,7 @@ static QString color( const QColor& col ) return QStringLiteral( "{ %1, %2, %3 }" ).arg( item( col.red() ) ).arg( item( col.green() ) ).arg( item( col.blue() ) ); } -static void createGtkrc( bool exportColors, const QPalette& cg, bool exportGtkTheme, const QString& gtkTheme, int version ) +static void createGtkrc( const QPalette& cg, bool exportGtkTheme, const QString& gtkTheme, int version ) { // lukas: why does it create in ~/.kde/share/config ??? // pfeiffer: so that we don't overwrite the user's gtkrc. @@ -328,71 +328,11 @@ static void createGtkrc( bool exportColors, const QPalette& cg, bool exportGtkTh t << endl; t << "gtk-theme-name=\"" << gtkStyle << "\"" << endl; t << endl; - if (gtkStyle == QLatin1String("oxygen-gtk")) - exportColors = false; } } } - if (exportColors) - { - t << "style \"default\"" << endl; - t << "{" << endl; - t << " bg[NORMAL] = " << color( cg.color( QPalette::Active, QPalette::Window ) ) << endl; - t << " bg[SELECTED] = " << color( cg.color(QPalette::Active, QPalette::Highlight) ) << endl; - t << " bg[INSENSITIVE] = " << color( cg.color( QPalette::Active, QPalette::Window ) ) << endl; - t << " bg[ACTIVE] = " << color( cg.color( QPalette::Active, QPalette::Mid ) ) << endl; - t << " bg[PRELIGHT] = " << color( cg.color( QPalette::Active, QPalette::Window ) ) << endl; - t << endl; - t << " base[NORMAL] = " << color( cg.color( QPalette::Active, QPalette::Base ) ) << endl; - t << " base[SELECTED] = " << color( cg.color(QPalette::Active, QPalette::Highlight) ) << endl; - t << " base[INSENSITIVE] = " << color( cg.color( QPalette::Active, QPalette::Window ) ) << endl; - t << " base[ACTIVE] = " << color( cg.color(QPalette::Active, QPalette::Highlight) ) << endl; - t << " base[PRELIGHT] = " << color( cg.color(QPalette::Active, QPalette::Highlight) ) << endl; - t << endl; - t << " text[NORMAL] = " << color( cg.color(QPalette::Active, QPalette::Text) ) << endl; - t << " text[SELECTED] = " << color( cg.color(QPalette::Active, QPalette::HighlightedText) ) << endl; - t << " text[INSENSITIVE] = " << color( cg.color( QPalette::Active, QPalette::Mid ) ) << endl; - t << " text[ACTIVE] = " << color( cg.color(QPalette::Active, QPalette::HighlightedText) ) << endl; - t << " text[PRELIGHT] = " << color( cg.color(QPalette::Active, QPalette::HighlightedText) ) << endl; - t << endl; - t << " fg[NORMAL] = " << color ( cg.color( QPalette::Active, QPalette::WindowText ) ) << endl; - t << " fg[SELECTED] = " << color( cg.color(QPalette::Active, QPalette::HighlightedText) ) << endl; - t << " fg[INSENSITIVE] = " << color( cg.color( QPalette::Active, QPalette::Mid ) ) << endl; - t << " fg[ACTIVE] = " << color( cg.color( QPalette::Active, QPalette::WindowText ) ) << endl; - t << " fg[PRELIGHT] = " << color( cg.color( QPalette::Active, QPalette::WindowText ) ) << endl; - t << "}" << endl; - t << endl; - t << "class \"*\" style \"default\"" << endl; - t << endl; - - // tooltips don't have the standard background color - t << "style \"ToolTip\"" << endl; - t << "{" << endl; - t << " bg[NORMAL] = " << color( cg.color( QPalette::ToolTipBase ) ) << endl; - t << " base[NORMAL] = " << color( cg.color( QPalette::ToolTipBase ) ) << endl; - t << " text[NORMAL] = " << color( cg.color( QPalette::ToolTipText ) ) << endl; - t << " fg[NORMAL] = " << color( cg.color( QPalette::ToolTipText ) ) << endl; - t << "}" << endl; - t << endl; - t << "widget \"gtk-tooltip\" style \"ToolTip\"" << endl; - t << "widget \"gtk-tooltips\" style \"ToolTip\"" << endl; - t << "widget \"gtk-tooltip*\" style \"ToolTip\"" << endl; - t << endl; - - - // highlight the current (mouse-hovered) menu-item - // not every button, checkbox, etc. - t << "style \"MenuItem\"" << endl; - t << "{" << endl; - t << " bg[PRELIGHT] = " << color( cg.color(QPalette::Highlight) ) << endl; - t << " fg[PRELIGHT] = " << color( cg.color(QPalette::HighlightedText) ) << endl; - t << "}" << endl; - t << endl; - t << "class \"*MenuItem\" style \"MenuItem\"" << endl; - t << endl; - } saveFile.commit(); } @@ -692,8 +632,8 @@ void runRdb( uint flags ) else gtkTheme = QStringLiteral("oxygen"); - createGtkrc( exportColors, newPal, exportGtkTheme, gtkTheme, 1 ); - createGtkrc( exportColors, newPal, exportGtkTheme, gtkTheme, 2 ); + createGtkrc( newPal, exportGtkTheme, gtkTheme, 1 ); + createGtkrc( newPal, exportGtkTheme, gtkTheme, 2 ); // Export colors to non-(KDE/Qt) apps (e.g. Motif, GTK+ apps) if (exportColors) -- 2.25.1 ++++++ Reparse-the-key-repeat-rate-config-when-we-try-to-load-it.patch ++++++ >From 35c2ec86680f0feedaaeecb3b54bf2b9ddce6541 Mon Sep 17 00:00:00 2001 From: Weng Xuetian <wen...@gmail.com> Date: Thu, 17 Dec 2020 22:06:56 -0800 Subject: [PATCH] Reparse the key repeat rate config when we try to load it. Right now due to the fact that it is a shared config, we may load the old value from memory. BUG: 418175 FIXED-IN: 5.21 (cherry picked from commit 27a64b96f224b510234c76c22bcc6407a86ea4b8) --- kcms/keyboard/keyboard_hardware.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kcms/keyboard/keyboard_hardware.cpp b/kcms/keyboard/keyboard_hardware.cpp index 95a97e898..7a8656b72 100644 --- a/kcms/keyboard/keyboard_hardware.cpp +++ b/kcms/keyboard/keyboard_hardware.cpp @@ -76,7 +76,9 @@ int set_repeat_mode(TriState keyboardRepeatMode) void init_keyboard_hardware() { - KConfigGroup config(KSharedConfig::openConfig( QStringLiteral("kcminputrc") ), "Keyboard"); + auto inputConfig = KSharedConfig::openConfig( QStringLiteral("kcminputrc") ); + inputConfig->reparseConfiguration(); + KConfigGroup config(inputConfig, "Keyboard"); QString keyRepeatStr = config.readEntry("KeyboardRepeating", TriStateHelper::getString(STATE_ON)); TriState keyRepeat = STATE_UNCHANGED; @@ -100,4 +102,5 @@ void init_keyboard_hardware() KModifierKeyInfo keyInfo; keyInfo.setKeyLocked(Qt::Key_NumLock, numlockState == STATE_ON); } + XFlush(QX11Info::display()); } -- GitLab ++++++ _constraints ++++++ <constraints> <hardware> <disk> <size unit="G">9</size> </disk> <memory> <size unit="G">4</size> </memory> <processors>4</processors> </hardware> <overwrite> <conditions> <arch>s390x</arch> <arch>ppc64</arch> <arch>ppc64le</arch> </conditions> <hardware> <memory> <size unit="G">7</size> </memory> </hardware> </overwrite> <overwrite> <conditions> <arch>armv6l</arch> <arch>armv7l</arch> </conditions> <hardware> <memory> <size unit="M">768</size> </memory> </hardware> </overwrite> </constraints> ++++++ kcms_activities-Use-correct-method-to-set-active-global-shortcut.patch ++++++ >From c5413826168497c361bb7122f9910b267e1e8e50 Mon Sep 17 00:00:00 2001 From: David Edmundson <k...@davidedmundson.co.uk> Date: Fri, 25 Sep 2020 15:01:07 +0100 Subject: [PATCH] [kcms/activities] Use correct method to set active global shortcut We're not binding to the action so we don't want setGlobalShortcut. We also need to not autoload in order to actually save anything. BUG: 374575 --- kcms/activities/imports/dialog.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kcms/activities/imports/dialog.cpp b/kcms/activities/imports/dialog.cpp index 91e5216c8..0ef4f0115 100644 --- a/kcms/activities/imports/dialog.cpp +++ b/kcms/activities/imports/dialog.cpp @@ -290,8 +290,7 @@ void Dialog::saveChanges(const QString &activityId) action.setProperty("isConfigurationAction", true); action.setProperty("componentName", QStringLiteral("ActivityManager")); action.setObjectName(QStringLiteral("switch-to-activity-") + activityId); - KGlobalAccel::self()->removeAllShortcuts(&action); - KGlobalAccel::self()->setGlobalShortcut(&action, activityShortcut()); + KGlobalAccel::self()->setShortcut(&action, {activityShortcut()}, KGlobalAccel::NoAutoloading); // is private? d->features->SetValue(QStringLiteral("org.kde.ActivityManager.Resources.Scoring/isOTR/") -- GitLab
