Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 237718 | Differences between
and this patch

Collapse All | Expand All

(-)startkde.orig (-1 / +31 lines)
Lines 7-12 Link Here
7
# because we still need to do some cleanup.
7
# because we still need to do some cleanup.
8
trap 'echo GOT SIGHUP' HUP
8
trap 'echo GOT SIGHUP' HUP
9
9
10
# Gentoo: setup environment, filter other slotted KDE installs from PATH
11
_KDEDIR=@REPLACE_PREFIX@
12
export KDEDIRS=${_KDEDIR}:/usr:/usr/local
13
export PATH=${_KDEDIR}/bin:$(echo ${PATH} | sed 's#/usr/kde/[^/]*/s\?bin[:]\{0,1\}##g')
14
export ROOTPATH=${_KDEDIR}/sbin:${_KDEDIR}/bin:$(echo ${PATH} | sed 's#/usr/kde/[^/]*/s\?bin[:]\{0,1\}##g')
15
export LDPATH=@REPLACE_LIBS@:${LDPATH}
16
export XDG_DATA_DIRS=${_KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's#/usr/kde/[^/]*/s\?share[:]\{0,1\}##g')
17
# Gentoo part ends
18
10
# Check if a KDE session already is running
19
# Check if a KDE session already is running
11
if kcheckrunning >/dev/null 2>&1; then
20
if kcheckrunning >/dev/null 2>&1; then
12
	echo "KDE seems to be already running on this display."
21
	echo "KDE seems to be already running on this display."
Lines 14-19 Link Here
14
	exit 1
23
	exit 1
15
fi
24
fi
16
25
26
# Gentoo part:
27
# Scraped old KDE 3.x -> 3.y update code, but keep symlink code
28
cd ${HOME}
29
if [ -L .kde -o ! -d .kde ]; then
30
	# handle ~/.kde* dirs - separate ones for separate KDEs
31
	rm -f .kde
32
	if [ ! -e .kde3.5 ]; then
33
		mkdir .kde3.5
34
		cd ${HOME}
35
	fi
36
	ln -sf .kde3.5 .kde
37
fi
38
# Gentoo part ends
39
17
# Set the background to plain grey.
40
# Set the background to plain grey.
18
# The standard X background is nasty, causing moire effects and exploding
41
# The standard X background is nasty, causing moire effects and exploding
19
# people's heads. We use colours from the standard KDE palette for those with
42
# people's heads. We use colours from the standard KDE palette for those with
Lines 180-185 Link Here
180
  done
203
  done
181
done
204
done
182
205
206
# Source scripts in /etc/X11/xinit/xinitrc.d/ for system-level defined stuff
207
if test -d "/etc/X11/xinit/xinitrc.d/"; then
208
  for file in "/etc/X11/xinit/xinitrc.d/"*; do
209
    test -x "$file" && . "$file"
210
  done
211
fi
212
183
# Activate the kde font directories.
213
# Activate the kde font directories.
184
#
214
#
185
# There are 4 directories that may be used for supplying fonts for KDE.
215
# There are 4 directories that may be used for supplying fonts for KDE.
Lines 386-392 Link Here
386
# Clean up
416
# Clean up
387
kdeinit_shutdown
417
kdeinit_shutdown
388
dcopserver_shutdown --wait
418
dcopserver_shutdown --wait
389
artsshell -q terminate
419
if test -e ${_KDEDIR}/bin/artsshell ; then artsshell -q terminate ; fi
390
# KDE4 support
420
# KDE4 support
391
kde4 kdeinit4_shutdown 2>/dev/null
421
kde4 kdeinit4_shutdown 2>/dev/null
392
422

Return to bug 237718