X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=blobdiff_plain;f=recipes%2Fslim%2Fslim_1.3.1.bb;h=d67e56ac0cfe8da9d222b48e9f3f3f7496779553;hp=a15664b7d1868584c24e62a9293a280298d11343;hb=c65e756b71976767f4276c66135e9295b60e794f;hpb=83ad670921b4fad51dd5bdcd70c9b6b9fa9dc1d7

diff --git a/recipes/slim/slim_1.3.1.bb b/recipes/slim/slim_1.3.1.bb
index a15664b..d67e56a 100644
--- a/recipes/slim/slim_1.3.1.bb
+++ b/recipes/slim/slim_1.3.1.bb
@@ -2,11 +2,11 @@ DESCRIPTION="Simple Login Manager"
 HOMEPAGE="http://slim.berlios.de"
 LICENSE = "GPL"
 
-PR = "r1.1"
+PR = "r4"
 
 inherit update-rc.d
 
-DEPEND="virtual/x11 libxmu libpng libjpeg libpam freetype"
+DEPEND="virtual/x11 libxmu libpng libjpeg libpam freetype sessreg"
 
 RDEPEND="${DEPEND} perl libpam-meta xauth"
     
@@ -15,7 +15,6 @@ S = "${WORKDIR}/${PN}-${PV}/"
 SRC_URI=" \
   http://download.berlios.de/${PN}/${P}.tar.gz \
   file://fix-manpage.patch;patch=1 \
-#  file://slim-conf.patch;patch=1 \
   file://ftbfs_gcc_4.4.patch;patch=1 \
   file://Makefile.patch;patch=1 \
   file://xauth_secret_support.patch;patch=1 \
@@ -52,27 +51,10 @@ EXTRA_OEMAKE += " \
   LDFLAGS+=-lpam \
 "
 
-#EXTRA_OEMAKE += "-I${STAGING_INCDIR}/freetype2"
-#EXTRA_OEMAKE += 'EXTRA_CFLAGS="-I${STAGING_INCDIR}/freetype2"'
-
-#do_compile_prepend() {
-#  # respect C[XX]FLAGS, fix crosscompile,
-#  # fix linking order for --as-needed"
-#  sed -i -e "s:^CXX=.*:CXX=$(CXX) ${CXXFLAGS}:" \
-#    -e "s:^CC=.*:CC=$(CC) ${CFLAGS}:" \
-#    -e "s:^MANDIR=.*:MANDIR=/usr/share/man:" \
-#    -e "s:^\t\(.*\)\ \$(LDFLAGS)\ \(.*\):\t\1\ \2\ \$(LDFLAGS):g" \
-#    -r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \
-#    Makefile"
-#}
-
 do_compile_prepend() {
   cp -pP ${WORKDIR}/Makefile.oe ${S}/Makefile
 }
 
-#  USE_PAM=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} CC=${TARGET_CC} \
-#               CXX=${TARGET_CXX} DESTDIR=${D} MANDIR=${mandir} PREFIX=${prefix} CFGDIR=${sysconfdir}
-
 do_install() {
   oe_runmake install 
   install -d ${D}${bindir}
@@ -81,7 +63,10 @@ do_install() {
   install -d ${D}${sysconfdir}/pam.d/  
   install -m 0644 ${WORKDIR}/slim.pamd ${D}${sysconfdir}/pam.d/slim
   install -d ${D}${sysconfdir}/init.d/
-  cp -pP ${WORKDIR}/rc.slim ${D}${sysconfdir}/init.d/slim-init
+  install -m 0755 ${WORKDIR}/rc.slim ${D}${sysconfdir}/init.d/slim-init
+
+  echo 'sessionstart_cmd    /usr/bin/sessreg -a -l $DISPLAY %user' >> ${D}${sysconfdir}/slim.conf
+  echo 'sessionstop_cmd     /usr/bin/sessreg -d -l $DISPLAY %user' >> ${D}${sysconfdir}/slim.conf
 }
 
 INITSCRIPT_NAME = "slim-init"
@@ -90,9 +75,9 @@ INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
 pkg_postinst_${PN} () {
 # Register SLiM as default DM
 mkdir -p ${sysconfdir}/X11/
-echo "${bindir}/slim-dynwm" > ${sysconfdir}/X11/default-display-manager
+echo "${bindir}/slim" > ${sysconfdir}/X11/default-display-manager
 }
 
 pkg_postrm_${PN} () {
-sed -i /slim-dynwm/d ${sysconfdir}/X11/default-display-manager || true
+sed -i /slim/d ${sysconfdir}/X11/default-display-manager || true
 }