Drop upstream patches

epel9
Dan Vrátil 9 years ago
parent e0aabe2a99
commit d35b7029f0

@ -1,26 +0,0 @@
From 97ced66da372737ae5d36d86c9bc0c6fe684d842 Mon Sep 17 00:00:00 2001
From: Eike Hein <hein@kde.org>
Date: Tue, 8 Dec 2015 20:26:26 +0100
Subject: [PATCH 08/10] Fix migration of multiple favorites.
BUG:356398
---
desktoppackage/contents/updates/obsolete_kickoffrc.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/desktoppackage/contents/updates/obsolete_kickoffrc.js b/desktoppackage/contents/updates/obsolete_kickoffrc.js
index aae077f..d92cae9 100644
--- a/desktoppackage/contents/updates/obsolete_kickoffrc.js
+++ b/desktoppackage/contents/updates/obsolete_kickoffrc.js
@@ -1,7 +1,7 @@
var kickoffConfig = ConfigFile("kickoffrc");
kickoffConfig.group = "Favorites";
-var favorites = kickoffConfig.readEntry("FavoriteURLs");
+var favorites = kickoffConfig.readEntry("FavoriteURLs").split(',');
kickoffConfig.group = "SystemApplications";
var systemApplications = kickoffConfig.readEntry("DesktopFiles").split(',');
--
2.5.0

@ -28,8 +28,6 @@ Patch101: plasma-desktop-5.4.0-default_favorites_f22.patch
Patch102: plasma-desktop-fedora_layout.patch
## upstream patches
# along with patch8, force plasma's obsolete_kickoff.js to run again
Patch8: 0008-Fix-migration-of-multiple-favorites.patch
## upstreamable patches
@ -164,9 +162,6 @@ BuildArch: noarch
%prep
%setup -q
# no backups
%patch8 -p1
%if 0%{?fedora} > 22
%patch100 -p1 -b .default_favorites
%else

Loading…
Cancel
Save