diff options
| author | Tomas Chvatal (scarabeus) <tomas.chvatal@gmail.com> | 2008-09-27 19:39:18 +0200 |
|---|---|---|
| committer | Tomas Chvatal (scarabeus) <tomas.chvatal@gmail.com> | 2008-09-27 19:39:18 +0200 |
| commit | cb1b53b8122c44897911f3091a15eab81777d091 (patch) | |
| tree | ef1436cc2ca17ef935c12e705bbe3789cfbf4c06 | |
| parent | bbed13689d01da8c7ad31366d9e8145eebc3d76b (diff) | |
| download | kde-cb1b53b8122c44897911f3091a15eab81777d091.tar.gz kde-cb1b53b8122c44897911f3091a15eab81777d091.tar.bz2 kde-cb1b53b8122c44897911f3091a15eab81777d091.zip | |
Improvements to the startkde script - thanks to Matthias Dahl for some of the improved sed commands.
Conflicts:
kde-base/kdebase-startkde/Manifest
| -rw-r--r-- | kde-base/kdebase-startkde/Manifest | 2 | ||||
| -rw-r--r-- | kde-base/kdebase-startkde/files/gentoo-startkde4.patch | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest index 084c8556d2f..e2b13991078 100644 --- a/kde-base/kdebase-startkde/Manifest +++ b/kde-base/kdebase-startkde/Manifest @@ -1,6 +1,6 @@ AUX agent-shutdown.sh 323 RMD160 9a0451c1e58e688c022ecd2b37f08cac433b187d SHA1 1abb7a1503a80d95e4db34fa7fe58accce6e8109 SHA256 6a2d645ef38d3db9d36166fac699848d07eb166f71a646d7f1466efeb394eb11 AUX agent-startup.sh 955 RMD160 bbe8abb4734bb7364edc45265b10ae2a2887db66 SHA1 f7dfd044b6f09e5ad0f04842e51c7f9e62fad718 SHA256 c63fd6233b1711ede4fbb5b30460c5b1ddee840f0f5123db953ee3ab298da8f9 -AUX gentoo-startkde4.patch 1569 RMD160 52c3a8b948b3a651e6c46de5f0ea5509f6f57c35 SHA1 07b0fa7b370a13494bc095b418fab8ec3f8226a5 SHA256 023aafe5c257ff544ca13417fa3e2cb2fca3dbfd141c79f09a064c035bbd4ef7 +AUX gentoo-startkde4.patch 1556 RMD160 d540f89a7677322e891782d7573ddbd1cf9ad367 SHA1 d47d0041138dae724e8e5161424d83b5ea35e225 SHA256 1c55320c6c3cdb498a8423d4f4a9d541290f37fe4bd05f972748bd961ea8c11f DIST kdebase-workspace-4.1.2.tar.bz2 47500082 RMD160 7491748580f3f40e4646a28af8f64caccc919bdd SHA1 46a2c14edfca05deb271a047bed292f7d71b8c5b SHA256 4d3273c7e1bb767136e9f4e8eb8717489d4d36eaa0fbd7d391515760d28cb804 EBUILD kdebase-startkde-4.1.2.ebuild 3215 RMD160 afb96690be67d63442ab516b2c21012ae65594df SHA1 f57cbcc0543122be53aab3f9029cc3ecdc792a5c SHA256 f1c7d7739f0736914f61611edcfaeac0a5834984488feb390521f5c4a659e616 MISC ChangeLog 1823 RMD160 1f79f934354ec67a3423a224e5a708ff7177e6f1 SHA1 7128522d12f2c815c71ac320a8250b9897353daf SHA256 4e37be141177d7b9d5df496203a7624178faabfa76276bd6e9a4d4e4452b38cc diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4.patch index ce7e84e4af6..244e1f28d3b 100644 --- a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch +++ b/kde-base/kdebase-startkde/files/gentoo-startkde4.patch @@ -1,14 +1,14 @@ --- startkde.cmake 2008-07-15 15:49:02.000000000 -0400 +++ startkde.cmake.cryos 2008-09-01 16:42:04.000000000 -0400 -@@ -7,6 +7,34 @@ +@@ -7,6 +7,33 @@ # because we still need to do some cleanup. trap 'echo GOT SIGHUP' HUP +# Gentoo: setup environment, filter other slotted KDE installs from PATH +export KDEDIR=@REPLACE_PREFIX@ +export KDEDIRS=/usr:/usr/local:${KDEDIR} -+export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed 's#/usr/kde/[^/]*/s\?bin:##g') -+export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed 's#/usr/kde/[^/]*/s\?bin:##g') ++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 LDPATH=@REPLACE_LIBS@:${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') @@ -29,7 +29,6 @@ + xmessage "$HOME/.kde$(basename $KDEDIR) exists but is not a dir. Aborting." + exit 1 + fi -+ export KDEHOME="${HOME}/.kde$(basename $KDEDIR)" +fi + # Check if a KDE session already is running and whether it's possible to connect to X |