diff --git a/.gitignore b/.gitignore index bad7ee5..b984a69 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,35 @@ /plasma-desktop-5.18.3.tar.xz /plasma-desktop-5.18.4.tar.xz /plasma-desktop-5.18.4.1.tar.xz +/plasma-desktop-5.18.5.tar.xz +/plasma-desktop-5.18.90.tar.xz +/plasma-desktop-5.19.0.tar.xz +/plasma-desktop-5.19.1.tar.xz +/plasma-desktop-5.19.2.tar.xz +/plasma-desktop-5.19.3.tar.xz +/plasma-desktop-5.19.4.tar.xz +/plasma-desktop-5.19.5.tar.xz +/plasma-desktop-5.19.90.tar.xz +/plasma-desktop-5.20.0.tar.xz +/plasma-desktop-5.20.1.tar.xz +/plasma-desktop-5.20.2.tar.xz +/plasma-desktop-5.20.3.tar.xz +/plasma-desktop-5.20.4.tar.xz +/plasma-desktop-5.20.5.tar.xz +/plasma-desktop-5.20.90.tar.xz +/plasma-desktop-5.21.0.tar.xz +/plasma-desktop-5.21.1.tar.xz +/plasma-desktop-5.21.2.tar.xz +/plasma-desktop-5.21.3.tar.xz +/plasma-desktop-5.21.4.tar.xz +/plasma-desktop-5.21.5.tar.xz +/plasma-desktop-5.21.90.tar.xz +/0003-Use-python3-explicitly.patch +/0010-Task-Manager-Optimize-parent-process-CGroup-check.patch +/plasma-desktop-5.22.0.tar.xz +/plasma-desktop-5.22.1.tar.xz +/plasma-desktop-5.22.2.tar.xz +/plasma-desktop-5.22.2.1.tar.xz +/plasma-desktop-5.22.3.tar.xz +/plasma-desktop-5.22.4.tar.xz +/plasma-desktop-5.22.5.tar.xz diff --git a/plasma-desktop-5.18.4.1-synaptics_includes.patch b/plasma-desktop-5.18.4.1-synaptics_includes.patch deleted file mode 100644 index 760c3eb..0000000 --- a/plasma-desktop-5.18.4.1-synaptics_includes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up plasma-desktop-5.18.4.1/kcms/touchpad/src/backends/x11/xlibbackend.cpp.syn plasma-desktop-5.18.4.1/kcms/touchpad/src/backends/x11/xlibbackend.cpp ---- plasma-desktop-5.18.4.1/kcms/touchpad/src/backends/x11/xlibbackend.cpp.syn 2020-03-31 09:24:01.000000000 -0500 -+++ plasma-desktop-5.18.4.1/kcms/touchpad/src/backends/x11/xlibbackend.cpp 2020-05-03 13:20:06.830569831 -0500 -@@ -42,7 +42,7 @@ - #include - #include - --#include -+#include - #include - - struct DeviceListDeleter diff --git a/plasma-desktop-5.8-default_favorites.patch b/plasma-desktop-5.8-default_favorites.patch index cb57c76..e2f29f4 100644 --- a/plasma-desktop-5.8-default_favorites.patch +++ b/plasma-desktop-5.8-default_favorites.patch @@ -1,13 +1,13 @@ diff --git a/applets/kickoff/package/contents/config/main.xml b/applets/kickoff/package/contents/config/main.xml -index 3ca76f0..258149c 100644 +index 2ac27a9..142ba25 100644 --- a/applets/kickoff/package/contents/config/main.xml +++ b/applets/kickoff/package/contents/config/main.xml -@@ -20,7 +20,7 @@ - - - -- preferred://browser,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,org.kde.discover.desktop -+ preferred://browser,org.kde.kontact.desktop,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,org.kde.ktpcontactlist.desktop,ktpcontactlist.desktop,org.kde.kate.desktop,kate.desktop,org.kde.konsole.desktop,org.kde.apper.desktop,apper.desktop,org.kde.discover.desktop - - - +@@ -15,7 +15,7 @@ + + + +- preferred://browser,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,org.kde.discover.desktop ++ preferred://browser,org.kde.kontact.desktop,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,org.kde.ktpcontactlist.desktop,ktpcontactlist.desktop,org.kde.kate.desktop,kate.desktop,org.kde.konsole.desktop,org.kde.apper.desktop,apper.desktop,org.kde.discover.desktop + + + diff --git a/plasma-desktop-python-shebang.patch b/plasma-desktop-python-shebang.patch new file mode 100644 index 0000000..9b2a659 --- /dev/null +++ b/plasma-desktop-python-shebang.patch @@ -0,0 +1,10 @@ +diff --git a/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py b/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py +index a019986..cec9c78 100644 +--- a/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py ++++ b/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python3 + import fileinput + + for line in fileinput.input(): diff --git a/plasma-desktop.spec b/plasma-desktop.spec index 7a69904..1392f66 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -1,21 +1,19 @@ - -%global kf5_version_min 5.42 +%global kf5_version_min 5.82 %global synaptics 1 %global scim 1 %if 0%{?rhel} && 0%{?rhel} > 7 %undefine synaptics %undefine scim -ExcludeArch: s390x %endif Name: plasma-desktop Summary: Plasma Desktop shell -Version: 5.18.4.1 -Release: 2%{?dist}.1 +Version: 5.22.5 +Release: 1%{?dist} License: GPLv2+ and (GPLv2 or GPLv3) -URL: https://cgit.kde.org/%{name}.git +URL: https://invent.kde.org/plasma/%{name} %global verdir %(echo %{version} | cut -d. -f1-3) %global revision %(echo %{version} | cut -d. -f3) @@ -35,10 +33,12 @@ Source0: http://download.kde.org/%{stable}/plasma/%{verdir}/%{name}-%{version}.t Patch100: plasma-desktop-5.8-default_favorites.patch ## upstreamable patches -Patch200: https://gitweb.gentoo.org/proj/kde.git/plain/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch +# REBASE? -- rex +#Patch200: https://gitweb.gentoo.org/proj/kde.git/plain/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch +Patch202: plasma-desktop-python-shebang.patch + # use this bundled copy (from f31) if not provided already Source200: synaptics-properties.h -Patch201: plasma-desktop-5.18.4.1-synaptics_includes.patch # filter qmk/plugins provides %global __provides_exclude_from ^(%{_kf5_qmldir}/.*\\.so|%{_kf5_qtplugindir}/.*\\.so)$ @@ -85,11 +85,8 @@ BuildRequires: kf5-baloo-devel >= %{kf5_version_min} BuildRequires: kf5-kdeclarative-devel >= %{kf5_version_min} BuildRequires: kf5-kpeople-devel >= %{kf5_version_min} BuildRequires: kf5-kded-devel >= %{kf5_version_min} -BuildRequires: kf5-kinit-devel >= %{kf5_version_min} -# libkdeinit5_* -%{?kf5_kinit_requires} -BuildRequires: kf5-ksysguard-devel >= %{majmin_ver} +BuildRequires: libksysguard-devel >= %{majmin_ver} BuildRequires: kscreenlocker-devel >= %{majmin_ver} BuildRequires: kwin-devel >= %{majmin_ver} # see %%prep below -- rex @@ -100,6 +97,9 @@ BuildRequires: plasma-workspace-devel >= %{majmin_ver} %if 0%{?fedora} BuildRequires: cmake(AppStreamQt) %endif +BuildRequires: cmake(KAccounts) intltool +BuildRequires: cmake(KUserFeedback) +BuildRequires: PackageKit-Qt5-devel BuildRequires: kf5-kactivities-devel >= %{kf5_version_min} BuildRequires: kf5-kactivities-stats-devel >= %{kf5_version_min} BuildRequires: libcanberra-devel @@ -130,6 +130,9 @@ BuildRequires: pkgconfig(xorg-synaptics) %endif %endif +# kcm_users +Requires: accountsservice + # Desktop Requires: plasma-workspace >= %{majmin_ver} @@ -147,7 +150,13 @@ Requires: kwin >= %{majmin_ver} # kickoff -> edit applications (#1229393) Requires: kmenuedit >= %{majmin_ver} -Requires: qqc2-desktop-style +BuildRequires: kf5-kirigami2 +Requires: kf5-kirigami2%{?_isa} +BuildRequires: qqc2-desktop-style +Requires: qqc2-desktop-style%{?_isa} + +# for ibus-ui-emojier-plasma +Recommends: ibus # Virtual provides for plasma-workspace Provides: plasmashell(desktop) = %{version}-%{release} @@ -158,6 +167,9 @@ Obsoletes: kde-workspace < 5.0.0-1 Obsoletes: kactivities-workspace < 5.6.0 Provides: kactivities-workspace = %{version}-%{release} +Obsoletes: plasma-user-manager < 5.19.50 +Provides: plasma-user-manager = %{version}-%{release} + # kimpanel moved here from kdeplasma-addons-5.5.x Conflicts: kdeplasma-addons < 5.6.0 @@ -193,11 +205,12 @@ BuildArch: noarch ## upstream patches ## upstreamable patches -%patch200 -p1 +#patch200 -p1 +%patch202 -p1 + %if ! 0%{?synaptics} install -pD %{SOURCE200} 3rdparty/xorg/synaptics-properties.h %endif -%patch201 -p1 -b .synaptics_includes ## downstream patches %patch100 -p1 @@ -218,17 +231,13 @@ sed -i.breeze_ver \ %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %endif -mkdir %{_target_platform} -pushd %{_target_platform} -%{cmake_kf5} .. \ - %{?!synaptics:-DSynaptics_INCLUDE_DIRS:PATH="$(pwd)/../3rdparty"} -popd - -%make_build -C %{_target_platform} +%{cmake_kf5} \ + %{?!synaptics:-DSynaptics_INCLUDE_DIRS:PATH="$(pwd)/../3rdparty/xorg"} +%cmake_build %install -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%cmake_install %find_lang %{name} --with-html --all-name @@ -245,41 +254,30 @@ rm -rfv %{buildroot}%{_datadir}/locale/*/LC_SCRIPTS/kfontinst/ %check -desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.{kfontview,knetattach}.desktop +desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.knetattach.desktop %ldconfig_scriptlets %files -f plasmadesktop5.lang -%license COPYING* +%license COPYING %{_bindir}/kaccess -%{_bindir}/kcolorschemeeditor -%{_bindir}/kfontinst -%{_bindir}/kfontview -%{_bindir}/krdb %{_bindir}/knetattach %{_bindir}/solid-action-desktop-gen -%{_bindir}/lookandfeeltool %{_bindir}/ibus-ui-emojier-plasma %{_bindir}/tastenbrett +%{_bindir}/krunner-plugininstaller %{_kf5_libexecdir}/kauth/kcmdatetimehelper -%{_kf5_libexecdir}/kauth/fontinst -%{_kf5_libexecdir}/kauth/fontinst_helper -%{_kf5_libexecdir}/kauth/fontinst_x11 %{_libexecdir}/kimpanel-ibus-panel %{_libexecdir}/kimpanel-ibus-panel-launcher -%{_libexecdir}/plasma-changeicons -%{_libexecdir}/kfontprint %{_kf5_qmldir}/org/kde/plasma/private -%{_kf5_libdir}/libkdeinit5_kaccess.so -%{_kf5_libdir}/kconf_update_bin/* # TODO: -libs subpkg -- rex -%{_kf5_libdir}/libkfontinst.so.* -%{_kf5_libdir}/libkfontinstui.so.* %{_kf5_qtplugindir}/*.so %{_kf5_qtplugindir}/kcms/*.so %{_kf5_plugindir}/kded/*.so +%{_kf5_plugindir}/krunner/krunner*.so %{_kf5_qmldir}/org/kde/plasma/activityswitcher +%{_kf5_qmldir}/org/kde/plasma/emoji/ %{_kf5_qmldir}/org/kde/private/desktopcontainment/* %{_kf5_qmldir}/org/kde/activities/settings/ %{_kf5_datadir}/plasma/* @@ -288,57 +286,36 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.{kfontview,k %{_kf5_datadir}/kservices5/kded/touchpad.desktop %{_bindir}/kcm-touchpad-list-devices %{_kf5_qtplugindir}/plasma/dataengine/plasma_engine_touchpad.so -%{_datadir}/config.kcfg/touchpad.kcfg -%{_datadir}/config.kcfg/touchpaddaemon.kcfg %{_datadir}/dbus-1/interfaces/org.kde.touchpad.xml # kcminput %{_kf5_bindir}/kapplymousetheme %{_kf5_datadir}/kcmmouse/ %endif -%{_datadir}/config.kcfg/browser_settings.kcfg -%{_datadir}/config.kcfg/colorssettings.kcfg -%{_datadir}/config.kcfg/cursorthemesettings.kcfg -%{_datadir}/config.kcfg/fontssettings.kcfg -%{_datadir}/config.kcfg/iconssettingsbase.kcfg -%{_datadir}/config.kcfg/kactivitymanagerd_plugins_settings.kcfg -%{_datadir}/config.kcfg/kactivitymanagerd_settings.kcfg -%{_datadir}/config.kcfg/launchfeedbacksettings.kcfg -%{_datadir}/config.kcfg/lookandfeelsettings.kcfg -%{_datadir}/config.kcfg/splashscreensettings.kcfg -%{_datadir}/config.kcfg/stylesettings.kcfg -%{_datadir}/config.kcfg/terminal_settings.kcfg -%{_datadir}/config.kcfg/workspaceoptions_kdeglobalssettings.kcfg -%{_datadir}/config.kcfg/workspaceoptions_plasmasettings.kcfg +%{_datadir}/config.kcfg/*.kcfg %{_datadir}/kglobalaccel/org.kde.plasma.emojier.desktop -%{_kf5_qtplugindir}/plasma/dataengine/plasma_engine_kimpanel.so +%{_datadir}/qlogging-categories5/*.categories %{_kf5_datadir}/kconf_update/* -%{_kf5_datadir}/kdisplay -%{_kf5_datadir}/kcontrol %{_kf5_datadir}/kcmkeys -%{_kf5_datadir}/kcm_componentchooser -%{_kf5_datadir}/kfontinst %{_kf5_datadir}/kcmkeyboard %{_kf5_datadir}/kpackage/kcms/* %{_kf5_datadir}/knsrcfiles/ -%{_datadir}/konqsidebartng/virtual_folders/services/fonts.desktop %{_kf5_datadir}/kf5/kactivitymanagerd/workspace/ %{_kf5_datadir}/kcmsolidactions/ %{_kf5_datadir}/solid/devices/*.desktop %{_kf5_datadir}/dbus-1/system.d/*.conf %{_kf5_datadir}/kservices5/*.desktop -%{_kf5_datadir}/kservices5/ServiceMenus/installfont.desktop -%{_kf5_datadir}/kservices5/fonts.protocol %{_kf5_datadir}/kservicetypes5/*.desktop -%{_kf5_datadir}/kxmlgui5/kfontview -%{_kf5_datadir}/kxmlgui5/kfontinst %{_kf5_datadir}/knotifications5/*.notifyrc +%ifnarch s390 s390x %{_datadir}/icons/hicolor/*/*/* +%endif %{_kf5_metainfodir}/*.xml %{_datadir}/applications/*.desktop -%{_datadir}/dbus-1/services/*.service %{_datadir}/dbus-1/system-services/*.service -%{_datadir}/polkit-1/actions/org.kde.fontinst.policy %{_datadir}/polkit-1/actions/org.kde.kcontrol.kcmclock.policy +%{_sysconfdir}/xdg/autostart/*.desktop +%{_kf5_datadir}/accounts/providers/kde/ +%{_kf5_datadir}/accounts/services/kde/ %if 0%{?scim} %files kimpanel-scim @@ -349,8 +326,124 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.{kfontview,k %changelog -* Wed May 06 2020 Troy Dawson - 5.18.4.1-2.1 -- No kf5-kactivities for s390x +* Tue Aug 31 2021 Jan Grulich - 5.22.5-1 +- 5.22.5 + +* Tue Jul 27 2021 Jan Grulich - 5.22.4-1 +- 5.22.4 + +* Tue Jul 27 2021 Fedora Release Engineering - 5.22.3-2 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jul 12 2021 Jan Grulich - 5.22.3-1 +- 5.22.3 + +* Tue Jun 22 2021 Jan Grulich - 5.22.2.1-1 +- 5.22.2.1 + +* Tue Jun 22 2021 Jan Grulich - 5.22.2-1 +- 5.22.2 + +* Tue Jun 15 2021 Jan Grulich - 5.22.1-1 +- 5.22.1 + +* Sun Jun 06 2021 Jan Grulich - 5.22.0-1 +- 5.22.0 + +* Thu May 20 2021 Rex Dieter - 5.21.90-3 +- pull in some upstream fixes + +* Sun May 16 2021 Rex Dieter - 5.21.90-2 +- s/kf5-ksysguard/libksysguard/ + +* Fri May 14 2021 Rex Dieter - 5.21.90-1 +- 5.21.90 + +* Tue May 04 2021 Jan Grulich - 5.21.5-1 +- 5.21.5 + +* Tue Apr 06 2021 Jan Grulich - 5.21.4-1 +- 5.21.4 + +* Tue Mar 16 2021 Jan Grulich - 5.21.3-1 +- 5.21.3 + +* Tue Mar 02 2021 Jan Grulich - 5.21.2-1 +- 5.21.2 + +* Tue Feb 23 2021 Jan Grulich - 5.21.1-1 +- 5.21.1 + +* Mon Feb 15 2021 Jan Grulich - 5.21.0-2 +- Tarball respin + +* Thu Feb 11 2021 Jan Grulich - 5.21.0-1 +- 5.21.0 + +* Thu Jan 28 2021 Rex Dieter - 5.20.90-3 +- ibus-ui-emojier-plasma: +Recommends: ibus + +* Tue Jan 26 2021 Rex Dieter - 5.20.90-2 +- for ibus-ui-emojier-plasma: +Recommends: ibus-uniemoji +- fix URL + +* Thu Jan 21 2021 Jan Grulich - 5.20.90-1 +- 5.20.90 (beta) + +* Tue Jan 5 16:03:32 CET 2021 Jan Grulich - 5.20.5-1 +- 5.20.5 + +* Thu Dec 31 2020 Rex Dieter - 5.20.4-2 +- Requires: accountsservice (kde#430916) + +* Tue Dec 1 09:42:59 CET 2020 Jan Grulich - 5.20.4-1 +- 5.20.4 + +* Wed Nov 11 08:22:41 CET 2020 Jan Grulich - 5.20.3-1 +- 5.20.3 + +* Tue Oct 27 14:23:44 CET 2020 Jan Grulich - 5.20.2-1 +- 5.20.2 + +* Tue Oct 20 15:29:34 CEST 2020 Jan Grulich - 5.20.1-1 +- 5.20.1 + +* Sun Oct 11 19:50:04 CEST 2020 Jan Grulich - 5.20.0-1 +- 5.20.0 + +* Fri Sep 18 2020 Jan Grulich - 5.19.90-1 +- 5.19.90 + +* Tue Sep 01 2020 Jan Grulich - 5.19.5-1 +- 5.19.5 + +* Tue Jul 28 2020 Fedora Release Engineering - 5.19.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 28 2020 Jan Grulich - 5.19.4-1 +- 5.19.4 + +* Tue Jul 07 2020 Jan Grulich - 5.19.3-1 +- 5.19.3 + +* Tue Jun 23 2020 Jan Grulich - 5.19.2-1 +- 5.19.2 + +* Wed Jun 17 2020 Martin Kyral - 5.19.1-1 +- 5.19.1 + +* Wed Jun 10 2020 Rex Dieter - 5.19.0-2 +- adjust synaptics hacks (for rhel8), bump kf5 dep + +* Tue Jun 9 2020 Martin Kyral - 5.19.0-1 +- 5.19.0 + +* Fri May 15 2020 Martin Kyral - 5.18.90-1 +- 5.18.90 + +* Tue May 05 2020 Jan Grulich - 5.18.5-1 +- 5.18.5 * Sat May 02 2020 Rex Dieter - 5.18.4.1-2 - use bundled synaptics header, if needed diff --git a/sources b/sources index 960032c..4d2e1b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plasma-desktop-5.18.4.1.tar.xz) = 4cac140ddca8ce57a6e27cfac2946824db40a0adf9f0a9b6fe6079f9b899f4b145941803d4a0f1c575a27a8c76d6a7e889c3218287a126efedd9e722fa9d7089 +SHA512 (plasma-desktop-5.22.5.tar.xz) = 9f39e3709e6e774b8846cb14f8e8aec776ba28c2601c9ee8d7b243240961f2a67cd649eb8005324a4ef0c10ed152ca1a1fc5b2a75c78f551aa20b53106b649ac