Fabian Vogt
068c0bbedb
- Call qtpaths with an absolute path in startkde to make sure the system one is used (boo#1004769) Fixes Plasma starting when there is a different Qt installation in the user's path (that has no qdbus-qt5) like is the case when installing Anaconda, see https://forums.opensuse.org/showthread.php/520628-Could-not-start-D-bus-Can-you-call-qdbus-qt5 OBS-URL: https://build.opensuse.org/request/show/438376 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=272
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
|
|
index 91c8a3c..0c658bd 100644
|
|
--- a/startkde/startkde.cmake
|
|
+++ b/startkde/startkde.cmake
|
|
@@ -20,14 +20,14 @@ unset DYLD_FORCE_FLAT_NAMESPACE
|
|
# in case we have been started with full pathname spec without being in PATH
|
|
bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
|
|
if [ -n "$bindir" ]; then
|
|
- qbindir=`qtpaths --binaries-dir`
|
|
- qdbus=$qbindir/qdbus
|
|
+ qbindir=`/usr/bin/qtpaths --binaries-dir`
|
|
+ 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
|
|
@@ -291,9 +291,9 @@ export XDG_DATA_DIRS
|
|
if $qdbus >/dev/null 2>/dev/null; then
|
|
: # ok
|
|
else
|
|
- echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2
|
|
+ echo 'startkde: Could not start D-Bus. Can you call qdbus-qt5?' 1>&2
|
|
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
|
|
- xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
|
|
+ xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus-qt5?"
|
|
exit 1
|
|
fi
|
|
|