HOMEPAGE="http://slim.berlios.de"
LICENSE = "GPL"
-PR = "r0.4"
+PR = "r7"
inherit update-rc.d
-DEPEND="virtual/x11 libxmu libpng libjpeg libpam freetype"
+DEPEND="virtual/x11 libxmu libpng libjpeg libpam freetype sessreg"
-RDEPEND="${DEPEND} perl xauth"
+RDEPEND="${DEPEND} perl libpam-meta xauth"
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 \
file://delay.patch;patch=1 \
file://pam-unix2.patch;patch=1 \
+ file://pandora_xmodmap_hack.patch;patch=1 \
file://rc.slim \
file://slim-dynwm \
file://update_slim_wmlist \
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}
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"
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
}
+
+CONFFILES_${PN} += ${sysconfdir}/slim.conf