summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD6
-rw-r--r--arch/3.5.13/trinity-base/trinity-kdebase/xsession.patch28
2 files changed, 31 insertions, 3 deletions
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
index 6c360661a..963119597 100644
--- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
@@ -16,7 +16,7 @@ confilicts=('kdemod3-kdebase')
options=('libtool')
source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz'
'patches.tar.bz2'
- 'Xsession.patch'
+ 'xsession.patch'
'arch-kdeshutdown.png'
'kdm-default-face.png'
'agent-shutdown.sh'
@@ -166,7 +166,7 @@ package_trinity-kdm() {
# update the Xsession file, this resolves problem with kdm dropping back
# to the login screen
- patch -N ${pkgdir}${TDEDIR}/share/config/kdm/Xsession < ${srcdir}/Xsession.patch
+ patch -N ${pkgdir}${TDEDIR}/share/config/kdm/Xsession < ${srcdir}/xsession.patch
# install kdm rc.d script. We need this to start kdm from rc.d
install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity
@@ -200,7 +200,7 @@ package_trinity-kate() {
}
package_trinity-konqueror() {
- pkgdesc="Trinity Swiss Army application, file and web browser."
+ pkgdesc="Trinity Swiss Army file and web browser."
msg "Packaging - $pkgname-$pkgver"
_splitfolders="konqueror libkonq doc/konqueror"
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/xsession.patch b/arch/3.5.13/trinity-base/trinity-kdebase/xsession.patch
new file mode 100644
index 000000000..164d6c811
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-kdebase/xsession.patch
@@ -0,0 +1,28 @@
+--- /mnt/archlinux/opt/trinity/share/config/kdm/Xsession 2011-12-08 13:08:43.000000000 +0100
++++ /opt/kde3/share/config/kdm/Xsession 2011-09-24 14:52:28.000000000 +0200
+@@ -43,4 +43,24 @@
+ ;;
+ esac
+ # invoke global X session script
+-. /etc/X11/Xsession
++
++
++ case $session in
++ "")
++ exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
++ ;;
++ failsafe)
++ exec ck-launch-session xterm -geometry 80x24-0-0
++ ;;
++ custom)
++ exec ck-launch-session $HOME/.xsession
++ ;;
++ default)
++ exec ck-launch-session /opt/trinity/bin/startkde
++ ;;
++ *)
++ eval exec ck-launch-session "$session"
++ ;;
++ esac
++ exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
++