diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-04-12 23:29:33 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-04-12 23:29:33 +0000 |
| commit | acf88038100756491597e7998557889f84adee8c (patch) | |
| tree | 730fdb240ead602cf9bb449bb2e83af7d003ed0a /kde-base/kdebase-startkde | |
| parent | Remove the suposed fix for latex issue. Per bug #265915. (diff) | |
| download | gentoo-2-acf88038100756491597e7998557889f84adee8c.tar.gz gentoo-2-acf88038100756491597e7998557889f84adee8c.tar.bz2 gentoo-2-acf88038100756491597e7998557889f84adee8c.zip | |
Add missing update for starkde.patch.
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kdebase-startkde')
| -rw-r--r-- | kde-base/kdebase-startkde/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdebase-startkde/files/gentoo-startkde4.patch | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog index 2a4d4cef6905..17782d31fbdd 100644 --- a/kde-base/kdebase-startkde/ChangeLog +++ b/kde-base/kdebase-startkde/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdebase-startkde # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.152 2009/04/11 22:34:52 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.153 2009/04/12 23:29:33 scarabeus Exp $ + + 12 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org> + files/gentoo-startkde4.patch: + Add missing update for starkde.patch. *kdebase-startkde-4.2.2 (11 Apr 2009) diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4.patch index 5028cf100808..816bda1840a2 100644 --- a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch +++ b/kde-base/kdebase-startkde/files/gentoo-startkde4.patch @@ -1,7 +1,7 @@ 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,35 @@ +@@ -7,6 +7,37 @@ # because we still need to do some cleanup. trap 'echo GOT SIGHUP' HUP @@ -9,10 +9,12 @@ diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/sta +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}/@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." |