lxdm: various fixes for systemd/pam (via Arch).

srcpkgs/lxdm/files/lxdm.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=LXDE Display Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/sbin/lxdm-binary
-Restart=always
-
-[Install]
-Alias=display-manager.service

srcpkgs/lxdm/patches/Xsession.patch

@@ -1,10 +0,0 @@
---- data/Xsession.orig	2011-07-29 15:42:33.000000000 +0200
-+++ data/Xsession	2011-12-03 09:09:14.592876087 +0100
-@@ -9,6 +9,8 @@
-	LXSESSION=/usr/bin/startlxde
- fi
-
-+[ -f /etc/profile ] && . /etc/profile
-+[ -f ~/.profile ] && . ~/.profile
- [ -f /etc/xprofile ] && . /etc/xprofile
- [ -f ~/.xprofile ] && . ~/.xprofile

srcpkgs/lxdm/patches/default-config.patch

@@ -0,0 +1,60 @@
+diff -Naur lxdm.orig/data/lxdm.conf.in lxdm/data/lxdm.conf.in
+--- lxdm.orig/data/lxdm.conf.in	2013-08-30 17:56:16.097006000 +0200
++++ lxdm/data/lxdm.conf.in	2013-09-04 01:54:12.942117085 +0200
+@@ -23,7 +23,7 @@
+ 
+ [server]
+ ## arg used to start xserver, not fully function
+-# arg=/usr/bin/X -background vt1
++arg=/usr/bin/X -background vt1
+ # uncomment this if you really want xserver listen to tcp
+ # tcp_listen=1
+ # uncoment this if you want reset the xserver after logou
+@@ -34,7 +34,7 @@
+ gtk_theme=Clearlooks
+ 
+ ## background of the greeter
+-bg=/usr/share/backgrounds/default.png
++bg=/usr/share/void-artwork/splash.png
+ 
+ ## if show bottom pane
+ bottom_pane=1
+diff -Naur lxdm.orig/data/lxdm.in lxdm/data/lxdm.in
+--- lxdm.orig/data/lxdm.in	2013-08-30 17:56:16.097006000 +0200
++++ lxdm/data/lxdm.in	2013-09-04 01:57:56.950799946 +0200
+@@ -1,21 +1,13 @@
+ #!/bin/sh
+ 
+-[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
+-
+-if [ -z "$LANG" -a -e /etc/sysconfig/language ]; then
+-	. /etc/sysconfig/language
+-	if [ -n "$RC_LANG"]; then
+-		LANG=$RC_LANG
+-	fi
++if [ -r /etc/profile.d/locale.sh ]; then
++	. /etc/profile.d/locale.sh
+ fi
+ 
+ if [ -n "$LANG" ]; then
+ 	export LANG
+ fi
+ 
+-[ -f /etc/sysconfig/desktop ] && . /etc/sysconfig/desktop
+-[ -f /etc/sysconfig/windowmanager ] && . /etc/sysconfig/windowmanager
+-
+ if [ -n "$DEFAULT_WM" ]; then
+ 	PREFERRED=$DEFAULT_WM
+ fi
+diff -Naur lxdm.orig/data/Xsession lxdm/data/Xsession
+--- lxdm.orig/data/Xsession	2013-08-30 17:56:16.097006000 +0200
++++ lxdm/data/Xsession	2013-09-04 01:58:19.941348762 +0200
+@@ -9,6 +9,8 @@
+ 	LXSESSION=/usr/bin/startlxde
+ fi
+ 
++[ -f /etc/profile ] && . /etc/profile
++[ -f ~/.profile ] && . ~/.profile
+ [ -f /etc/xprofile ] && . /etc/xprofile
+ [ -f ~/.xprofile ] && . ~/.xprofile
+ 

srcpkgs/lxdm/patches/glib2-2.32.0.patch

@@ -1,21 +0,0 @@
-From: dgod <dgod.osa@gmail.com>
-Date: Sun, 25 Dec 2011 07:23:19 +0000 (+0800)
-Subject: fix event check bug caused cpu 100%
-X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde%2Flxdm;a=commitdiff_plain;h=d4e41ecb;hp=f0951bdf736026b041001e846d2cb93f7f2852e1
-
-fix event check bug caused cpu 100%
----
-
-diff --git a/src/lxcom.c b/src/lxcom.c
-index 02763eb..18ee12e 100644
---- src/lxcom.c
-+++ src/lxcom.c
-@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout)
-
- static gboolean lxcom_check(GSource *source)
- {
--	return TRUE;
-+	return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE;
- }
-
- static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data)

srcpkgs/lxdm/patches/lxdm.conf.patch

@@ -1,29 +0,0 @@
---- data/lxdm.conf.in.orig	2012-05-02 10:53:30.903273165 +0200
-+++ data/lxdm.conf.in	2012-05-02 10:54:15.357223046 +0200
-@@ -16,7 +16,7 @@
- # xauth_path=/tmp
- 
- ## greeter used to welcome the user
--greeter=@FULL_LIBEXECDIR@/lxdm-greeter-gtk
-+greeter=/usr/libexec/lxdm-greeter-gtk
- 
- [server]
- ## arg used to start xserver, not fully function
-@@ -27,7 +27,7 @@ greeter=@FULL_LIBEXECDIR@/lxdm-greeter-g
- gtk_theme=Clearlooks
- 
- ## background of the greeter
--bg=/usr/share/backgrounds/default.png
-+bg=/usr/share/void-artwork/splash.png
- 
- ## if show bottom pane
- bottom_pane=1
-@@ -36,7 +36,7 @@ bottom_pane=1
- lang=1
- 
- ## if show keyboard layout select control
--keyboard=0
-+keyboard=0
- 
- ## the theme of greeter
- theme=Industrial

srcpkgs/lxdm/patches/series

@@ -0,0 +1,2 @@
+git-fixes.patch
+default-config.patch

srcpkgs/lxdm/template

@@ -1,28 +1,30 @@
 # Template file for 'lxdm'
 pkgname=lxdm
 version=0.4.1
-revision=6
+revision=7
+patch_args="-Np1"
 build_style=gnu-configure
-configure_args="-with-xconn=xcb"
+configure_args="--with-pam"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool automake libtool gettext-devel"
-makedepends="gtk+-devel iso-codes"
+makedepends="pam-devel gtk+-devel systemd-devel iso-codes"
 short_desc="GUI login manager for LXDE"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://www.lxde.org"
 distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz"
 checksum=9e0d0a5672fcf31a18de8178ce73eab1723d6ae7097dfe41e9fe2c46e180cf08
-long_desc="
+
- A lightweight dropped-in replacement for GDM or KDM."
+pre_configure() {
+	autoreconf -fi
+}
 
 post_install() {
-	# Remove useless script.
-	rm -f ${DESTDIR}/usr/sbin/lxdm
 	# Use our own pam file.
 	rm -f ${DESTDIR}/etc/pam.d/lxdm
 	vinstall ${FILESDIR}/lxdm.pam 644 etc/pam.d lxdm
-	# Install systemd service.
+
-	vinstall ${FILESDIR}/lxdm.service 644 usr/lib/systemd/system
+	vmkdir var/lib/lxdm
+	echo 'GDK_CORE_DEVICE_EVENTS=true' > ${DESTDIR}/var/lib/lxdm/.pam_environment
 }
 
 lxdm_package() {
@@ -40,7 +42,6 @@ lxdm_package() {
 	system_groups="lxdm"
 	systemd_services="lxdm.service off"
 	pkg_install() {
-		vmove etc
+		vmove all
-		vmove usr
 	}
 }