diff options
| author |   Andreas Hüttel <dilfridge@gentoo.org> | 2011-03-24 22:59:21 +0000 |
|---|---|---|
| committer | Andreas Hüttel <dilfridge@gentoo.org> | 2011-03-24 22:59:21 +0000 |
| commit | c493137d4069f03205d74d10c744ba7db2c8d0c6 (patch) | |
| tree | 35b3e80d4254a413503461c499f233cd4eadf6fb /kde-base/kdebase-startkde/files | |
| parent | Stable on amd64 wrt bug #360369 (diff) | |
| download | historical-c493137d4069f03205d74d10c744ba7db2c8d0c6.tar.gz historical-c493137d4069f03205d74d10c744ba7db2c8d0c6.tar.bz2 historical-c493137d4069f03205d74d10c744ba7db2c8d0c6.zip | |
Fix duplicate entries in XDG_DATA_DIRS that make akonadi complain
Package-Manager: portage-2.1.9.42/cvs/Linux x86_64
Diffstat (limited to 'kde-base/kdebase-startkde/files')
| -rw-r--r-- | kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch new file mode 100644 index 000000000000..36829fd17f4c --- /dev/null +++ b/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch @@ -0,0 +1,71 @@ +--- startkde.cmake.old 2011-03-24 13:07:04.919889148 +0100 ++++ startkde.cmake 2011-03-24 13:14:42.033174445 +0100 +@@ -13,6 +13,40 @@ + # because we still need to do some cleanup. + trap 'echo GOT SIGHUP' HUP + ++_KDEDIR=@GENTOO_PORTAGE_EPREFIX@@REPLACE_PREFIX@ ++if [ "$_KDEDIR" != "@GENTOO_PORTAGE_EPREFIX@/usr" ]; then ++ export PATH=${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#@GENTOO_PORTAGE_EPREFIX@/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g') ++ export ROOTPATH=${_KDEDIR}/sbin:${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#@GENTOO_PORTAGE_EPREFIX@/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g') ++fi ++@REPLACE_LDPATH@ ++export STRIGI_PLUGIN_PATH="${_KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}" ++xdgs=$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#@GENTOO_PORTAGE_EPREFIX@/usr/kde/[^/]*/share/\?:##g;s/:$//g') ++if [ $(echo $xdgs |grep -c -E "(:|^)${_KDEDIR}/share(:|$)") -eq 0 ]; then ++ xdgs="${_KDEDIR}/share:${xdgs}" ++fi ++export XDG_DATA_DIRS=${xdgs} ++unset xdgs ++ ++if [ -z "$HOME" ]; then ++ xmessage "HOME is unset. Your user config seems to be broken. Aborting." ++ exit 1 ++fi ++ ++# Gentoo: handle the possible home directory layout for config directory ++# Note that we change the default KDEHOME in kdelibs to .kde4 or .kde${SLOT} ++# for -kdeprefix and +kdeprefix respectively. ++if [ "${_KDEDIR}" = "@GENTOO_PORTAGE_EPREFIX@/usr" ]; then ++ # If the directory doesn't exist make it ++ [ -e "${HOME}/.kde4" ] || mkdir "$HOME/.kde4" ++else ++ # Use multiple directories based upon the KDE directory ++ [ -e "$HOME/.kde$(basename $_KDEDIR)" ] || mkdir "$HOME/.kde$(basename $_KDEDIR)" ++ if [ ! -d "$HOME/.kde$(basename $_KDEDIR)" ]; then ++ xmessage "$HOME/.kde$(basename $_KDEDIR) exists but is not a dir. Aborting." ++ exit 1 ++ fi ++fi ++ + # Check if a KDE session already is running and whether it's possible to connect to X + kcheckrunning + kcheckrunning_result=$? +@@ -187,6 +221,13 @@ + done + done + ++# Gentoo part for FHS installs ++if [ "${_KDEDIR}" = "@GENTOO_PORTAGE_EPREFIX@/usr" ]; then ++ for file in "@GENTOO_PORTAGE_EPREFIX@/etc/kde/startup/"*.sh; do ++ test -r "${file}" && . "${file}" ++ done ++fi ++ + # Set the path for Qt plugins provided by KDE + if test -n "$QT_PLUGIN_PATH"; then + QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`" +@@ -400,6 +441,13 @@ + done + done + ++# Gentoo part for FHS installs ++if [ "${_KDEDIR}" = "@GENTOO_PORTAGE_EPREFIX@/usr" ]; then ++ for file in "@GENTOO_PORTAGE_EPREFIX@/etc/kde/shutdown/"*.sh; do ++ test -r "${file}" && . "${file}" ++ done ++fi ++ + unset KDE_FULL_SESSION + xprop -root -remove KDE_FULL_SESSION + unset KDE_SESSION_VERSION |