kde-plasma/plasma-desktop: backport patch from to fix kickoff favourites migration

Package-Manager: portage-2.2.26
This commit is contained in:
Michael Palimaka
2015-12-09 22:52:51 +11:00
parent 1139fff25a
commit bb2fcd32e9
2 changed files with 28 additions and 0 deletions

View File

@@ -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] 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.4.10

View File

@@ -118,6 +118,8 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
PATCHES=( "${FILESDIR}/${P}-favourites-migration.patch" )
pkg_setup() {
if has_version net-im/skype && use legacy-systray && use amd64; then
einfo