diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-12-09 22:52:51 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-12-09 22:53:04 +1100 |
| commit | bb2fcd32e96bbad4e4e73c6078561e69a2d5b87f (patch) | |
| tree | f81a0a5088d81a474e428f669509aa8a42e602f1 /kde-plasma | |
| parent | www-apache/passenger: x86 stable wrt bug #567758 (diff) | |
| download | gentoo-bb2fcd32e96bbad4e4e73c6078561e69a2d5b87f.tar.gz gentoo-bb2fcd32e96bbad4e4e73c6078561e69a2d5b87f.tar.bz2 gentoo-bb2fcd32e96bbad4e4e73c6078561e69a2d5b87f.zip | |
kde-plasma/plasma-desktop: backport patch from to fix kickoff favourites migration
Package-Manager: portage-2.2.26
Diffstat (limited to 'kde-plasma')
| -rw-r--r-- | kde-plasma/plasma-desktop/files/plasma-desktop-5.5.0-favourites-migration.patch | 26 | ||||
| -rw-r--r-- | kde-plasma/plasma-desktop/plasma-desktop-5.5.0-r1.ebuild (renamed from kde-plasma/plasma-desktop/plasma-desktop-5.5.0.ebuild) | 2 |
2 files changed, 28 insertions, 0 deletions
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.5.0-favourites-migration.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.5.0-favourites-migration.patch new file mode 100644 index 000000000000..60dd2377f7c5 --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.5.0-favourites-migration.patch @@ -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 + diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.5.0.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.5.0-r1.ebuild index cdf749a0f5aa..59ec709f7306 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.5.0.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.5.0-r1.ebuild @@ -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 |