From 958bd56229542f34ff2d3a12fa33dded7eefab8b Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Mon, 12 Oct 2015 00:16:28 +0200
Subject: Fix the progress bar on session startup.

Use an additional "dbus-launch --sh-syntax --exit-with-session" to exec
the startkde script.
---
 kde/build/sddm-qt5                                     |  1 +
 kde/patch/sddm-qt5/sddm_consolekit.diff                |  2 +-
 kde/post-install/plasma-workspace/xinit/xinitrc.plasma | 17 ++---------------
 3 files changed, 4 insertions(+), 16 deletions(-)
 create mode 100644 kde/build/sddm-qt5

diff --git a/kde/build/sddm-qt5 b/kde/build/sddm-qt5
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/kde/build/sddm-qt5
@@ -0,0 +1 @@
+2
diff --git a/kde/patch/sddm-qt5/sddm_consolekit.diff b/kde/patch/sddm-qt5/sddm_consolekit.diff
index acdfdc1..af79f75 100644
--- a/kde/patch/sddm-qt5/sddm_consolekit.diff
+++ b/kde/patch/sddm-qt5/sddm_consolekit.diff
@@ -7,7 +7,7 @@ index a5d270d..4b48524 100755
      ;;
    *)
 -    eval exec "$session"
-+    eval exec ck-launch-session "$session"
++    eval exec ck-launch-session dbus-launch --sh-syntax --exit-with-session "$session"
      ;;
  esac
  exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
diff --git a/kde/post-install/plasma-workspace/xinit/xinitrc.plasma b/kde/post-install/plasma-workspace/xinit/xinitrc.plasma
index 390020e..ff3c8a1 100644
--- a/kde/post-install/plasma-workspace/xinit/xinitrc.plasma
+++ b/kde/post-install/plasma-workspace/xinit/xinitrc.plasma
@@ -24,22 +24,9 @@ if [ -f $usermodmap ]; then
     xmodmap $usermodmap
 fi
 
-## KDE Frameworks 5 plus Plasma Next:
-#export KF5=/opt/kf5
-#export PATH=$KF5/bin:$KF5/lib@LIBDIRSUFFIX@/qt5/bin:$PATH
-#export QML2_IMPORT_PATH=$KF5/lib@LIBDIRSUFFIX@/qt5/qml:/usr/lib@LIBDIRSUFFIX@/qt5/qml
-#export QT_PLUGIN_PATH=$KF5/lib@LIBDIRSUFFIX@/qt5/plugins:/usr/lib@LIBDIRSUFFIX@/qt5/plugins
-#export XDG_CONFIG_DIRS=$KF5/etc/xdg:/etc/xdg:/etc/kde/xdg
-#export XDG_DATA_DIRS=$KF5/share:/usr/share:/usr/local/share
-
-#export XDG_DATA_HOME="$HOME/.local5"
-#export XDG_CONFIG_HOME="$HOME/.config5"
-#export XDG_CACHE_HOME="$HOME/.cache5"
-#export KDEHOME="$HOME/.kde5"
-
 # Start the window manager:
 if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
-    ck-launch-session startkde
+    ck-launch-session dbus-launch --sh-syntax --exit-with-session startkde
 else
-    startkde
+    dbus-launch --sh-syntax --exit-with-session startkde
 fi
-- 
cgit v1.2.3