backport favorites migration fix (#1289709)

epel9
Rex Dieter 9 years ago
parent 9aeef6d8ee
commit 57f02c836e

@ -0,0 +1,26 @@
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

@ -4,7 +4,7 @@
Name: plasma-desktop Name: plasma-desktop
Summary: Plasma Desktop shell Summary: Plasma Desktop shell
Version: 5.5.0 Version: 5.5.0
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ and (GPLv2 or GPLv3) License: GPLv2+ and (GPLv2 or GPLv3)
URL: https://projects.kde.org/projects/kde/workspace/plasma-desktop URL: https://projects.kde.org/projects/kde/workspace/plasma-desktop
@ -28,6 +28,7 @@ Patch101: plasma-desktop-5.4.0-default_favorites_f22.patch
Patch102: plasma-desktop-fedora_layout.patch Patch102: plasma-desktop-fedora_layout.patch
## upstream patches ## upstream patches
Patch8: 0008-Fix-migration-of-multiple-favorites.patch
## upstreamable patches ## upstreamable patches
@ -159,6 +160,8 @@ BuildArch: noarch
%prep %prep
%setup -q %setup -q
%patch8 -p1 -b .0008
%if 0%{?fedora} > 22 %if 0%{?fedora} > 22
%patch100 -p1 -b .default_favorites %patch100 -p1 -b .default_favorites
%else %else
@ -301,6 +304,9 @@ fi
%lang(uk) %{_docdir}/HTML/uk/plasma-desktop/ %lang(uk) %{_docdir}/HTML/uk/plasma-desktop/
%changelog %changelog
* Tue Dec 08 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-2
- backport favorites migration fix (#1289709)
* Thu Dec 03 2015 Daniel Vrátil <dvratil@fedoraproject.org> - 5.5.0-1 * Thu Dec 03 2015 Daniel Vrátil <dvratil@fedoraproject.org> - 5.5.0-1
- Plasma 5.5.0 - Plasma 5.5.0

Loading…
Cancel
Save