Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/kdebase-startkde/files: gentoo-startkde4.patch
Date: Thu, 02 Oct 2008 12:10:29
Message-Id: E1KlN0k-00009I-UO@stork.gentoo.org
1 jmbsvicetto 08/10/02 12:10:26
2
3 Added: gentoo-startkde4.patch
4 Log:
5 Added a missing patch file.
6 (Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64)
7
8 Revision Changes Path
9 1.1 kde-base/kdebase-startkde/files/gentoo-startkde4.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/files/gentoo-startkde4.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/files/gentoo-startkde4.patch?rev=1.1&content-type=text/plain
13
14 Index: gentoo-startkde4.patch
15 ===================================================================
16 --- startkde.cmake 2008-07-15 15:49:02.000000000 -0400
17 +++ startkde.cmake.cryos 2008-09-27 14:44:01.000000000 -0400
18 @@ -7,6 +7,33 @@
19 # because we still need to do some cleanup.
20 trap 'echo GOT SIGHUP' HUP
21
22 +export KDEDIR=@REPLACE_PREFIX@
23 +export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g')
24 +export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g')
25 +@REPLACE_LDPATH@
26 +export STRIGI_PLUGIN_PATH="${KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}"
27 +export XDG_DATA_DIRS=${KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/kde/[^/]*/share/\?:##g;s/:$//g')
28 +
29 +if [ -z "$HOME" ]; then
30 + xmessage "HOME is unset. Your user config seems to be broken. Aborting."
31 + exit 1
32 +fi
33 +
34 +# Gentoo: handle the possible home directory layout for config directory
35 +# Note that we change the default KDEHOME in kdelibs to .kde4 or .kde${SLOT}
36 +# for -kdeprefix and +kdeprefix respectively.
37 +if [ "${KDEDIR}" == "/usr" ]; then
38 + # If the directory doesn't exist make it
39 + [ -e "${HOME}/.kde4" ] || mkdir "$HOME/.kde4"
40 +else
41 + # Use multiple directories based upon the KDE directory
42 + [ -e "$HOME/.kde$(basename $KDEDIR)" ] || mkdir "$HOME/.kde$(basename $KDEDIR)"
43 + if [ ! -d "$HOME/.kde$(basename $KDEDIR)" ]; then
44 + xmessage "$HOME/.kde$(basename $KDEDIR) exists but is not a dir. Aborting."
45 + exit 1
46 + fi
47 +fi
48 +
49 # Check if a KDE session already is running and whether it's possible to connect to X
50 kcheckrunning
51 kcheckrunning_result=$?
52 @@ -209,6 +236,13 @@
53 done
54 done
55
56 +# Gentoo part for FHS installs
57 +if [ "${KDEDIR}" == "/usr" ]; then
58 + for file in "/etc/kde/startup/"*.sh; do
59 + test -r "${file}" && . "${file}"
60 + done
61 +fi
62 +
63 # Set the path for Qt plugins provided by KDE
64 if test -n "$QT_PLUGIN_PATH"; then
65 QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`"
66 @@ -420,6 +454,13 @@
67 done
68 done
69
70 +# Gentoo part for FHS installs
71 +if [ "${KDEDIR}" == "/usr" ]; then
72 + for file in "/etc/kde/shutdown/"*.sh; do
73 + test -r "${file}" && . "${file}"
74 + done
75 +fi
76 +
77 unset KDE_FULL_SESSION
78 xprop -root -remove KDE_FULL_SESSION
79 unset KDE_SESSION_VERSION