| 1 |
alexxy 09/06/04 11:49:27 |
| 2 |
|
| 3 |
Modified: gentoo-startkde4.patch |
| 4 |
Log: |
| 5 |
Version bump KDE 4.2.4 |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64, RepoMan options: --force) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.6 kde-base/kdebase-startkde/files/gentoo-startkde4.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/files/gentoo-startkde4.patch?rev=1.6&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/files/gentoo-startkde4.patch?rev=1.6&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/files/gentoo-startkde4.patch?r1=1.5&r2=1.6 |
| 14 |
|
| 15 |
Index: gentoo-startkde4.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/files/gentoo-startkde4.patch,v |
| 18 |
retrieving revision 1.5 |
| 19 |
retrieving revision 1.6 |
| 20 |
diff -u -r1.5 -r1.6 |
| 21 |
--- gentoo-startkde4.patch 12 Apr 2009 23:29:33 -0000 1.5 |
| 22 |
+++ gentoo-startkde4.patch 4 Jun 2009 11:49:27 -0000 1.6 |
| 23 |
@@ -4,12 +4,12 @@ |
| 24 |
@@ -7,6 +7,37 @@ |
| 25 |
# because we still need to do some cleanup. |
| 26 |
trap 'echo GOT SIGHUP' HUP |
| 27 |
- |
| 28 |
+ |
| 29 |
+_KDEDIR=@REPLACE_PREFIX@ |
| 30 |
+if [ "$_KDEDIR" != "/usr" ]; then |
| 31 |
+ export PATH=${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g') |
| 32 |
+ export ROOTPATH=${_KDEDIR}/sbin:${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g') |
| 33 |
-+ export XDG_CONFIG_DIRS=${_KDEDIR}/etc/xdg |
| 34 |
++ export XDG_CONFIG_DIRS=${_KDEDIR}/etc/xdg:${XDG_CONFIG_DIRS} |
| 35 |
+fi |
| 36 |
+@REPLACE_LDPATH@ |
| 37 |
+export STRIGI_PLUGIN_PATH="${_KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}" |
| 38 |
@@ -42,7 +42,7 @@ |
| 39 |
@@ -214,6 +243,13 @@ |
| 40 |
done |
| 41 |
done |
| 42 |
- |
| 43 |
+ |
| 44 |
+# Gentoo part for FHS installs |
| 45 |
+if [ "${_KDEDIR}" = "/usr" ]; then |
| 46 |
+ for file in "/etc/kde/startup/"*.sh; do |
| 47 |
@@ -56,7 +56,7 @@ |
| 48 |
@@ -427,6 +463,13 @@ |
| 49 |
done |
| 50 |
done |
| 51 |
- |
| 52 |
+ |
| 53 |
+# Gentoo part for FHS installs |
| 54 |
+if [ "${_KDEDIR}" = "/usr" ]; then |
| 55 |
+ for file in "/etc/kde/shutdown/"*.sh; do |
Archives