From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 979731384B4 for ; Wed, 9 Dec 2015 11:53:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D89621C001; Wed, 9 Dec 2015 11:53:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D664321C001 for ; Wed, 9 Dec 2015 11:53:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7A0E340139 for ; Wed, 9 Dec 2015 11:53:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 81C63A3F for ; Wed, 9 Dec 2015 11:53:17 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1449661984.bb2fcd32e96bbad4e4e73c6078561e69a2d5b87f.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/plasma-desktop/files/plasma-desktop-5.5.0-favourites-migration.patch kde-plasma/plasma-desktop/plasma-desktop-5.5.0-r1.ebuild kde-plasma/plasma-desktop/plasma-desktop-5.5.0.ebuild X-VCS-Directories: kde-plasma/plasma-desktop/ kde-plasma/plasma-desktop/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: bb2fcd32e96bbad4e4e73c6078561e69a2d5b87f X-VCS-Branch: master Date: Wed, 9 Dec 2015 11:53:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 07933bd0-cbd3-4e58-8381-72f4ee010123 X-Archives-Hash: d5358143497c3c333ab2c6805c03fae6 commit: bb2fcd32e96bbad4e4e73c6078561e69a2d5b87f Author: Michael Palimaka gentoo org> AuthorDate: Wed Dec 9 11:52:51 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Dec 9 11:53:04 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb2fcd32 kde-plasma/plasma-desktop: backport patch from to fix kickoff favourites migration Package-Manager: portage-2.2.26 ...plasma-desktop-5.5.0-favourites-migration.patch | 26 ++++++++++++++++++++++ ...5.5.0.ebuild => plasma-desktop-5.5.0-r1.ebuild} | 2 ++ 2 files changed, 28 insertions(+) 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 0000000..60dd237 --- /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 +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 similarity index 98% rename from kde-plasma/plasma-desktop/plasma-desktop-5.5.0.ebuild rename to kde-plasma/plasma-desktop/plasma-desktop-5.5.0-r1.ebuild index cdf749a..59ec709 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