diff --git a/Baloo-Result-header-is-no-longer-installed.patch b/Baloo-Result-header-is-no-longer-installed.patch new file mode 100644 index 0000000..1b8b456 --- /dev/null +++ b/Baloo-Result-header-is-no-longer-installed.patch @@ -0,0 +1,19 @@ +From: Vishesh Handa +Date: Mon, 11 May 2015 13:34:51 +0000 +Subject: BalooRunner: Baloo/Result header is no longer installed +X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=321cdc7278c29bcf4cf15078a71c8ceea47e7e95 +--- +BalooRunner: Baloo/Result header is no longer installed +--- + + +--- 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) diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index a757224..943f483 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 5 18:30:00 UTC 2015 - hrvoje.senjan@gmail.com + +- Added patches from upstream to resolve baloo SiC in 5.13.0: + use-the-filepath-as-the-unique-id-of-the-match.patch and + Baloo-Result-header-is-no-longer-installed.patch + ------------------------------------------------------------------- Sun Jun 28 18:32:31 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 5214438..04eda30 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -35,6 +35,8 @@ Patch1: create_kdehome.patch Patch2: 0003-Remove-export-of-QT_PLUGIN_PATH.patch # PATCHES 100-200 and above are from upstream 5.3 branch # PATCHES 201-300 and above are from upstream master/5.4 branch +Patch201: use-the-filepath-as-the-unique-id-of-the-match.patch +Patch202: Baloo-Result-header-is-no-longer-installed.patch BuildRequires: alsa-devel BuildRequires: baloo5-devel >= %{version} BuildRequires: kactivities5-devel >= 5.8.0 @@ -190,6 +192,8 @@ workspace. Development files. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch201 -p1 +%patch202 -p1 %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 diff --git a/use-the-filepath-as-the-unique-id-of-the-match.patch b/use-the-filepath-as-the-unique-id-of-the-match.patch new file mode 100644 index 0000000..9201810 --- /dev/null +++ b/use-the-filepath-as-the-unique-id-of-the-match.patch @@ -0,0 +1,22 @@ +From: Vishesh Handa +Date: Wed, 06 May 2015 12:27:37 +0000 +Subject: Baloo Runner: Use the filepath as the unique id of the match +X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=34c11a481baafd9824ef681b6d359ca34ab04ad8 +--- +Baloo Runner: Use the filepath as the unique id of the match + +Baloo no longer exports the identifier of the file +--- + + +--- a/runners/baloo/baloosearchrunner.cpp ++++ b/runners/baloo/baloosearchrunner.cpp +@@ -114,7 +114,7 @@ + + 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);