diff options
author | Jonathan Callen <jcallen@gentoo.org> | 2009-11-09 10:08:12 +0000 |
---|---|---|
committer | Jonathan Callen <jcallen@gentoo.org> | 2009-11-09 10:08:12 +0000 |
commit | 9f28d4c19aa23976d69c8cbb7b947296b31eb111 (patch) | |
tree | bcb4423cfd2dfc718c6fb3d91bb4f87a4ba24ce6 /kde-base/kdebase-startkde/files | |
parent | Unused patch. (diff) | |
download | historical-9f28d4c19aa23976d69c8cbb7b947296b31eb111.tar.gz historical-9f28d4c19aa23976d69c8cbb7b947296b31eb111.tar.bz2 historical-9f28d4c19aa23976d69c8cbb7b947296b31eb111.zip |
Drop unneeded patch
Package-Manager: portage--svn/cvs/Linux i686
Diffstat (limited to 'kde-base/kdebase-startkde/files')
-rw-r--r-- | kde-base/kdebase-startkde/files/gentoo-startkde4.patch | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4.patch deleted file mode 100644 index f1ccc92a43c8..000000000000 --- a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/startkde.cmake ---- kdebase-startkde-4.2.0-orig/startkde.cmake 2009-01-17 05:00:28.000000000 -0600 -+++ kdebase-startkde-4.2.0/startkde.cmake 2009-02-21 12:52:02.000000000 -0600 -@@ -7,6 +7,37 @@ - # because we still need to do some cleanup. - trap 'echo GOT SIGHUP' HUP - -+_KDEDIR=@REPLACE_PREFIX@ -+if [ "$_KDEDIR" != "/usr" ]; then -+ export PATH=${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g') -+ export ROOTPATH=${_KDEDIR}/sbin:${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g') -+ export XDG_CONFIG_DIRS=${_KDEDIR}/etc/xdg:${XDG_CONFIG_DIRS} -+fi -+@REPLACE_LDPATH@ -+export STRIGI_PLUGIN_PATH="${_KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}" -+export XDG_DATA_DIRS=${_KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/kde/[^/]*/share/\?:##g;s/:$//g') -+export XDG_MENU_PREFIX=@REPLACE_MENU_PREFIX@ -+ -+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}" = "/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=$? -@@ -214,6 +243,13 @@ - done - done - -+# Gentoo part for FHS installs -+if [ "${_KDEDIR}" = "/usr" ]; then -+ for file in "/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`" -@@ -427,6 +463,13 @@ - done - done - -+# Gentoo part for FHS installs -+if [ "${_KDEDIR}" = "/usr" ]; then -+ for file in "/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 |