From 2cbe7b8d58446dd669f40ef7579c010472fca26e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 16 Aug 2015 01:05:37 +0200 Subject: [PATCH] plasma-workspace: backport few patches to fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...o-Result-header-is-no-longer-install.patch | 25 +++++++++++++++++ ...-the-filepath-as-the-unique-id-of-th.patch | 28 +++++++++++++++++++ .../plasma-workspace/plasma-workspace.bb | 4 +++ 3 files changed, 57 insertions(+) create mode 100644 recipes-kde/plasma/tier3/plasma-workspace/files/0008-BalooRunner-Baloo-Result-header-is-no-longer-install.patch create mode 100644 recipes-kde/plasma/tier3/plasma-workspace/files/0009-Baloo-Runner-Use-the-filepath-as-the-unique-id-of-th.patch diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0008-BalooRunner-Baloo-Result-header-is-no-longer-install.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0008-BalooRunner-Baloo-Result-header-is-no-longer-install.patch new file mode 100644 index 00000000..df55b334 --- /dev/null +++ b/recipes-kde/plasma/tier3/plasma-workspace/files/0008-BalooRunner-Baloo-Result-header-is-no-longer-install.patch @@ -0,0 +1,25 @@ +From 321cdc7278c29bcf4cf15078a71c8ceea47e7e95 Mon Sep 17 00:00:00 2001 +From: Vishesh Handa +Date: Mon, 11 May 2015 15:34:51 +0200 +Subject: [PATCH] BalooRunner: Baloo/Result header is no longer installed + +Upstream-Status: Backport +--- + runners/baloo/baloosearchrunner.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/runners/baloo/baloosearchrunner.cpp b/runners/baloo/baloosearchrunner.cpp +index 2bbd7c1..0023a11 100644 +--- a/runners/baloo/baloosearchrunner.cpp ++++ b/runners/baloo/baloosearchrunner.cpp +@@ -30,7 +30,6 @@ + #include + + #include +-#include + + SearchRunner::SearchRunner(QObject* parent, const QVariantList& args) + : Plasma::AbstractRunner(parent, args) +-- +2.1.0 + diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0009-Baloo-Runner-Use-the-filepath-as-the-unique-id-of-th.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0009-Baloo-Runner-Use-the-filepath-as-the-unique-id-of-th.patch new file mode 100644 index 00000000..a0b891b8 --- /dev/null +++ b/recipes-kde/plasma/tier3/plasma-workspace/files/0009-Baloo-Runner-Use-the-filepath-as-the-unique-id-of-th.patch @@ -0,0 +1,28 @@ +From 34c11a481baafd9824ef681b6d359ca34ab04ad8 Mon Sep 17 00:00:00 2001 +From: Vishesh Handa +Date: Wed, 6 May 2015 14:27:37 +0200 +Subject: [PATCH] Baloo Runner: Use the filepath as the unique id of the match + +Baloo no longer exports the identifier of the file + +Upstream-Status: Backport +--- + runners/baloo/baloosearchrunner.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/runners/baloo/baloosearchrunner.cpp b/runners/baloo/baloosearchrunner.cpp +index 0f5e066..2bbd7c1 100644 +--- a/runners/baloo/baloosearchrunner.cpp ++++ b/runners/baloo/baloosearchrunner.cpp +@@ -114,7 +114,7 @@ QList SearchRunner::match(Plasma::RunnerContext& context, co + + QString iconName = QMimeDatabase().mimeTypeForFile(localUrl).iconName(); + match.setIcon(QIcon::fromTheme(iconName)); +- match.setId(it.id()); ++ match.setId(it.filePath()); + match.setText(url.fileName()); + match.setData(url); + match.setType(Plasma::QueryMatch::PossibleMatch); +-- +2.1.0 + diff --git a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb index 2f7d552d..549e8648 100644 --- a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb +++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb @@ -27,6 +27,7 @@ DEPENDS += " \ kdeclarative \ kdewebkit \ ktextwidgets \ + ktexteditor \ kdelibs4support \ kxmlrpcclient \ kcrash \ @@ -52,6 +53,9 @@ SRC_URI += " \ file://0005-startkde-fix-path-for-start_kdeinit_wrapper.patch \ file://0006-startkde-create-kde-s-home.patch \ file://0007-startkde-enable-starting-X.patch \ + \ + file://0008-BalooRunner-Baloo-Result-header-is-no-longer-install.patch \ + file://0009-Baloo-Runner-Use-the-filepath-as-the-unique-id-of-th.patch \ " # cross libs / headers