1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index e845603..e49dd5f 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# DEFAULT KDE STARTUP SCRIPT ( @KDE4WORKSPACE_VERSION@ )
+# DEFAULT KDE STARTUP SCRIPT ( @PLASMAWORKSPACE_VERSION@ )
#
if test "x$1" = x--failsafe; then
@@ -19,7 +19,7 @@ unset DYLD_FORCE_FLAT_NAMESPACE
# in case we have been started with full pathname spec without being in PATH
bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
if [ -n "$bindir" ]; then
- qbindir=`qtpaths --binaries-dir`
+ qbindir=`kf5-config --qt-binaries`
qdbus=$qbindir/qdbus
case $PATH in
$bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
@@ -64,7 +64,7 @@ fi
mkdir -p $configDir
-#This is basically setting defaults so we can use them with kstartupconfig4
+#This is basically setting defaults so we can use them with kstartupconfig5
cat >$configDir/startupconfigkeys <<EOF
kcminputrc Mouse cursorTheme 'Oxygen_White'
kcminputrc Mouse cursorSize ''
@@ -162,7 +162,7 @@ unset DESKTOP_LOCKED # Don't want it in the environment
ksplash_pid=
if test -z "$dl"; then
# languages as resolved by KLocale, for the splash screens use
- # klocale_languages is assembled by kdostartupconfig4 calling KLocale
+ # klocale_languages is assembled by kdostartupconfig5 calling KLocale
KLOCALE_LANGUAGES="$klocale_languages"
export KLOCALE_LANGUAGES
# the splashscreen and progress indicator
@@ -191,7 +191,7 @@ fi
# For anything else (that doesn't set env vars, or that needs a window manager),
# better use the Autostart folder.
-libpath=`kde4-config --path lib | tr : '\n'`
+libpath=`kf5-config --path lib | tr : '\n'`
for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
for file in "$prefix"*.sh; do
@@ -200,7 +200,7 @@ for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
done
# Set the path for Qt plugins provided by KDE
-QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
+QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`kf5-config --qt-plugins`
# TODO: Do we really need this?
QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
export QT_PLUGIN_PATH
|
