author | Felix Yan
<felixonmars@archlinux.org> 2015-01-22 17:31:27 UTC |
committer | Felix Yan
<felixonmars@archlinux.org> 2015-01-22 17:31:27 UTC |
parent | 69cae75b3daee5b3f9e310204cf48d0ac3d47429 |
PKGBUILD | +9 | -3 |
dbus.patch | +38 | -0 |
diff --git a/PKGBUILD b/PKGBUILD index fad957d..d88a70e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ pkgname=plasma-workspace pkgver=5.1.2 -pkgrel=3 +pkgrel=4 pkgdesc='KDE Plasma Workspace' arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/workspace/plasma-workspace' @@ -21,14 +21,20 @@ groups=('plasma-next') options=('!buildflags') source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz" 'kde.pam' - 'screenlocker-input.patch' 'screenlocker-network.patch') + 'screenlocker-input.patch' 'screenlocker-network.patch' 'dbus.patch') md5sums=('8a01835179b25e3a7ff644fd7e52ec96' '929b182dec8a096206ad493477c09d2c' '7e426d07806d8887879d932791bba869' - 'd67e504422a7e80a91b7adf3f41563f5') + 'd67e504422a7e80a91b7adf3f41563f5' + '45f12d6fec8a5e08ce1080f5efb8fb21') prepare() { mkdir -p build + + cd ${pkgname}-${pkgver} + #patch -p1 -i ../screenlocker-input.patch + patch -p1 -i ../screenlocker-network.patch + patch -p1 -i ../dbus.patch } build() { diff --git a/dbus.patch b/dbus.patch new file mode 100644 index 0000000..c450d08 --- /dev/null +++ b/dbus.patch @@ -0,0 +1,38 @@ +commit c0ace3a3994ab024ba5301b0c6be24a907d57eaf +Author: Lukáš Tinkl <lukas@kde.org> +Date: Thu Jan 8 16:57:30 2015 +0100 + + make the call on the right path + + as dbus says + +diff --git a/startkde/ksyncdbusenv/ksyncdbusenv.cpp b/startkde/ksyncdbusenv/ksyncdbusenv.cpp +index 05ffb0e..8a01e7d 100644 +--- a/startkde/ksyncdbusenv/ksyncdbusenv.cpp ++++ b/startkde/ksyncdbusenv/ksyncdbusenv.cpp +@@ -23,6 +23,7 @@ + #include <QDBusMetaType> + #include <QDBusPendingCall> + #include <QProcessEnvironment> ++#include <QDebug> + + typedef QMap<QString,QString> EnvMap; + Q_DECLARE_METATYPE(EnvMap) +@@ -39,7 +40,7 @@ int main(int argc, char **argv) + } + + QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.DBus"), +- QStringLiteral("/"), ++ QStringLiteral("/org/freedesktop/DBus"), + QStringLiteral("org.freedesktop.DBus"), + QStringLiteral("UpdateActivationEnvironment")); + qDBusRegisterMetaType<EnvMap>(); +@@ -47,5 +48,8 @@ int main(int argc, char **argv) + + QDBusPendingCall reply = QDBusConnection::sessionBus().asyncCall(msg); + reply.waitForFinished(); ++ if (reply.isError()) { ++ qDebug() << reply.error().name() << reply.error().message(); ++ } + return reply.isError() ? 1 : 0; + }