git » plasma-workspace.git » commit 8a26518

diff --git a/PKGBUILD b/PKGBUILD
index a81fe95..315eb1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 
 pkgbase=plasma-workspace
 pkgname=('plasma-workspace' 'drkonqi')
-pkgver=5.3.2
-pkgrel=3
+pkgver=5.4.0
+pkgrel=1
 pkgdesc='KDE Plasma Workspace'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
@@ -22,13 +22,9 @@ 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'
-        'remove-baloo-result-header.patch'
-        'baloo-use-filepath-as-id.patch')
-md5sums=('3d6a6e1ffcbf2d3e27668dc471523907'
-         '929b182dec8a096206ad493477c09d2c'
-         'fd0937f725cb04379a17d27857a0aa02'
-         '418a2de6f3596d20da9fd69715e73a70')
+        'kde.pam')
+md5sums=('0bb91a876188f98791358017c85ccec8'
+         '860a00545d17f7d3c248d689a1cedb56')
 
 prepare() {
   mkdir build
@@ -36,10 +32,6 @@ 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() {
@@ -62,7 +54,7 @@ package_plasma-workspace() {
   cd build
   make DESTDIR="${pkgdir}" install
 
-  install -D "${srcdir}"/kde.pam \
+  install -Dm644 "${srcdir}"/kde.pam \
     "${pkgdir}"/etc/pam.d/kde
 
   # Remove conflicts with drkonqi
diff --git a/baloo-use-filepath-as-id.patch b/baloo-use-filepath-as-id.patch
deleted file mode 100644
index 7e64675..0000000
--- a/baloo-use-filepath-as-id.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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/kde.pam b/kde.pam
index 1e48de3..8930b58 100644
--- a/kde.pam
+++ b/kde.pam
@@ -1,6 +1,13 @@
 #%PAM-1.0
 
 auth            include         system-login
+auth		optional	pam_kwallet5.so
+auth		optional	pam_kwallet.so kdehome=.kde4
+
 account         include         system-login
+
 password        include         system-login
+
 session         include         system-login
+session 	optional	pam_kwallet5.so
+session		optional	pam_kwallet.so
diff --git a/remove-baloo-result-header.patch b/remove-baloo-result-header.patch
deleted file mode 100644
index cfc2530..0000000
--- a/remove-baloo-result-header.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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)