diff --git a/.gitignore b/.gitignore index db03dc6..ea63beb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /plasma-desktop-5.4.2.tar.xz /plasma-desktop-5.4.3.tar.xz +/plasma-desktop-5.4.95.tar.xz diff --git a/plasma-desktop-5.4.0-default_favorites.patch b/plasma-desktop-5.4.0-default_favorites.patch index bcc005b..458000c 100644 --- a/plasma-desktop-5.4.0-default_favorites.patch +++ b/plasma-desktop-5.4.0-default_favorites.patch @@ -1,21 +1,21 @@ diff --git a/applets/kickoff/core/favoritesmodel.cpp b/applets/kickoff/core/favoritesmodel.cpp -index ce49939..cbfa456 100644 +index be47347..423c95c 100644 --- a/applets/kickoff/core/favoritesmodel.cpp +++ b/applets/kickoff/core/favoritesmodel.cpp -@@ -133,12 +133,14 @@ public: +@@ -133,13 +133,14 @@ public: // Application releases (i.e. find one that is installed regardless of // whether it uses the current or a previous name). // BUG: 351550 - applications << browser -+ applications << "firefox" - << "org.kde.kontact" << "kontact" - << "org.kde.systemsettings" << "systemsettings" - << "org.kde.dolphin" << "dolphin" - << "org.kde.ktpcontactlist" << "ktp-contactlist" -- << "org.kde.kate" << "kate"; -+ << "org.kde.kate" << "kate" -+ << "org.kde.konsole" -+ << "apper"; ++ applications << QStringLiteral("firefox") + << QStringLiteral("org.kde.kontact") << QStringLiteral("kontact") + << QStringLiteral("org.kde.systemsettings") << QStringLiteral("systemsettings") + << QStringLiteral("org.kde.dolphin") << QStringLiteral("dolphin") + << QStringLiteral("org.kde.ktpcontactlist") << QStringLiteral("ktp-contactlist") + << QStringLiteral("org.kde.kate") << QStringLiteral("kate") +- << QStringLiteral("org.kde.discover") << QStringLiteral("muon-discover") << QStringLiteral("discover"); ++ << QStringLiteral("org.kde.konsole") ++ << QStringLiteral("apper"); QList desktopFiles; diff --git a/plasma-desktop-5.4.0-default_favorites_f22.patch b/plasma-desktop-5.4.0-default_favorites_f22.patch index 61fe49f..7477e1a 100644 --- a/plasma-desktop-5.4.0-default_favorites_f22.patch +++ b/plasma-desktop-5.4.0-default_favorites_f22.patch @@ -1,21 +1,21 @@ diff --git a/applets/kickoff/core/favoritesmodel.cpp b/applets/kickoff/core/favoritesmodel.cpp -index ce49939..cbfa456 100644 +index be47347..423c95c 100644 --- a/applets/kickoff/core/favoritesmodel.cpp +++ b/applets/kickoff/core/favoritesmodel.cpp -@@ -133,12 +133,14 @@ public: +@@ -133,13 +133,14 @@ public: // Application releases (i.e. find one that is installed regardless of // whether it uses the current or a previous name). // BUG: 351550 - applications << browser -+ applications << "konqbrowser" - << "org.kde.kontact" << "kontact" - << "org.kde.systemsettings" << "systemsettings" - << "org.kde.dolphin" << "dolphin" - << "org.kde.ktpcontactlist" << "ktp-contactlist" -- << "org.kde.kate" << "kate"; -+ << "org.kde.kate" << "kate" -+ << "org.kde.konsole" -+ << "apper"; ++ applications << QStringLiteral("konqbrowser") + << QStringLiteral("org.kde.kontact") << QStringLiteral("kontact") + << QStringLiteral("org.kde.systemsettings") << QStringLiteral("systemsettings") + << QStringLiteral("org.kde.dolphin") << QStringLiteral("dolphin") + << QStringLiteral("org.kde.ktpcontactlist") << QStringLiteral("ktp-contactlist") + << QStringLiteral("org.kde.kate") << QStringLiteral("kate") +- << QStringLiteral("org.kde.discover") << QStringLiteral("muon-discover") << QStringLiteral("discover"); ++ << QStringLiteral("org.kde.konsole") ++ << QStringLiteral("apper"); QList desktopFiles; diff --git a/plasma-desktop.spec b/plasma-desktop.spec index 82c1e82..59b1913 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -3,7 +3,7 @@ Name: plasma-desktop Summary: Plasma Desktop shell -Version: 5.4.3 +Version: 5.4.95 Release: 1%{?dist} License: GPLv2+ and (GPLv2 or GPLv3) @@ -23,7 +23,7 @@ Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}. # default kickoff favorites: -preferred_browser(buggy) +firefox +konsole +apper Patch100: plasma-desktop-5.4.0-default_favorites.patch # default kickoff favorites: -preferred_browser(buggy) +konqbrowser +konsole +apper -Patch101: plasma-desktop-5.4.0-default_favorites.patch +Patch101: plasma-desktop-5.4.0-default_favorites_f22.patch # Default to Folder containment (rather than Desktop) Patch102: plasma-desktop-fedora_layout.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1250238 @@ -82,6 +82,7 @@ BuildRequires: kf5-kinit-devel >= %{kf5_version} BuildRequires: kf5-ksysguard-devel >= %{majmin_ver} +BuildRequires: kscreenlocker-devel >= %{majmin_ver} BuildRequires: plasma-workspace-devel >= %{majmin_ver} BuildRequires: kwin-devel >= %{majmin_ver} @@ -245,6 +246,7 @@ fi %{_kf5_libdir}/libKF5ActivitiesExperimentalStats.so.* %{_kf5_qtplugindir}/*.so %{_kf5_qtplugindir}/kcms/*.so +%{_kf5_plugindir}/kded/*.so %{_kf5_qmldir}/org/kde/plasma/activityswitcher %{_kf5_qmldir}/org/kde/private/desktopcontainment/* %{_kf5_datadir}/plasma/* @@ -307,6 +309,9 @@ fi %changelog +* Wed Nov 25 2015 Daniel Vrátil - 5.4.95-1 +- Plasma 5.4.95 + * Thu Nov 05 2015 Daniel Vrátil - 5.4.3-1 - Plasma 5.4.3 diff --git a/sources b/sources index e3e4742..fef8d14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f5a0f34305300e6ed5731dc02df897b6 plasma-desktop-5.4.3.tar.xz +60ecf5b6aa986b7946be40ff68483285 plasma-desktop-5.4.95.tar.xz