From 2f07dc85328d23ab5874ea614989fb9d0bae7e06 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 31 Aug 2014 15:40:54 +0200 Subject: [PATCH] lxdm: add consolekit build option (on). --- common/options.description | 1 + srcpkgs/lxdm/files/lxdm.pam | 7 ++++--- srcpkgs/lxdm/template | 9 +++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/common/options.description b/common/options.description index df89e171d7..82940566b5 100644 --- a/common/options.description +++ b/common/options.description @@ -4,6 +4,7 @@ desc_option_backtrace="Enable support for backtraces via libunwind" desc_option_bluetooth="Enable support for bluetooth" desc_option_cdparanoia="Enable support for CD audio (cdparanoia)" desc_option_colord="Enable support for colord" +desc_option_consolekit="Enable support for ConsoleKit" desc_option_cups="Enable support for CUPS" desc_option_dbus="Enable support for D-BUS" desc_option_dri2="Enable support for the DRI2 extension" diff --git a/srcpkgs/lxdm/files/lxdm.pam b/srcpkgs/lxdm/files/lxdm.pam index f45589679a..f5159817c0 100644 --- a/srcpkgs/lxdm/files/lxdm.pam +++ b/srcpkgs/lxdm/files/lxdm.pam @@ -1,10 +1,11 @@ auth requisite pam_nologin.so auth required pam_env.so auth required pam_unix.so -auth optional pam_gnome_keyring.so +-auth optional pam_gnome_keyring.so account required pam_unix.so session required pam_limits.so session required pam_unix.so -session optional pam_systemd.so -session optional pam_gnome_keyring.so auto_start +-session optional pam_systemd.so +-session optional pam_ck_connector.so nox11 +-session optional pam_gnome_keyring.so auto_start password required pam_unix.so diff --git a/srcpkgs/lxdm/template b/srcpkgs/lxdm/template index 1e3bacb49e..8a565e3148 100644 --- a/srcpkgs/lxdm/template +++ b/srcpkgs/lxdm/template @@ -1,11 +1,13 @@ # Template file for 'lxdm' pkgname=lxdm version=0.5.0 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--with-pam --with-systemdsystemunitdir=/usr/lib/systemd/system" +build_options="consolekit" +build_options_default="consolekit" +configure_args="$(vopt_enable consolekit) --with-pam" hostmakedepends="pkg-config intltool" -makedepends="pam-devel gtk+-devel iso-codes" +makedepends="pam-devel gtk+-devel iso-codes $(vopt_if consolekit ConsoleKit-devel)" conf_files=" /etc/lxdm/LoginReady /etc/lxdm/PostLogin @@ -17,7 +19,6 @@ conf_files=" /etc/lxdm/lxdm.conf /etc/pam.d/lxdm" system_groups="lxdm" -systemd_services="lxdm.service off" short_desc="GUI login manager for LXDE" maintainer="Juan RP " license="GPL-3"