diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-25 12:00:05 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-25 12:00:05 -0300 |
commit | d59c722c306fa39fcecf011b411b77faffca5cbd (patch) | |
tree | d6a3582523245b624d1a905d4b46d8344429e617 /staging/kdebase-workspace/fixpath.patch | |
parent | 939541abc901bd03328b55aaed0fb1862f803c05 (diff) | |
parent | 5894dd675f4bd3ba296d262fae99b3b87a0f87fd (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gri/PKGBUILD
community/multiget/PKGBUILD
core/bash/PKGBUILD
core/grep/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/vlc/PKGBUILD
extra/xfce4-screenshooter/PKGBUILD
extra/xfce4-settings/PKGBUILD
libre/linux-libre/PKGBUILD
libre/linux-libre/dib0700-fix.patch
libre/linux-libre/i915-fix-ghost-tv-output.patch
libre/linux-libre/i915-fix-incorrect-error-message.patch
libre/linux-libre/iwlagn-fix-NULL-pointer-dereference.patch
libre/linux-libre/linux-libre.install
libre/linux-libre/usb-add-reset-resume-quirk-for-several-webcams.patch
Diffstat (limited to 'staging/kdebase-workspace/fixpath.patch')
-rw-r--r-- | staging/kdebase-workspace/fixpath.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/staging/kdebase-workspace/fixpath.patch b/staging/kdebase-workspace/fixpath.patch new file mode 100644 index 000000000..be2b8383e --- /dev/null +++ b/staging/kdebase-workspace/fixpath.patch @@ -0,0 +1,34 @@ +--- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100 ++++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100 +@@ -34,22 +34,6 @@ + MALLOC_CHECK_=2 + export MALLOC_CHECK_ + +-# in case we have been started with full pathname spec without being in PATH +-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` +-if [ -n "$bindir" ]; then +- qbindir=`$bindir/kde4-config --qt-binaries` +- if [ -n "$qbindir" ]; then +- case $PATH in +- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;; +- *) PATH=$qbindir:$PATH; export PATH;; +- esac +- fi +- case $PATH in +- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; +- *) PATH=$bindir:$PATH; export PATH;; +- esac +-fi +- + # Boot sequence: + # + # kdeinit is used to fork off processes which improves memory usage +@@ -206,7 +190,7 @@ + # For anything else (that doesn't set env vars, or that needs a window manager), + # better use the Autostart folder. + +-libpath=`kde4-config --path lib | tr : '\n'` ++libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/') + + for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do + for file in "$prefix"*.sh; do |