kdebase-workspace4 - update desktop settings

6 files changed, 58 insertions, 5 deletions

diff --git a/kde4/kdebase-workspace4/DEPENDS b/kde4/kdebase-workspace4/DEPENDS
index cfd7dc529d..66dee41b3b 100755
--- a/kde4/kdebase-workspace4/DEPENDS
+++ b/kde4/kdebase-workspace4/DEPENDS
@@ -2,9 +2,12 @@ source  $SECTION_DIRECTORY/KDE_DEPENDS  &&
 source  $GRIMOIRE/FUNCTIONS             &&
 
 if  check_if_xorg_modular_libs  qt4  ;  then
+  depends  xproto         &&
+  depends  xmessage       &&
   depends  libxdmcp       &&
   depends  libxrandr      &&
-  depends  libxxf86misc   
+  depends  libxxf86misc   &&
+  suggest_depends xkeyboard-config "allow multiple consoles ctl-alt-Fn"
 fi                                                                 &&
 
 optional_depends  freetype2   '' ''   'anti-aliasing of fonts'     &&
@@ -16,5 +19,6 @@ optional_depends  libusb      '' ''   'usb support'                &&
 optional_depends  bluez-libs  '' ''   'Bluetooth support '         &&
 optional_depends  openldap    '' ''   'LDAP authentication'        &&
 optional_depends  cyrus-sasl  '' ''   'Cyrus SASL authentication'  &&
-optional_depends  OPENGL      '' ''   'OpenGL support in plasma'
+optional_depends  OPENGL      '' ''   'OpenGL support in plasma'   &&
+optional_depends  plasma      '' ''   'additional plasma features'
 #optional_depends networkmanager  '' ''   '' &&
diff --git a/kde4/kdebase-workspace4/HISTORY b/kde4/kdebase-workspace4/HISTORY
index 914245d638..61da2c742c 100644
--- a/kde4/kdebase-workspace4/HISTORY
+++ b/kde4/kdebase-workspace4/HISTORY
@@ -1,3 +1,19 @@
+2007-10-29  Treeve Jelbert <treeve@sourcemage.org>
+	* kde4.desktop: refer to correct file
+	* kde4.sh: added
+	* PRE_BUILD: added, to create kde4 group
+	* INSTALL: install kde4.sh
+	  it is now possible to start a kde4 session and have a working desktop
+	  beware that if kde3 is also installed, kde4 will take precedence!!!
+	  by default, only users who belong to group kde4 can use this
+	  they will also have a separate desktop configuration for kde3/4
+	  this is controlled by the variable KDEHOME
+	  reset KDEHOME to share the same desktop in kde3/4
+	  you will then get a mixture of kde3/4 applications
+
+2007-10-18  Treeve Jelbert <treeve@sourcemage.org>
+	* DEPENDS: add xproto, xmessage, xkeyboard-config, plasma
+
 2007-10-18  Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 3.94.0
 
diff --git a/kde4/kdebase-workspace4/INSTALL b/kde4/kdebase-workspace4/INSTALL
index 92b4dbbf71..2f4602e364 100755
--- a/kde4/kdebase-workspace4/INSTALL
+++ b/kde4/kdebase-workspace4/INSTALL
@@ -1,4 +1,6 @@
 default_install                                                     &&
 mkdir  -p  $INSTALL_ROOT/usr/share/xsessions                        &&
 install  -m 0644  -o root  -g root  $SCRIPT_DIRECTORY/kde4.desktop  \
-                  $INSTALL_ROOT/usr/share/xsessions
+                  $INSTALL_ROOT/usr/share/xsessions                 &&
+install  -m 0640  -o root  -g kde4  $SCRIPT_DIRECTORY/kde4.sh       \
+                  $INSTALL_ROOT/etc/profile.d
diff --git a/kde4/kdebase-workspace4/PRE_BUILD b/kde4/kdebase-workspace4/PRE_BUILD
new file mode 100755
index 0000000000..ed31e3f6ec
--- /dev/null
+++ b/kde4/kdebase-workspace4/PRE_BUILD
@@ -0,0 +1,3 @@
+create_group  kde4    &&
+default_pre_build
+
diff --git a/kde4/kdebase-workspace4/kde4.desktop b/kde4/kdebase-workspace4/kde4.desktop
index 31b20b3983..9337d5411a 100644
--- a/kde4/kdebase-workspace4/kde4.desktop
+++ b/kde4/kdebase-workspace4/kde4.desktop
@@ -2,8 +2,8 @@
 Encoding=UTF-8
 Name=KDE4
 Comment=This session logs you into KDE4
-Exec=/opt/bin/kstart
-TryExec=/opt/bin/kstart
+Exec=/opt/bin/startkde
+TryExec=/opt/bin/startkde
 # no icon yet, only the top three are currently used
 Icon=
 Type=Application
diff --git a/kde4/kdebase-workspace4/kde4.sh b/kde4/kdebase-workspace4/kde4.sh
new file mode 100644
index 0000000000..d92dfaffb4
--- /dev/null
+++ b/kde4/kdebase-workspace4/kde4.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+# setup KDE4 environment for SMGL
+source /etc/profile.d/qt.sh
+
+export PATH=$QTDIR/bin/qt4:$PATH
+export KDEDIR=/opt
+export KDEDIRS=$KDEDIR
+export KDE_DATA_DIRS=$KDEDIR/share
+export PATH=$KDEDIR/bin:$PATH
+export XDG_CONFIG_DIRS=$KDEDIR/etc/xdg
+export QT_PLUGIN_PATH=$KDEDIR/lib/plugins
+export LD_LIBRARY_PATH=$KDEDIR/lib:$LD_LIBRARY_PATH
+export PKG_CONFIG_PATH=$KDEDIR/lib/pkgconfig:$PKG_CONFIG_PATH
+#export KDE_COLOR_DEBUG=1
+
+# this will keep the kde3/4 desktops separate
+export KDEHOME=$HOME/.kde4
+
+# temporary runtime directories
+export KDETMP=${TMPDIR-/tmp}/kde4-$USER
+export KDEVARTMP=/var/tmp/kde4cache-$USER
+
+# Ensure that they exist
+mkdir -p $KDEDIR $KDETMP $KDEVARTMP
+
+
+
+