0001-Rename-qdbus-in-startkde.patch 1.1 KB

123456789101112131415161718192021222324252627282930313233
  1. diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
  2. index 91c8a3c..0c658bd 100644
  3. --- a/startkde/startkde.cmake
  4. +++ b/startkde/startkde.cmake
  5. @@ -20,13 +20,13 @@ unset DYLD_FORCE_FLAT_NAMESPACE
  6. bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
  7. if [ -n "$bindir" ]; then
  8. qbindir=`qtpaths --binaries-dir`
  9. - qdbus=$qbindir/qdbus
  10. + qdbus=$qbindir/qdbus-qt5
  11. case $PATH in
  12. $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
  13. *) PATH=$bindir:$PATH; export PATH;;
  14. esac
  15. else
  16. - qdbus=qdbus
  17. + qdbus=qdbus-qt5
  18. fi
  19. # Check if a KDE session already is running and whether it's possible to connect to X
  20. @@ -300,9 +300,9 @@ fi
  21. if $qdbus >/dev/null 2>/dev/null; then
  22. : # ok
  23. else
  24. - echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2
  25. + echo 'startkde: Could not start D-Bus. Can you call qdbus-qt5?' 1>&2
  26. test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
  27. - xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
  28. + xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus-qt5?"
  29. exit 1
  30. fi