From 62ab8898a6dd1279e3ad049e0db9f68e9c958e24 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 9 Nov 2014 10:11:11 +0100
Subject: [PATCH] lightdm: update to 1.12.1.

---
 .../patches/lightdm-default-config.patch      | 45 -------------------
 srcpkgs/lightdm/template                      | 20 ++++-----
 2 files changed, 10 insertions(+), 55 deletions(-)
 delete mode 100644 srcpkgs/lightdm/patches/lightdm-default-config.patch

diff --git a/srcpkgs/lightdm/patches/lightdm-default-config.patch b/srcpkgs/lightdm/patches/lightdm-default-config.patch
deleted file mode 100644
index f72f16c9e6a..00000000000
--- a/srcpkgs/lightdm/patches/lightdm-default-config.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- data/lightdm.conf 2014-03-12 20:56:34.000000000 +0100
-+++ data/lightdm.conf 2014-03-14 15:48:32.089948842 +0100
-@@ -19,12 +19,12 @@
- #start-default-seat=true
- #greeter-user=lightdm
- #minimum-display-number=0
--#minimum-vt=7
-+#minimum-vt=1
- #lock-memory=true
- #user-authority-in-system-dir=false
- #guest-account-script=guest-account
- #log-directory=/var/log/lightdm
--#run-directory=/var/run/lightdm
-+run-directory=/run/lightdm
- #cache-directory=/var/cache/lightdm
- #sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions
- #remote-sessions-directory=/usr/share/lightdm/remote-sessions
-@@ -93,7 +93,7 @@
- #user-session=default
- #allow-guest=true
- #guest-session=
--#session-wrapper=lightdm-session
-+session-wrapper=/etc/lightdm/Xsession
- #greeter-wrapper=
- #guest-wrapper=
- #display-setup-script=
-@@ -107,6 +107,7 @@
- #autologin-in-background=false
- #autologin-session=UNIMPLEMENTED
- #exit-on-failure=false
-+pam-service=lightdm-autologin
-
- #
- # Seat configuration
---- data/users.conf 2013-09-02 17:17:41.167211771 +0200
-+++ data/users.conf 2013-09-02 17:21:27.955545717 +0200
-@@ -9,6 +9,6 @@
- # hidden-shells = Shells that indicate a user cannot login
- #
- [UserAccounts]
--minimum-uid=500
-+minimum-uid=1000
- hidden-users=nobody nobody4 noaccess
--hidden-shells=/bin/false /usr/sbin/nologin
-+hidden-shells=/bin/false /sbin/nologin
diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template
index 416a4c8b581..4ad8d26cf98 100644
--- a/srcpkgs/lightdm/template
+++ b/srcpkgs/lightdm/template
@@ -1,7 +1,7 @@
 # Template file for 'lightdm'
 pkgname=lightdm
-version=1.10.1
-revision=6
+version=1.12.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-greeter-session=lightdm-gtk-greeter
  --with-greeter-user=lightdm --disable-static --disable-tests"
@@ -10,13 +10,14 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3, LGPL-3"
 homepage="https://launchpad.net/lightdm"
 distfiles="https://launchpad.net/lightdm/${version%.*}/$version/+download/$pkgname-$version.tar.xz"
-checksum=737123001a7ae2ab126c75f61dcebb767d082ec043c012285eab6fa6b0d6a58f
+checksum=55fc6ed30681d0d4c60ae3d2760c54ed74096632ca777f8cab5c072ef8f35b1b
 
+build_options="systemd"
 hostmakedepends="pkg-config intltool itstool gobject-introspection"
 makedepends="dbus-glib-devel libxklavier-devel libxml2-devel
  qt-devel gtk+3-devel libxcb-devel libXdmcp-devel pam-devel vala-devel
- libgcrypt-devel accountsservice-devel"
-depends="dbus accountsservice $(vopt_if upower 'ConsoleKit upower0')"
+ libgcrypt-devel accountsservice-devel $(vopt_if systemd systemd-devel)"
+depends="dbus accountsservice $(vopt_if systemd '' 'ConsoleKit upower0')"
 conf_files="
 	/etc/lightdm/keys.conf
 	/etc/lightdm/lightdm.conf
@@ -24,15 +25,12 @@ conf_files="
 	/etc/pam.d/lightdm
 	/etc/pam.d/lightdm-greeter
 	/etc/pam.d/lightdm-autologin"
-replaces="runit-void<20141013_2"
 system_accounts="lightdm"
 lightdm_homedir="/var/lib/lightdm"
 make_dirs="
  /var/lib/lightdm 0755 lightdm lightdm
  /var/lib/lightdm-data 0755 lightdm lightdm"
 
-build_options="upower"
-build_options_default="upower"
 
 post_install() {
 	# Remove provided init file and use our own.
@@ -47,7 +45,7 @@ post_install() {
 	# make pam_systemd optional
 	for f in ${DESTDIR}/etc/pam.d/*; do
 		sed 's|\(.*pam_systemd.*\)|-\1|' -i $f
-		echo "-session optional pam_ck_connector.so" >> $f
+		echo "-session optional pam_ck_connector.so nox11" >> $f
 	done
 }
 
@@ -65,7 +63,9 @@ liblightdm-qt_package() {
 	}
 }
 lightdm-devel_package() {
-	depends="libglib-devel liblightdm-gobject>=${version}_${revision}
+	depends="
+		libglib-devel
+		liblightdm-gobject>=${version}_${revision}
 		liblightdm-qt>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {