-cd $SOURCE_DIRECTORY &&
-mkdir -p build &&
-cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDEDIR \
- -DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION ../ &&
+cd $SOURCE_DIRECTORY &&
+mkdir -p build &&
+cd build &&
+cmake -DCMAKE_INSTALL_PREFIX=$KDE4DIR \
+ -DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION \
+ ../ &&
make
}
diff --git a/kde4/HISTORY b/kde4/HISTORY
new file mode 100644
index 0000000..433fa57
--- /dev/null
+++ b/kde4/HISTORY
@@ -0,0 +1,7 @@
+2007-05-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * FUNCTIONS: use INSTALL_ROOT
+ add missing &&'s
+ install to /opt instead of /opt/kde4
+ delete user specific code, not needed here
+ make KDE4DIR persistent
+ * KDE_DEPENDS: add pkgconfig
diff --git a/kde4/KDE_DEPENDS b/kde4/KDE_DEPENDS
index 0de1f04..90f5305 100755
--- a/kde4/KDE_DEPENDS
+++ b/kde4/KDE_DEPENDS
@@ -3,6 +3,7 @@ depends cmake &&
case $SPELL in
kdelibs4) depends qt4 &&
depends dbus &&
+ depends pkgconfig &&
depends openssl &&
sub_depends qt4 DBUS &&
sub_depends qt4 SSL &&
diff --git a/kde4/NOTES b/kde4/NOTES
index 12e1cdc..638e0d6 100644
--- a/kde4/NOTES
+++ b/kde4/NOTES
@@ -1,5 +1,5 @@
1. all the code in this section is very experimental.
- however, it has compiled for me.
+ however, it has compiled for me, and I have run some kde4 programs.
2. the dependencies of the spells are very much in a state of flux.
@@ -18,4 +18,9 @@
8. need to check startup scripts (kdm4?), session manager?
coexistence with kde3?
-9. must setup session bus (dbus) correctly
+#9. must setup session bus (dbus) correctly, should not be necessary to do
this
+# add 'eval `dbus-launch --auto-syntax` ' to ~./.xsession
+
+10. add an entry for kde4 to /usr/share/xsessions (similar to that for kde3),
+ so that can run kde4 from kdm
+
diff --git a/kde4/kdebase4/FINAL b/kde4/kdebase4/FINAL
new file mode 100755
index 0000000..5229db7
--- /dev/null
+++ b/kde4/kdebase4/FINAL
@@ -0,0 +1,18 @@
+if check_if_xorg_modular_libs qt4; then
+ message "$PROBLEM_COLOR"
+ message "kdm does not work out-of-the-box with xorg-modular since the "
+ message "paths changed. Edit /usr/share/config/kdm/kdmrc and modify "
+ message "ServerCmd to point to /usr/bin/X . If needed, set Xrdb, "
+ message "FailsafeClient and Session to point to correct paths (no X11R6/)."
+ message "$DEFAULT_COLOR"
+fi &&
+
+message '
+To get pmount working with hal on kde >= 3.5.4 a policy for the plugdev group
+has to be created in /etc/dbus-1/system.d/hal.conf:
+
+<policy group="plugdev">
+ <allow send_interface="org.freedesktop.Hal.Device.Volume"/>
+ <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
+</policy>
+'
diff --git a/kde4/kdebase4/HISTORY b/kde4/kdebase4/HISTORY
index fb75447..7ce49d0 100644
--- a/kde4/kdebase4/HISTORY
+++ b/kde4/kdebase4/HISTORY
@@ -1,3 +1,10 @@
+2007-05-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * init.d/kdm: fix program location
+ * FINAL: added (copied from kde3)
+
+2007-05-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * init.d/kdm: add "NEEDS=smgl-messagebus"
+
2007-05-12 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: remove optional openssl, already needed by kdelibs4
add bluez-libs
diff --git a/kde4/kdebase4/init.d/kdm4 b/kde4/kdebase4/init.d/kdm4
index e4f04ab..815445a 100755
--- a/kde4/kdebase4/init.d/kdm4
+++ b/kde4/kdebase4/init.d/kdm4
@@ -1,7 +1,8 @@
#!/bin/sh