2017-08-18 10:00:36 +00:00
|
|
|
Index: plasma-workspace-5.10.4/startkde/startkde.cmake
|
|
|
|
===================================================================
|
|
|
|
--- plasma-workspace-5.10.4.orig/startkde/startkde.cmake
|
|
|
|
+++ plasma-workspace-5.10.4/startkde/startkde.cmake
|
|
|
|
@@ -296,7 +296,7 @@ if test $? -ne 0; then
|
2017-01-13 16:51:22 +00:00
|
|
|
exit 1
|
2014-07-11 17:36:21 +00:00
|
|
|
fi
|
|
|
|
|
2017-01-13 16:51:22 +00:00
|
|
|
-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
|
|
|
|
+qdbus-qt5 org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
|
2014-07-11 17:36:21 +00:00
|
|
|
|
2017-01-13 16:51:22 +00:00
|
|
|
# finally, give the session control to the session manager
|
|
|
|
# see kdebase/ksmserver for the description of the rest of the startup sequence
|
2017-08-18 10:00:36 +00:00
|
|
|
@@ -329,13 +329,13 @@ if test x"$wait_drkonqi"x = x"true"x ; t
|
2017-01-13 16:51:22 +00:00
|
|
|
# wait for remaining drkonqi instances with timeout (in seconds)
|
|
|
|
wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
|
|
|
|
wait_drkonqi_counter=0
|
|
|
|
- while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
|
|
|
|
+ while qdbus-qt5 | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
|
|
|
|
sleep 5
|
|
|
|
wait_drkonqi_counter=$((wait_drkonqi_counter+5))
|
|
|
|
if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
|
|
|
|
# ask remaining drkonqis to die in a graceful way
|
|
|
|
- qdbus | grep 'org.kde.drkonqi-' | while read address ; do
|
|
|
|
- qdbus "$address" "/MainApplication" "quit"
|
|
|
|
+ qdbus-qt5 | grep 'org.kde.drkonqi-' | while read address ; do
|
|
|
|
+ qdbus-qt5 "$address" "/MainApplication" "quit"
|
|
|
|
done
|
|
|
|
break
|
|
|
|
fi
|
2017-08-18 10:00:36 +00:00
|
|
|
Index: plasma-workspace-5.10.4/startkde/startplasma.cmake
|
|
|
|
===================================================================
|
|
|
|
--- plasma-workspace-5.10.4.orig/startkde/startplasma.cmake
|
|
|
|
+++ plasma-workspace-5.10.4/startkde/startplasma.cmake
|
|
|
|
@@ -132,7 +132,7 @@ if test $? -ne 0; then
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
|
|
|
|
+qdbus-qt5 org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
|
|
|
|
|
|
|
|
# finally, give the session control to the session manager
|
|
|
|
# see kdebase/ksmserver for the description of the rest of the startup sequence
|
|
|
|
@@ -161,13 +161,13 @@ if test x"$wait_drkonqi"x = x"true"x ; t
|
|
|
|
# wait for remaining drkonqi instances with timeout (in seconds)
|
|
|
|
wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
|
|
|
|
wait_drkonqi_counter=0
|
|
|
|
- while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
|
|
|
|
+ while qdbus-qt5 | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
|
|
|
|
sleep 5
|
|
|
|
wait_drkonqi_counter=$((wait_drkonqi_counter+5))
|
|
|
|
if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
|
|
|
|
# ask remaining drkonqis to die in a graceful way
|
|
|
|
- qdbus | grep 'org.kde.drkonqi-' | while read address ; do
|
|
|
|
- qdbus "$address" "/MainApplication" "quit"
|
|
|
|
+ qdbus-qt5 | grep 'org.kde.drkonqi-' | while read address ; do
|
|
|
|
+ qdbus-qt5 "$address" "/MainApplication" "quit"
|
|
|
|
done
|
|
|
|
break
|
|
|
|
fi
|
|
|
|
Index: plasma-workspace-5.10.4/wallpapers/image/wallpaper.knsrc
|
|
|
|
===================================================================
|
|
|
|
--- plasma-workspace-5.10.4.orig/wallpapers/image/wallpaper.knsrc
|
|
|
|
+++ plasma-workspace-5.10.4/wallpapers/image/wallpaper.knsrc
|
|
|
|
@@ -41,4 +41,4 @@ Categories=KDE Wallpaper 800x600,KDE Wal
|
|
|
|
StandardResource=wallpaper
|
|
|
|
Uncompress=archive
|
|
|
|
|
|
|
|
-AdoptionCommand=qdbus org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript 'for (var i in desktops()) { d = desktops()[i]; d.wallpaperPlugin = "org.kde.image"; d.currentConfigGroup = ["Wallpaper", "org.kde.image", "General"]; d.writeConfig("Image", "%f") }'
|
|
|
|
+AdoptionCommand=qdbus-qt5 org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript 'for (var i in desktops()) { d = desktops()[i]; d.wallpaperPlugin = "org.kde.image"; d.currentConfigGroup = ["Wallpaper", "org.kde.image", "General"]; d.writeConfig("Image", "%f") }'
|