commit: 5c72708dd5c2fc20fef298c050a54866ccb7523a Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Fri Sep 19 17:38:01 2014 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Fri Sep 19 17:38:20 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5c72708d
[kde-base/plasma-workspace] Add upstream patch, fixes build with Qt 5.4 Spotted by Franz Fellner <alpine.art.de <AT> gmail.com>, bug #523220. Package-Manager: portage-2.2.13 --- .../files/plasma-workspace-5.0.2-qt54.patch | 82 ++++++++++++++++++++++ .../plasma-workspace/plasma-workspace-5.0.2.ebuild | 5 +- 2 files changed, 86 insertions(+), 1 deletion(-) diff --git a/kde-base/plasma-workspace/files/plasma-workspace-5.0.2-qt54.patch b/kde-base/plasma-workspace/files/plasma-workspace-5.0.2-qt54.patch new file mode 100644 index 0000000..17d016e --- /dev/null +++ b/kde-base/plasma-workspace/files/plasma-workspace-5.0.2-qt54.patch @@ -0,0 +1,82 @@ +From: Aleix Pol <aleix...@kde.org> +Date: Fri, 01 Aug 2014 09:36:43 +0000 +Subject: Fix build in Qt 5.4 +X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=04cb7ba53ebf8959cb783f62f343795ca4baa69c +--- +Fix build in Qt 5.4 + +See https://git.reviewboard.kde.org/r/119242/ +--- + + +--- a/containmentactions/applauncher/launch.cpp ++++ b/containmentactions/applauncher/launch.cpp +@@ -54,7 +54,7 @@ + { + foreach (KSycocaEntry::Ptr p, group->entries(true, false, true)) { + if (p->isType(KST_KService)) { +- const KService::Ptr service = p; ++ const KService::Ptr service(static_cast<KService*>(p.data())); + QAction *action = new QAction(QIcon::fromTheme(service->icon()), service->genericName().isEmpty() ? service->name() : service->genericName(), this); + connect(action, &QAction::triggered, [action](){ + KService::Ptr service = KService::serviceByStorageId(action->data().toString()); +@@ -67,7 +67,7 @@ + m_actions << action; + } + } else if (p->isType(KST_KServiceGroup)) { +- const KServiceGroup::Ptr service = p; ++ const KServiceGroup::Ptr service(static_cast<KServiceGroup*>(p.data())); + if (service->childCount() == 0) { + continue; + } + +From: Kevin Funk <kf...@kde.org> +Date: Wed, 06 Aug 2014 06:23:06 +0000 +Subject: Make compile with Qt 5.4 +X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=0686e449ac4cf611ac3aa2e0bbf37b79aa172582 +--- +Make compile with Qt 5.4 + +BUG: 337929 +--- + + +--- a/dataengines/apps/appsource.cpp ++++ b/dataengines/apps/appsource.cpp +@@ -73,11 +73,11 @@ + QStringList entries; + foreach (KSycocaEntry::Ptr p, m_group->entries(true, false, true)) { + if (p->isType(KST_KService)) { +- const KService::Ptr service = p; ++ const KService::Ptr service(static_cast<KService*>(p.data())); + entries << service->storageId(); + } else if (p->isType(KST_KServiceGroup)) { +- const KServiceGroup::Ptr service = p; +- entries << service->entryPath(); ++ const KServiceGroup::Ptr serviceGroup(static_cast<KServiceGroup*>(p.data())); ++ entries << serviceGroup->entryPath(); + } else if (p->isType(KST_KServiceSeparator)) { + entries << "---"; + } else { + +--- a/kioslave/applications/kio_applications.cpp ++++ b/kioslave/applications/kio_applications.cpp +@@ -155,7 +155,7 @@ + + foreach (const KSycocaEntry::Ptr &e, grp->entries(true, true)) { + if (e->isType(KST_KServiceGroup)) { +- KServiceGroup::Ptr g(e); ++ KServiceGroup::Ptr g(static_cast<KServiceGroup*>(e.data())); + QString groupCaption = g->caption(); + + kDebug() << "ADDING SERVICE GROUP WITH PATH " << g->relPath(); +@@ -177,7 +177,7 @@ + createDirEntry(entry, groupCaption, dirUrl.url(), "inode/directory", g->icon()); + + } else { +- KService::Ptr service(e); ++ KService::Ptr service(static_cast<KService*>(e.data())); + + kDebug() << "the entry name is" << service->desktopEntryName() + << "with path" << service->entryPath(); + diff --git a/kde-base/plasma-workspace/plasma-workspace-5.0.2.ebuild b/kde-base/plasma-workspace/plasma-workspace-5.0.2.ebuild index 0044ebd..507fea3 100644 --- a/kde-base/plasma-workspace/plasma-workspace-5.0.2.ebuild +++ b/kde-base/plasma-workspace/plasma-workspace-5.0.2.ebuild @@ -99,7 +99,10 @@ DEPEND="${COMMON_DEPEND} X? ( x11-proto/xproto ) " -PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-startkde-script.patch" + "${FILESDIR}/${P}-qt54.patch" +) src_configure() { local mycmakeargs=(
