From 7d2e419597bc2a716f1d8386eb44c4a662f5e8dc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 2 Jun 2015 16:23:00 -0500
Subject: [PATCH] plasma-5.3: run startkde with `set -x`

---
 .../0001-startkde-NixOS-patches.patch         | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
index 68f32862b217..a542fb7b87d3 100644
--- a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
+++ b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
@@ -1,23 +1,25 @@
-From 9aa37de6cd887c6cdd7ea2356cbb6aecdb988b75 Mon Sep 17 00:00:00 2001
+From 37abdee4e25f6aff55da838864d1a67a7be758ad Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 3 May 2015 14:51:04 -0500
+Date: Tue, 2 Jun 2015 11:21:43 -0500
 Subject: [PATCH] startkde: NixOS patches
 
 ---
- startkde/startkde.cmake | 212 +++++++++++++++++++-----------------------------
- 1 file changed, 85 insertions(+), 127 deletions(-)
+ startkde/startkde.cmake | 214 ++++++++++++++++++++----------------------------
+ 1 file changed, 87 insertions(+), 127 deletions(-)
 
 diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index 24e5c1b..d8642d3 100644
+index 24e5c1b..787d719 100644
 --- a/startkde/startkde.cmake
 +++ b/startkde/startkde.cmake
-@@ -1,8 +1,29 @@
+@@ -1,8 +1,31 @@
 -#!/bin/sh
 +#!@bash@/bin/bash
  #
  #  DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
  #
  
++set -x
++
 +# The KDE icon cache is supposed to update itself
 +# automatically, but it uses the timestamp on the icon
 +# theme directory as a trigger.  Since in Nix the
@@ -42,7 +44,7 @@ index 24e5c1b..d8642d3 100644
  if test "x$1" = x--failsafe; then
      KDE_FAILSAFE=1 # General failsafe flag
      KWIN_COMPOSE=N # Disable KWin's compositing
-@@ -16,29 +37,16 @@ trap 'echo GOT SIGHUP' HUP
+@@ -16,29 +39,16 @@ trap 'echo GOT SIGHUP' HUP
  # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
  unset DYLD_FORCE_FLAT_NAMESPACE
  
@@ -75,7 +77,7 @@ index 24e5c1b..d8642d3 100644
  fi
  
  # Boot sequence:
-@@ -56,13 +64,8 @@ fi
+@@ -56,13 +66,8 @@ fi
  # * Then ksmserver is started which takes control of the rest of the startup sequence
  
  # We need to create config folder so we can write startupconfigkeys
@@ -91,7 +93,7 @@ index 24e5c1b..d8642d3 100644
  
  #This is basically setting defaults so we can use them with kstartupconfig5
  cat >$configDir/startupconfigkeys <<EOF
-@@ -106,53 +109,19 @@ toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0
+@@ -106,53 +111,19 @@ toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0
  EOF
  }
  
@@ -148,7 +150,7 @@ index 24e5c1b..d8642d3 100644
  
      kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
      if test $? -eq 10; then
-@@ -168,15 +137,33 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize"
+@@ -168,15 +139,33 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize"
      fi
  fi
  
@@ -187,7 +189,7 @@ index 24e5c1b..d8642d3 100644
  ksplash_pid=
  if test -z "$dl"; then
    # the splashscreen and progress indicator
-@@ -205,8 +192,7 @@ fi
+@@ -205,8 +194,7 @@ fi
  # For anything else (that doesn't set env vars, or that needs a window manager),
  # better use the Autostart folder.
  
@@ -197,7 +199,7 @@ index 24e5c1b..d8642d3 100644
  
  # Add /env/ to the directory to locate the scripts to be sourced
  for prefix in `echo $scriptpath`; do
-@@ -216,7 +202,7 @@ for prefix in `echo $scriptpath`; do
+@@ -216,7 +204,7 @@ for prefix in `echo $scriptpath`; do
  done
  
  # Set the path for Qt plugins provided by KDE
@@ -206,7 +208,7 @@ index 24e5c1b..d8642d3 100644
  # TODO: Do we really need this?
  QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
  export QT_PLUGIN_PATH
-@@ -242,7 +228,7 @@ usr_odir=$HOME/.fonts/kde-override
+@@ -242,7 +230,7 @@ usr_odir=$HOME/.fonts/kde-override
  usr_fdir=$HOME/.fonts
  
  if test -n "$KDEDIRS"; then
@@ -215,7 +217,7 @@ index 24e5c1b..d8642d3 100644
    sys_odir=$kdedirs_first/share/fonts/override
    sys_fdir=$kdedirs_first/share/fonts
  else
-@@ -255,23 +241,13 @@ fi
+@@ -255,23 +243,13 @@ fi
  # add the user's dirs to the font path, as they might simply have been made
  # read-only by the administrator, for whatever reason.
  
@@ -244,7 +246,7 @@ index 24e5c1b..d8642d3 100644
  
  # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
  if test -n "$GS_LIB" ; then
-@@ -284,30 +260,6 @@ fi
+@@ -284,30 +262,6 @@ fi
  
  echo 'startkde: Starting up...'  1>&2
  
@@ -275,7 +277,7 @@ index 24e5c1b..d8642d3 100644
  # Mark that full KDE session is running (e.g. Konqueror preloading works only
  # with full KDE running). The KDE_FULL_SESSION property can be detected by
  # any X client connected to the same X session, even if not launched
-@@ -332,11 +284,11 @@ fi
+@@ -332,11 +286,11 @@ fi
  #
  KDE_FULL_SESSION=true
  export KDE_FULL_SESSION
@@ -289,7 +291,7 @@ index 24e5c1b..d8642d3 100644
  
  KDE_SESSION_UID=`id -ru`
  export KDE_SESSION_UID
-@@ -346,30 +298,36 @@ export XDG_CURRENT_DESKTOP
+@@ -346,30 +300,36 @@ export XDG_CURRENT_DESKTOP
  
  # At this point all the environment is ready, let's send it to kwalletd if running
  if test -n "$PAM_KWALLET_LOGIN" ; then
@@ -331,7 +333,7 @@ index 24e5c1b..d8642d3 100644
  # finally, give the session control to the session manager
  # see kdebase/ksmserver for the description of the rest of the startup sequence
  # if the KDEWM environment variable has been set, then it will be used as KDE's
-@@ -385,27 +343,27 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
+@@ -385,27 +345,27 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
  # lock now and do the rest of the KDE startup underneath the locker.
  KSMSERVEROPTIONS=""
  test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
@@ -366,7 +368,7 @@ index 24e5c1b..d8642d3 100644
              done
              break
          fi
-@@ -417,21 +375,21 @@ echo 'startkde: Shutting down...'  1>&2
+@@ -417,21 +377,21 @@ echo 'startkde: Shutting down...'  1>&2
  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
  
  # Clean up
@@ -393,5 +395,5 @@ index 24e5c1b..d8642d3 100644
  
  echo 'startkde: Done.'  1>&2
 -- 
-2.3.6
+2.4.1