pool/plasma5-workspace
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=94

Browse Source
This commit is contained in:
Hrvoje Senjan 2015-08-05 18:27:48 +00:00 committed by Git OBS Bridge
parent bf24100fdd
commit 1f6e4c7b6a
4 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Baloo-Result-header-is-no-longer-installed.patch Normal file
View File

@ -0,0 +1,19 @@
From: Vishesh Handa <me@vhanda.in>
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 <QTimer>
#include <Baloo/Query>
-#include <Baloo/Result>
SearchRunner::SearchRunner(QObject* parent, const QVariantList& args)
: Plasma::AbstractRunner(parent, args)

7
plasma5-workspace.changes
View File

@ -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

4
plasma5-workspace.spec
View File

@ -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

22
use-the-filepath-as-the-unique-id-of-the-match.patch Normal file
View File

@ -0,0 +1,22 @@
From: Vishesh Handa <me@vhanda.in>
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);