[arch-commits] Commit in kdebase-workspace/trunk (PKGBUILD fixpath.patch)

Pierre Schmitz pierre at archlinux.org
Thu Jan 15 13:51:25 UTC 2009


    Date: Thursday, January 15, 2009 @ 08:51:25
  Author: pierre
Revision: 24257

use sane path for env and shutdown dir

Added:
  kdebase-workspace/trunk/fixpath.patch
Modified:
  kdebase-workspace/trunk/PKGBUILD

---------------+
 PKGBUILD      |    8 ++++++--
 fixpath.patch |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-01-15 13:11:31 UTC (rev 24256)
+++ PKGBUILD	2009-01-15 13:51:25 UTC (rev 24257)
@@ -18,17 +18,20 @@
 install='kdebase-workspace.install'
 backup=('usr/share/config/kdm/kdmrc')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam')
+        'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
+        'fixpath.patch')
 md5sums=('e4fd6e11f45e5099de521867797bf86b'
          '721e97031b62aee8914e8617e86f9235'
          '5d80164932e0d44d8b802d3929a004ab'
          '10a490653b002e6f9e7476ff9d37c011'
          '552337fd9a3982d809ea16c7f0033d42'
-         '367a3538f54db71f108b34cfa31088ac')
+         '367a3538f54db71f108b34cfa31088ac'
+         'e2eb9d270fe0e93901b29256bdedd7e2')
 
 build() {
 	cd $srcdir/${pkgname}-${pkgver}
 	patch -p0 -i ${srcdir}/kdm-zsh-profile.patch || return 1
+	patch -p0 -i ${srcdir}/fixpath.patch || return 1
 	cd ../
 	mkdir build
 	cd build
@@ -47,4 +50,5 @@
 	install -D -m644 ${srcdir}/kscreensaver.pam ${pkgdir}/etc/pam.d/kscreensaver
 	install -d -m755 ${pkgdir}/etc/X11/sessions/
 	ln -sf /usr/share/apps/kdm/sessions/kde{,-safe}.desktop ${pkgdir}/etc/X11/sessions/
+	install -d -m755 ${pkgdir}/etc/kde/{env,shutdown}
 }

Added: fixpath.patch
===================================================================
--- fixpath.patch	                        (rev 0)
+++ fixpath.patch	2009-01-15 13:51:25 UTC (rev 24257)
@@ -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'`'\n/etc/kde/lib/'
+ 
+ for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+   for file in "$prefix"*.sh; do




More information about the arch-commits mailing list