From d371b877823cdc73b543243ff73bcb6184bec38e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 28 Oct 2013 11:14:57 +0100
Subject: [PATCH] slim: various misc fixes.

---
 srcpkgs/slim/files/slim.pam                   |  1 +
 .../patches/slim-1.3.6-add-sessiondir.patch   | 28 +++++++++++++++++++
 srcpkgs/slim/template                         |  5 +++-
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/slim/patches/slim-1.3.6-add-sessiondir.patch

diff --git a/srcpkgs/slim/files/slim.pam b/srcpkgs/slim/files/slim.pam
index 3016871fc7..be1b57ae45 100644
--- a/srcpkgs/slim/files/slim.pam
+++ b/srcpkgs/slim/files/slim.pam
@@ -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
diff --git a/srcpkgs/slim/patches/slim-1.3.6-add-sessiondir.patch b/srcpkgs/slim/patches/slim-1.3.6-add-sessiondir.patch
new file mode 100644
index 0000000000..8a1cef84b5
--- /dev/null
+++ b/srcpkgs/slim/patches/slim-1.3.6-add-sessiondir.patch
@@ -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
diff --git a/srcpkgs/slim/template b/srcpkgs/slim/template
index 8a2964173b..4f4ec8558f 100644
--- a/srcpkgs/slim/template
+++ b/srcpkgs/slim/template
@@ -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
 	}