plasma-workspace version bump and check

2015-07-02 15:37:29 +02:00
parent d3b470ec48
commit 51d79a5c04
8 changed files with 342 additions and 0 deletions
@@ -0,0 +1,32 @@
+diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
+index 91c8a3c..0c658bd 100644
+--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
+@@ -20,13 +20,13 @@ unset DYLD_FORCE_FLAT_NAMESPACE
+ bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+ if [ -n "$bindir" ]; then
+   qbindir=`qtpaths --binaries-dir`
+-  qdbus=$qbindir/qdbus
+  qdbus=$qbindir/qdbus-qt5
+   case $PATH in
+     $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
+     *) PATH=$bindir:$PATH; export PATH;;
+   esac
+ else
+-  qdbus=qdbus
+  qdbus=qdbus-qt5
+ fi
+ 
+ # Check if a KDE session already is running and whether it's possible to connect to X
+@@ -300,9 +300,9 @@ fi
+ if $qdbus >/dev/null 2>/dev/null; then
+     : # ok
+ else
+-    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
+    echo 'startkde: Could not start D-Bus. Can you call qdbus-qt5?'  1>&2
+     test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-    xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
+    xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus-qt5?"
+     exit 1
+ fi
+ 
@@ -0,0 +1,29 @@
+From dde9b1c1930d333d8daff25c73400e1e67f3c630 Mon Sep 17 00:00:00 2001
+From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
+Date: Sun, 7 Sep 2014 22:55:24 +0200
+Subject: [PATCH 3/3] Remove export of QT_PLUGIN_PATH
+
+---
+ startkde/startkde.cmake | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
+index 51721d1..1d67be0 100644
+--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
+@@ -220,12 +220,6 @@ for prefix in `echo $scriptpath`; do
+   done
+ done
+ 
+-# Set the path for Qt plugins provided by KDE
+-QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
+-# TODO: Do we really need this?
+-QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
+-export QT_PLUGIN_PATH
+-
+ # Activate the kde font directories.
+ #
+ # There are 4 directories that may be used for supplying fonts for KDE.
+-- 
+2.1.0
+
@@ -0,0 +1,19 @@
+diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
+index 0c658bd..51721d1 100644
+--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
+@@ -64,6 +64,14 @@ fi
+ 
+ mkdir -p $configDir
+ 
+kdehome=$HOME/@KDE_DEFAULT_HOME@
+test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
+
+# see kstartupconfig source for usage
+mkdir -m 700 -p $kdehome
+mkdir -m 700 -p $kdehome/share
+mkdir -m 700 -p $kdehome/share/config
+
+ #This is basically setting defaults so we can use them with kstartupconfig5
+ cat >$configDir/startupconfigkeys <<EOF
+ kcminputrc Mouse cursorTheme 'breeze_cursors'
@@ -0,0 +1,6 @@
+ #%PAM-1.0
+
+auth            include         system-login
+account         include         system-login
+password        include         system-login
+session         include         system-login
@@ -0,0 +1,17 @@
+--- a/lookandfeel/contents/lockscreen/LockScreen.qml
+++ b/lookandfeel/contents/lockscreen/LockScreen.qml
+@@ -156,6 +156,14 @@
+                             enabled: !authenticator.graceLocked
+                             onAccepted: unlockFunction()
+                             focus: true
+                            //HACK: Similar hack is needed in sddm loginscreen
+                            //TODO: investigate
+                            Timer {
+                                interval: 200
+                                running: true
+                                repeat: false
+                                onTriggered: passwordInput.forceActiveFocus()
+                            }
+                             visible: block.mainItem.model.get(block.mainItem.selectedIndex)["showPassword"]
+                             onVisibleChanged: {
+                                 if (visible) {