sync/merge changes from plasma-5 copr

plasma-workspace-ksyncdbusenv-fix-dbus-1.8.14.patch

@@ -0,0 +1,30 @@
+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;
+ }

plasma-workspace-startkde-use-qdbus-qt5.patch

@@ -0,0 +1,20 @@
+diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
+index 91c8a3c..4ecbff2 100644
+--- a/startkde/startkde.cmake
++++ b/startkde/startkde.cmake
+@@ -20,13 +20,13 @@ unset DYLD_FORCE_FLAT_NAMESPACE
+ bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+ if [ -n "$bindir" ]; then
+   qbindir=`qtpaths --binaries-dir`
+-  qdbus=$qbindir/qdbus
++  qdbus=$qbindir/qdbus-qt5
+   case $PATH in
+     $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
+     *) PATH=$bindir:$PATH; export PATH;;
+   esac
+ else
+-  qdbus=qdbus
++  qdbus=qdbus-qt5
+ fi
+ 
+ # Check if a KDE session already is running and whether it's possible to connect to X