[arch-commits] Commit in plasma-workspace/trunk (3 files)

[Felix Yan]

    Date: Thursday, August 13, 2015 @ 08:54:04
  Author: fyan
Revision: 243386

upgpkg: plasma-workspace 5.3.2-3

rebuild with baloo 5.13.0

Added:
  plasma-workspace/trunk/baloo-use-filepath-as-id.patch
  plasma-workspace/trunk/remove-baloo-result-header.patch
Modified:
  plasma-workspace/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |   14 +++++++++++---
 baloo-use-filepath-as-id.patch   |   21 +++++++++++++++++++++
 remove-baloo-result-header.patch |   18 ++++++++++++++++++
 3 files changed, 50 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-13 06:18:22 UTC (rev 243385)
+++ PKGBUILD	2015-08-13 06:54:04 UTC (rev 243386)
@@ -7,7 +7,7 @@
 pkgbase=plasma-workspace
 pkgname=('plasma-workspace' 'drkonqi')
 pkgver=5.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc='KDE Plasma Workspace'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
@@ -23,9 +23,13 @@
              'krunner' 'kxmlrpcclient' 'networkmanager-qt')
 groups=('plasma')
 source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz"
-        'kde.pam')
+        'kde.pam'
+        'remove-baloo-result-header.patch'
+        'baloo-use-filepath-as-id.patch')
 md5sums=('3d6a6e1ffcbf2d3e27668dc471523907'
-         '929b182dec8a096206ad493477c09d2c')
+         '929b182dec8a096206ad493477c09d2c'
+         'fd0937f725cb04379a17d27857a0aa02'
+         '418a2de6f3596d20da9fd69715e73a70')
 
 prepare() {
   mkdir build
@@ -33,6 +37,10 @@
   cd ${pkgbase}-${pkgver}
   # be sure to use the Qt5 version of qtpaths
   sed -i 's:qtpaths:qtpaths-qt5:' startkde/startkde.cmake
+
+  # Patch for Baloo 5.13
+  patch -p1 -i ../remove-baloo-result-header.patch
+  patch -p1 -i ../baloo-use-filepath-as-id.patch
 }
 
 build() {

Added: baloo-use-filepath-as-id.patch
===================================================================
--- baloo-use-filepath-as-id.patch	                        (rev 0)
+++ baloo-use-filepath-as-id.patch	2015-08-13 06:54:04 UTC (rev 243386)
@@ -0,0 +1,21 @@
+commit 34c11a481baafd9824ef681b6d359ca34ab04ad8
+Author: Vishesh Handa <me at vhanda.in>
+Date:   Wed May 6 14:27:37 2015 +0200
+
+    Baloo Runner: Use the filepath as the unique id of the match
+    
+    Baloo no longer exports the identifier of the file
+
+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<Plasma::QueryMatch> 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);

Added: remove-baloo-result-header.patch
===================================================================
--- remove-baloo-result-header.patch	                        (rev 0)
+++ remove-baloo-result-header.patch	2015-08-13 06:54:04 UTC (rev 243386)
@@ -0,0 +1,18 @@
+commit 321cdc7278c29bcf4cf15078a71c8ceea47e7e95
+Author: Vishesh Handa <me at vhanda.in>
+Date:   Mon May 11 15:34:51 2015 +0200
+
+    BalooRunner: Baloo/Result header is no longer installed
+
+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 <QTimer>
+ 
+ #include <Baloo/Query>
+-#include <Baloo/Result>
+ 
+ SearchRunner::SearchRunner(QObject* parent, const QVariantList& args)
+     : Plasma::AbstractRunner(parent, args)