slim: various misc fixes.

This commit is contained in:
Juan RP 2013-10-28 11:14:57 +01:00
parent acb9660e39
commit d371b87782
3 changed files with 33 additions and 1 deletions

View File

@ -8,3 +8,4 @@ session required pam_limits.so
session required pam_unix.so
session optional pam_loginuid.so
session optional pam_systemd.so
-session optional pam_gnome_keyring.so auto_start

View File

@ -0,0 +1,28 @@
From 741e43960a4ea3a8bc230b1f599311d800c2cc83 Mon Sep 17 00:00:00 2001
From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Date: Wed, 02 Oct 2013 23:23:24 +0000
Subject: Update slim.conf. Add sessiondir.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
diff --git a/slim.conf b/slim.conf
index a8e2e1c..c5f1d38 100644
--- slim.conf
+++ slim.conf
@@ -47,11 +47,9 @@ login_cmd exec /bin/bash -login ~/.xinitrc %session
# options "-d" and "-nodaemon"
# daemon yes
-# Available sessions (first one is the default).
-# The current chosen session name is replaced in the login_cmd
-# above, so your login command can handle different sessions.
-# see the xinitrc.sample file shipped with slim sources
-sessions xfce4,icewm-session,wmaker,blackbox
+# Set directory that contains the xsessions.
+# slim reads xsesion from this directory, and be able to select.
+sessiondir /usr/share/xsessions/
# Executed when pressing F11 (requires imagemagick)
screenshot_cmd import -window root /slim.png
--
cgit v0.9.2

View File

@ -1,7 +1,7 @@
# Template file for 'slim'
pkgname=slim
version=1.3.6
revision=1
revision=2
build_style=cmake
configure_args="-DUSE_PAM=yes -DUSE_CONSOLEKIT=no"
hostmakedepends="cmake pkg-config"
@ -19,10 +19,13 @@ pre_configure() {
post_install() {
vinstall ${FILESDIR}/slim.pam 644 etc/pam.d slim
sed -e 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt01|' \
-e 's|/var/run/slim.lock|/var/lock/slim.lock|' -i ${DESTDIR}/etc/slim.conf
}
slim_package() {
conf_files="/etc/slim.conf /etc/pam.d/slim"
systemd_services="slim.service off"
pkg_install() {
vmove all
}