From 9a417d4ee79d78114c45ae25a33e08c41cef976e5aeb88aae8a041db2e6c04cc Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Fri, 18 Aug 2017 10:00:36 +0000
Subject: [PATCH] - Fix more uses of qdbus in
 0001-Rename-qdbus-in-startkde.patch

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=342
---
 0001-Rename-qdbus-in-startkde.patch | 52 +++++++++++++++++++++++++----
 plasma5-workspace.changes           |  5 +++
 2 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/0001-Rename-qdbus-in-startkde.patch b/0001-Rename-qdbus-in-startkde.patch
index 6042a5f..aced69e 100644
--- a/0001-Rename-qdbus-in-startkde.patch
+++ b/0001-Rename-qdbus-in-startkde.patch
@@ -1,8 +1,8 @@
-diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index b7af60b..7ae5f1d 100644
---- a/startkde/startkde.cmake
-+++ b/startkde/startkde.cmake
-@@ -292,7 +292,7 @@ if test $? -ne 0; then
+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
    exit 1
  fi
  
@@ -11,7 +11,7 @@ index b7af60b..7ae5f1d 100644
  
  # finally, give the session control to the session manager
  # see kdebase/ksmserver for the description of the rest of the startup sequence
-@@ -325,13 +325,13 @@ if test x"$wait_drkonqi"x = x"true"x ; then
+@@ -329,13 +329,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
@@ -28,3 +28,43 @@ index b7af60b..7ae5f1d 100644
              done
              break
          fi
+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") }'
diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes
index f96cbcd..e64e4c0 100644
--- a/plasma5-workspace.changes
+++ b/plasma5-workspace.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Aug 18 10:00:19 UTC 2017 - fabian@ritter-vogt.de
+
+- Fix more uses of qdbus in 0001-Rename-qdbus-in-startkde.patch
+
 -------------------------------------------------------------------
 Sun Aug 13 20:02:41 UTC 2017 - fabian@ritter-vogt.de