Rebase the faviourites patches.

Untested, but should work.

plasma-desktop-5.4.0-default_favorites.patch

@@ -1,21 +1,13 @@
-diff --git a/applets/kickoff/core/favoritesmodel.cpp b/applets/kickoff/core/favoritesmodel.cpp
+diff --git a/applets/kickoff/package/contents/config/main.xml b/applets/kickoff/package/contents/config/main.xml
-index be47347..423c95c 100644
+index afd0b6f..aa55c49 100644
---- a/applets/kickoff/core/favoritesmodel.cpp
+--- a/applets/kickoff/package/contents/config/main.xml
-+++ b/applets/kickoff/core/favoritesmodel.cpp
++++ b/applets/kickoff/package/contents/config/main.xml
-@@ -133,13 +133,14 @@ public:
+@@ -16,7 +16,7 @@
-         // Application releases (i.e. find one that is installed regardless of
+       <default>start-here-kde</default>
-         // whether it uses the current or a previous name).
+     </entry>
-         // BUG: 351550
+     <entry name="favorites" type="StringList">
--        applications  << browser
+-      <default>preferred://browser,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,org.kde.discover</default>
-+        applications  << QStringLiteral("firefox")
++      <default>firefox,org.kde.kontact.desktop,kontact.desktop,org.kde.systemsettings.desktop,systemsettings.desktop,org.kde.dolphin.desktop,dolphin.desktop,org.kde.ktpcontactlist.desktop,ktpcontactlist.desktop,org.kde.kate.desktop,kate.desktop,apper.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,org.kde.discover</default>
-                       << QStringLiteral("org.kde.kontact") << QStringLiteral("kontact")
+     </entry>
-                       << QStringLiteral("org.kde.systemsettings") << QStringLiteral("systemsettings")
+     <entry name="systemApplications" type="StringList">
-                       << QStringLiteral("org.kde.dolphin") << QStringLiteral("dolphin")
+       <default>systemsettings.desktop</default>
-                       << 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<QString> desktopFiles;
- 

plasma-desktop-5.4.0-default_favorites_f22.patch

@@ -1,21 +1,13 @@
-diff --git a/applets/kickoff/core/favoritesmodel.cpp b/applets/kickoff/core/favoritesmodel.cpp
+diff --git a/applets/kickoff/package/contents/config/main.xml b/applets/kickoff/package/contents/config/main.xml
-index be47347..423c95c 100644
+index afd0b6f..aa55c49 100644
---- a/applets/kickoff/core/favoritesmodel.cpp
+--- a/applets/kickoff/package/contents/config/main.xml
-+++ b/applets/kickoff/core/favoritesmodel.cpp
++++ b/applets/kickoff/package/contents/config/main.xml
-@@ -133,13 +133,14 @@ public:
+@@ -16,7 +16,7 @@
-         // Application releases (i.e. find one that is installed regardless of
+       <default>start-here-kde</default>
-         // whether it uses the current or a previous name).
+     </entry>
-         // BUG: 351550
+     <entry name="favorites" type="StringList">
--        applications  << browser
+-      <default>preferred://browser,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,org.kde.discover</default>
-+        applications  << QStringLiteral("konqbrowser")
++      <default>preferred://browser,org.kde.kontact.desktop,kontact.desktop,org.kde.systemsettings.desktop,systemsettings.desktop,org.kde.dolphin.desktop,dolphin.desktop,org.kde.ktpcontactlist.desktop,ktpcontactlist.desktop,org.kde.kate.desktop,kate.desktop,apper.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,org.kde.discover</default>
-                       << QStringLiteral("org.kde.kontact") << QStringLiteral("kontact")
+     </entry>
-                       << QStringLiteral("org.kde.systemsettings") << QStringLiteral("systemsettings")
+     <entry name="systemApplications" type="StringList">
-                       << QStringLiteral("org.kde.dolphin") << QStringLiteral("dolphin")
+       <default>systemsettings.desktop</default>
-                       << 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<QString> desktopFiles;
-