dirtyepic 09/02/21 19:07:48
Modified: gentoo-startkde4.patch
Log:
Fix path mangling with USE="-kdeprefix" (bug #242360) Fix invalid
XDG_CONFIG_DIR with USE="-kdeprefix"
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Revision Changes Path
1.3 kde-base/kdebase-startkde/files/gentoo-startkde4.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/files/gentoo-startkde4.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/files/gentoo-startkde4.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/files/gentoo-startkde4.patch?r1=1.2&r2=1.3
Index: gentoo-startkde4.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/files/gentoo-startkde4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gentoo-startkde4.patch 4 Oct 2008 21:41:18 -0000 1.2
+++ gentoo-startkde4.patch 21 Feb 2009 19:07:48 -0000 1.3
@@ -1,12 +1,15 @@
---- startkde.cmake 2008-07-15 15:49:02.000000000 -0400
-+++ startkde.cmake.cryos 2008-09-27 14:44:01.000000000 -0400
-@@ -7,6 +7,33 @@
+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 @@
# because we still need to do some cleanup.
trap 'echo GOT SIGHUP' HUP
+_KDEDIR=@REPLACE_PREFIX@
-+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')
++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')
++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')
@@ -34,7 +37,7 @@
# Check if a KDE session already is running and whether it's possible to connect to X
kcheckrunning
kcheckrunning_result=$?
-@@ -209,6 +236,13 @@
+@@ -214,6 +243,13 @@
done
done
@@ -48,7 +51,7 @@
# 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`"
-@@ -420,6 +454,13 @@
+@@ -427,6 +463,13 @@
done
done
|
