author | Felix Yan
<felixonmars@archlinux.org> 2015-08-13 06:54:04 UTC |
committer | Felix Yan
<felixonmars@archlinux.org> 2015-08-13 06:54:04 UTC |
parent | d11cd2722325515f9de0c2b38127fa6c3c8a636d |
PKGBUILD | +11 | -3 |
baloo-use-filepath-as-id.patch | +21 | -0 |
remove-baloo-result-header.patch | +18 | -0 |
diff --git a/PKGBUILD b/PKGBUILD index 61175bd..a81fe95 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,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' @@ -22,9 +22,13 @@ makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd' 'baloo' '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 @@ -32,6 +36,10 @@ prepare() { 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() { diff --git a/baloo-use-filepath-as-id.patch b/baloo-use-filepath-as-id.patch new file mode 100644 index 0000000..7e64675 --- /dev/null +++ b/baloo-use-filepath-as-id.patch @@ -0,0 +1,21 @@ +commit 34c11a481baafd9824ef681b6d359ca34ab04ad8 +Author: Vishesh Handa <me@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); diff --git a/remove-baloo-result-header.patch b/remove-baloo-result-header.patch new file mode 100644 index 0000000..cfc2530 --- /dev/null +++ b/remove-baloo-result-header.patch @@ -0,0 +1,18 @@ +commit 321cdc7278c29bcf4cf15078a71c8ceea47e7e95 +Author: Vishesh Handa <me@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)