commit: a470c6bd889410ef88453ec505fe5e3ce6c437f2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Sat Oct 25 16:34:13 2014 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sat Oct 25 16:34:13 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a470c6bd
[kde-base/plasma-desktop] Remove unused patch. Package-Manager: portage-2.2.14 --- .../files/plasma-desktop-5.0.2-qt54.patch | 93 ---------------------- 1 file changed, 93 deletions(-) diff --git a/kde-base/plasma-desktop/files/plasma-desktop-5.0.2-qt54.patch b/kde-base/plasma-desktop/files/plasma-desktop-5.0.2-qt54.patch deleted file mode 100644 index 28a92b7..0000000 --- a/kde-base/plasma-desktop/files/plasma-desktop-5.0.2-qt54.patch +++ /dev/null @@ -1,93 +0,0 @@ -From: Aleix Pol <aleix...@kde.org> -Date: Fri, 01 Aug 2014 16:35:40 +0000 -Subject: Fix build in Qt 5.4 -X-Git-Url: http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=2ca1f09aea56eb55a508a6c6bb55b2456950f42b ---- -Fix build in Qt 5.4 ---- - - ---- a/applets/kickoff/core/applicationmodel.cpp -+++ b/applets/kickoff/core/applicationmodel.cpp -@@ -185,7 +185,7 @@ - const KSycocaEntry::Ptr p = (*it); - - if (p->isType(KST_KService)) { -- const KService::Ptr service = p; -+ const KService::Ptr service = KService::Ptr(static_cast<KService*>(p.data())); - - if (service->noDisplay()) { - continue; -@@ -235,7 +235,7 @@ - - existingServices[appName] = service; - } else if (p->isType(KST_KServiceGroup)) { -- const KServiceGroup::Ptr serviceGroup = p; -+ const KServiceGroup::Ptr serviceGroup = KServiceGroup::Ptr(static_cast<KServiceGroup*>(p.data())); - - if (serviceGroup->noDisplay() || serviceGroup->childCount() == 0) { - continue; -@@ -612,13 +612,13 @@ - KSycocaEntry::Ptr e = (*it); - - if (e->isType(KST_KServiceGroup)) { -- KServiceGroup::Ptr g(e); -+ KServiceGroup::Ptr g(KServiceGroup::Ptr(static_cast<KServiceGroup*>(e.data()))); - if (!g->noDisplay()) { - if (createNewProgramListForPath(g->relPath())) - seenProgramsChanged = true; - } - } else if (e->isType(KST_KService)) { -- KService::Ptr s(e); -+ KService::Ptr s(KService::Ptr(static_cast<KService*>(e.data()))); - if (s->isApplication() && !s->noDisplay()) { - QString shortStorageId = s->storageId().remove(".desktop"); - QHash<QString, QDate>::Iterator it_find = d->seenPrograms.find(shortStorageId); - -From: Kevin Funk <kf...@kde.org> -Date: Wed, 06 Aug 2014 06:30:39 +0000 -Subject: Make compile with Qt 5.4 -X-Git-Url: http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=ee4927f4f6ba794afaa256ac2e66e46659d6f4e8 ---- -Make compile with Qt 5.4 - -BUG: 337932 ---- - - ---- a/applets/kicker/plugin/appsmodel.cpp -+++ b/applets/kicker/plugin/appsmodel.cpp -@@ -252,7 +252,7 @@ - const KSycocaEntry::Ptr p = (*it); - - if (p->isType(KST_KServiceGroup)) { -- KServiceGroup::Ptr subGroup = static_cast<KServiceGroup::Ptr >(p); -+ KServiceGroup::Ptr subGroup(static_cast<KServiceGroup*>(p.data())); - - if (!subGroup->noDisplay() && subGroup->childCount() > 0) { - m_entryList << new AppGroupEntry(subGroup, this, m_flat, m_appNameFormat); -@@ -295,7 +295,7 @@ - const KSycocaEntry::Ptr p = (*it); - - if (p->isType(KST_KService)) { -- const KService::Ptr service = static_cast<KService::Ptr>(p); -+ const KService::Ptr service(static_cast<KService*>(p.data())); - - if (!service->noDisplay()) { - bool found = false; -@@ -314,11 +314,12 @@ - - } else if (p->isType(KST_KServiceGroup)) { - if (m_flat) { -- processServiceGroup(static_cast<KServiceGroup::Ptr>(p)); -+ const KServiceGroup::Ptr serviceGroup(static_cast<KServiceGroup*>(p.data())); -+ processServiceGroup(serviceGroup); - - m_sortNeeded = true; - } else { -- const KServiceGroup::Ptr subGroup = static_cast<KServiceGroup::Ptr>(p); -+ const KServiceGroup::Ptr subGroup(static_cast<KServiceGroup*>(p.data())); - - if (!subGroup->noDisplay() && subGroup->childCount() > 0) { - m_entryList << new AppGroupEntry(subGroup, this, m_flat, m_appNameFormat); -
