|
|
|
|
@ -1,34 +1,8 @@
|
|
|
|
|
diff -up plasma-workspace-5.8.1/startkde/startkde.cmake.startkde plasma-workspace-5.8.1/startkde/startkde.cmake
|
|
|
|
|
--- plasma-workspace-5.8.1/startkde/startkde.cmake.startkde 2016-10-11 07:46:00.000000000 -0500
|
|
|
|
|
+++ plasma-workspace-5.8.1/startkde/startkde.cmake 2016-10-11 11:33:58.811705935 -0500
|
|
|
|
|
@@ -17,25 +17,22 @@ 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
|
|
|
|
|
|
|
|
|
|
-# 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`
|
|
|
|
|
- qdbus=$qbindir/qdbus
|
|
|
|
|
- case $PATH in
|
|
|
|
|
- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
|
|
|
|
|
- *) PATH=$bindir:$PATH; export PATH;;
|
|
|
|
|
- esac
|
|
|
|
|
-else
|
|
|
|
|
- qdbus=qdbus
|
|
|
|
|
-fi
|
|
|
|
|
+qdbus=qdbus-qt5
|
|
|
|
|
+
|
|
|
|
|
+# See http://bugzilla.redhat.com/537609 , a naive attempt to drop dep
|
|
|
|
|
+# on xmessage and allow alternatives like zenity.
|
|
|
|
|
+message() {
|
|
|
|
|
+ xmessage -geometry 500x100 "$1" > /dev/null 2>/dev/null || \
|
|
|
|
|
+ zenity --info --text="$1" > /dev/null 2>/dev/null ||:
|
|
|
|
|
+ return $?
|
|
|
|
|
+}
|
|
|
|
|
|
|
|
|
|
# Check if a KDE session already is running and whether it's possible to connect to X
|
|
|
|
|
kcheckrunning
|
|
|
|
|
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
|
|
|
|
|
index 135ed1b..7062df2 100644
|
|
|
|
|
--- a/startkde/startkde.cmake
|
|
|
|
|
+++ b/startkde/startkde.cmake
|
|
|
|
|
@@ -12,7 +12,7 @@ kcheckrunning
|
|
|
|
|
kcheckrunning_result=$?
|
|
|
|
|
if test $kcheckrunning_result -eq 0 ; then
|
|
|
|
|
echo "KDE seems to be already running on this display."
|
|
|
|
|
@ -37,64 +11,13 @@ diff -up plasma-workspace-5.8.1/startkde/startkde.cmake.startkde plasma-workspac
|
|
|
|
|
exit 1
|
|
|
|
|
elif test $kcheckrunning_result -eq 2 ; then
|
|
|
|
|
echo "\$DISPLAY is not set or cannot connect to the X server."
|
|
|
|
|
@@ -91,53 +88,10 @@ test -f $exportformatssettings && {
|
|
|
|
|
. $exportformatssettings
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-# Write a default kdeglobals file to set up the font
|
|
|
|
|
-kdeglobalsfile=$configDir/kdeglobals
|
|
|
|
|
-test -f $kdeglobalsfile || {
|
|
|
|
|
-cat >$kdeglobalsfile <<EOF
|
|
|
|
|
-[General]
|
|
|
|
|
-XftAntialias=true
|
|
|
|
|
-XftHintStyle=hintmedium
|
|
|
|
|
-XftSubPixel=none
|
|
|
|
|
-EOF
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
-# Make sure the Oxygen font is installed
|
|
|
|
|
-# This is necessary for setups where CMAKE_INSTALL_PREFIX
|
|
|
|
|
-# is not in /usr. fontconfig looks in /usr, ~/.fonts and
|
|
|
|
|
-# $XDG_DATA_HOME for fonts. In this case, we symlink the
|
|
|
|
|
-# Oxygen font under ${XDG_DATA_HOME} and make it known to
|
|
|
|
|
-# fontconfig
|
|
|
|
|
-
|
|
|
|
|
-usr_share="/usr/share"
|
|
|
|
|
-install_share="@KDE_INSTALL_FULL_DATADIR@"
|
|
|
|
|
-
|
|
|
|
|
-if [ ! $install_share = $usr_share ]; then
|
|
|
|
|
-
|
|
|
|
|
- if [ ${XDG_DATA_HOME} ]; then
|
|
|
|
|
- fontsDir="${XDG_DATA_HOME}/fonts"
|
|
|
|
|
- else
|
|
|
|
|
- fontsDir="${HOME}/.fonts"
|
|
|
|
|
- fi
|
|
|
|
|
-
|
|
|
|
|
- test -d $fontsDir || {
|
|
|
|
|
- mkdir -p $fontsDir
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- oxygenDir=$fontsDir/oxygen
|
|
|
|
|
- prefixDir="@KDE_INSTALL_FULL_DATADIR@/fonts/oxygen"
|
|
|
|
|
-
|
|
|
|
|
- # if the oxygen dir doesn't exist, create a symlink to be sure that the
|
|
|
|
|
- # Oxygen font is available to the user
|
|
|
|
|
- test -d $oxygenDir || test -d $prefixDir && {
|
|
|
|
|
- test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir
|
|
|
|
|
- }
|
|
|
|
|
-fi
|
|
|
|
|
-
|
|
|
|
|
kstartupconfig5
|
|
|
|
|
returncode=$?
|
|
|
|
|
if test $returncode -ne 0; then
|
|
|
|
|
- xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
|
|
|
|
|
+ message "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
|
|
|
|
|
exit 1
|
|
|
|
|
diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake
|
|
|
|
|
index 59dc7b7..f46515f 100644
|
|
|
|
|
--- a/startkde/startplasma.cmake
|
|
|
|
|
+++ b/startkde/startplasma.cmake
|
|
|
|
|
@@ -49,48 +49,6 @@ if test -z "$dl"; then
|
|
|
|
|
esac
|
|
|
|
|
fi
|
|
|
|
|
[ -r $configDir/startupconfig ] && . $configDir/startupconfig
|
|
|
|
|
@@ -215,48 +169,6 @@ for prefix in `echo $scriptpath`; do
|
|
|
|
|
done
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
-# Activate the kde font directories.
|
|
|
|
|
-#
|
|
|
|
|
@ -141,7 +64,7 @@ diff -up plasma-workspace-5.8.1/startkde/startkde.cmake.startkde plasma-workspac
|
|
|
|
|
# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
|
|
|
|
|
# from some users that they're confused and don't know what to do. This is
|
|
|
|
|
# especially necessary on slow machines, where starting KDE takes one or two
|
|
|
|
|
@@ -267,33 +179,15 @@ xset fp rehash
|
|
|
|
|
@@ -101,29 +59,18 @@ xset fp rehash
|
|
|
|
|
#
|
|
|
|
|
xsetroot -cursor_name left_ptr
|
|
|
|
|
|
|
|
|
|
@ -154,36 +77,11 @@ diff -up plasma-workspace-5.8.1/startkde/startkde.cmake.startkde plasma-workspac
|
|
|
|
|
- export GS_LIB
|
|
|
|
|
-fi
|
|
|
|
|
-
|
|
|
|
|
echo 'startkde: Starting up...' 1>&2
|
|
|
|
|
echo 'startplasma: Starting up...' 1>&2
|
|
|
|
|
|
|
|
|
|
-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
|
|
|
|
|
-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
|
|
|
|
|
-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
|
|
|
|
|
-# /usr/local.
|
|
|
|
|
-if test -z "$XDG_DATA_DIRS"; then
|
|
|
|
|
- XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share"
|
|
|
|
|
-fi
|
|
|
|
|
-export XDG_DATA_DIRS
|
|
|
|
|
-
|
|
|
|
|
# Make sure that D-Bus is running
|
|
|
|
|
if $qdbus >/dev/null 2>/dev/null; then
|
|
|
|
|
: # ok
|
|
|
|
|
else
|
|
|
|
|
echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2
|
|
|
|
|
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
|
|
|
|
|
- xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
|
|
|
|
|
+ message "Could not start D-Bus. Can you call qdbus?"
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
@@ -344,18 +238,16 @@ if test $? -ne 0; then
|
|
|
|
|
# Startup error
|
|
|
|
|
echo 'startkde: Could not sync environment to dbus.' 1>&2
|
|
|
|
|
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
|
|
|
|
|
- xmessage -geometry 500x100 "Could not sync environment to dbus."
|
|
|
|
|
+ message "Could not sync environment to dbus."
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
# export our session variables to the Xwayland server
|
|
|
|
|
xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
|
|
|
|
|
xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
|
|
|
|
|
|
|
|
|
|
-# We set LD_BIND_NOW to increase the efficiency of kdeinit.
|
|
|
|
|
-# kdeinit unsets this variable before loading applications.
|
|
|
|
|
@ -191,19 +89,116 @@ diff -up plasma-workspace-5.8.1/startkde/startkde.cmake.startkde plasma-workspac
|
|
|
|
|
+@CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
|
|
|
|
|
if test $? -ne 0; then
|
|
|
|
|
# Startup error
|
|
|
|
|
echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2
|
|
|
|
|
echo 'startplasma: Could not start kdeinit5. Check your installation.' 1>&2
|
|
|
|
|
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
|
|
|
|
|
- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
|
|
|
|
|
+ message "Could not start kdeinit5. Check your installation."
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
@@ -381,7 +273,7 @@ if test $? -eq 255; then
|
|
|
|
|
@@ -147,7 +94,7 @@ if test $? -eq 255; then
|
|
|
|
|
# Startup error
|
|
|
|
|
echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2
|
|
|
|
|
echo 'startplasma: Could not start ksmserver. Check your installation.' 1>&2
|
|
|
|
|
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
|
|
|
|
|
- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
|
|
|
|
|
+ message "Could not start ksmserver. Check your installation."
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
|
|
|
|
|
diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
|
|
|
|
|
index 5bcf26a..f3885c9 100644
|
|
|
|
|
--- a/startkde/startplasmacompositor.cmake
|
|
|
|
|
+++ b/startkde/startplasmacompositor.cmake
|
|
|
|
|
@@ -4,17 +4,15 @@
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
# 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`
|
|
|
|
|
- qdbus=$qbindir/qdbus
|
|
|
|
|
- case $PATH in
|
|
|
|
|
- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
|
|
|
|
|
- *) PATH=$bindir:$PATH; export PATH;;
|
|
|
|
|
- esac
|
|
|
|
|
-else
|
|
|
|
|
- qdbus=qdbus
|
|
|
|
|
-fi
|
|
|
|
|
+qdbus=qdbus-qt5
|
|
|
|
|
+
|
|
|
|
|
+# See http://bugzilla.redhat.com/537609 , a naive attempt to drop dep
|
|
|
|
|
+# on xmessage and allow alternatives like zenity.
|
|
|
|
|
+message() {
|
|
|
|
|
+ xmessage -geometry 500x100 "$1" > /dev/null 2>/dev/null || \
|
|
|
|
|
+ zenity --info --text="$1" > /dev/null 2>/dev/null ||:
|
|
|
|
|
+ return $?
|
|
|
|
|
+}
|
|
|
|
|
|
|
|
|
|
# We need to create config folder so we can write startupconfigkeys
|
|
|
|
|
if [ ${XDG_CONFIG_HOME} ]; then
|
|
|
|
|
@@ -51,49 +49,6 @@ test -f $exportformatssettings && {
|
|
|
|
|
. $exportformatssettings
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-# Write a default kdeglobals file to set up the font
|
|
|
|
|
-kdeglobalsfile=$configDir/kdeglobals
|
|
|
|
|
-test -f $kdeglobalsfile || {
|
|
|
|
|
-cat >$kdeglobalsfile <<EOF
|
|
|
|
|
-[General]
|
|
|
|
|
-XftAntialias=true
|
|
|
|
|
-XftHintStyle=hintmedium
|
|
|
|
|
-XftSubPixel=none
|
|
|
|
|
-EOF
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
-# Make sure the Oxygen font is installed
|
|
|
|
|
-# This is necessary for setups where CMAKE_INSTALL_PREFIX
|
|
|
|
|
-# is not in /usr. fontconfig looks in /usr, ~/.fonts and
|
|
|
|
|
-# $XDG_DATA_HOME for fonts. In this case, we symlink the
|
|
|
|
|
-# Oxygen font under ${XDG_DATA_HOME} and make it known to
|
|
|
|
|
-# fontconfig
|
|
|
|
|
-
|
|
|
|
|
-usr_share="/usr/share"
|
|
|
|
|
-install_share="@KDE_INSTALL_FULL_DATADIR@"
|
|
|
|
|
-
|
|
|
|
|
-if [ ! $install_share = $usr_share ]; then
|
|
|
|
|
-
|
|
|
|
|
- if [ ${XDG_DATA_HOME} ]; then
|
|
|
|
|
- fontsDir="${XDG_DATA_HOME}/fonts"
|
|
|
|
|
- else
|
|
|
|
|
- fontsDir="${HOME}/.fonts"
|
|
|
|
|
- fi
|
|
|
|
|
-
|
|
|
|
|
- test -d $fontsDir || {
|
|
|
|
|
- mkdir -p $fontsDir
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- oxygenDir=$fontsDir/truetype/oxygen
|
|
|
|
|
- prefixDir="@KDE_INSTALL_FULL_DATADIR@/fonts/truetype/oxygen"
|
|
|
|
|
-
|
|
|
|
|
- # if the oxygen dir doesn't exist, create a symlink to be sure that the
|
|
|
|
|
- # Oxygen font is available to the user
|
|
|
|
|
- test -d $oxygenDir || test -d $prefixDir && {
|
|
|
|
|
- test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir
|
|
|
|
|
- }
|
|
|
|
|
-fi
|
|
|
|
|
-
|
|
|
|
|
kstartupconfig5
|
|
|
|
|
returncode=$?
|
|
|
|
|
if test $returncode -ne 0; then
|
|
|
|
|
@@ -159,15 +114,6 @@ done
|
|
|
|
|
|
|
|
|
|
echo 'startplasmacompositor: Starting up...' 1>&2
|
|
|
|
|
|
|
|
|
|
-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
|
|
|
|
|
-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
|
|
|
|
|
-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
|
|
|
|
|
-# /usr/local.
|
|
|
|
|
-if test -z "$XDG_DATA_DIRS"; then
|
|
|
|
|
-XDG_DATA_DIRS="@KDE_INSTALL_FULL_DATADIR@:/usr/share:/usr/local/share"
|
|
|
|
|
-fi
|
|
|
|
|
-export XDG_DATA_DIRS
|
|
|
|
|
-
|
|
|
|
|
# Make sure that D-Bus is running
|
|
|
|
|
if $qdbus >/dev/null 2>/dev/null; then
|
|
|
|
|
: # ok
|
|
|
|
|
|
Jan Grulich
8 years ago