Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 191622 Details for
Bug 270250
KDE4 kde-base/kdebase-startkde ignores files in /etc/X11/xinit/xinitrc.d/
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
gentoo-startkde4.patch
gentoo-startkde4.patch (text/plain), 2.73 KB, created by
Rick Harris
on 2009-05-18 07:07:43 UTC
(
hide
)
Description:
gentoo-startkde4.patch
Filename:
MIME Type:
Creator:
Rick Harris
Created:
2009-05-18 07:07:43 UTC
Size:
2.73 KB
patch
obsolete
>diff -urN kdebase-startkde-4.2.3-orig/startkde.cmake kdebase-startkde-4.2.3/startkde.cmake >--- kdebase-startkde-4.2.3-orig/startkde.cmake 2009-05-18 13:45:32.000000000 +0930 >+++ kdebase-startkde-4.2.3/startkde.cmake 2009-05-18 13:48:04.000000000 +0930 >@@ -7,6 +7,37 @@ > # because we still need to do some cleanup. > trap 'echo GOT SIGHUP' HUP > >+_KDEDIR=/usr >+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 >+fi >+@REPLACE_LDPATH@ >+export STRIGI_PLUGIN_PATH="${_KDEDIR}/lib/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=kde-4.2- >+ >+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=$? >@@ -210,6 +241,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`" >@@ -218,6 +256,13 @@ > fi > export QT_PLUGIN_PATH > >+# Source scripts in /etc/X11/xinit/xinitrc.d/ for system-level defined stuff >+if test -d "/etc/X11/xinit/xinitrc.d/"; then >+ for file in "/etc/X11/xinit/xinitrc.d/"*; do >+ test -x "$file" && . "$file" >+ done >+fi >+ > # Activate the kde font directories. > # > # There are 4 directories that may be used for supplying fonts for KDE. >@@ -423,6 +468,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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 270250
: 191622