diff --git a/srcpkgs/lightdm/files/lightdm.service b/srcpkgs/lightdm/files/lightdm.service deleted file mode 100644 index 9b22f034c5d..00000000000 --- a/srcpkgs/lightdm/files/lightdm.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Light Display Manager -Documentation=man:lightdm(1) -Conflicts=getty@tty1.service -After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service - -[Service] -ExecStart=/usr/bin/lightdm -Restart=always -IgnoreSIGPIPE=no -BusName=org.freedesktop.DisplayManager - -[Install] -Alias=display-manager.service diff --git a/srcpkgs/lightdm/files/lightdm.tmpfiles b/srcpkgs/lightdm/files/lightdm.tmpfiles deleted file mode 100644 index 69e19c075fe..00000000000 --- a/srcpkgs/lightdm/files/lightdm.tmpfiles +++ /dev/null @@ -1,2 +0,0 @@ -d /run/lightdm 0711 lightdm lightdm - diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template index 859eedb0c4f..cff4d95cce6 100644 --- a/srcpkgs/lightdm/template +++ b/srcpkgs/lightdm/template @@ -1,7 +1,7 @@ # Template file for 'lightdm' pkgname=lightdm version=1.14.2 -revision=1 +revision=2 build_pie=yes build_style=gnu-configure configure_args="--sbindir=/usr/bin --with-greeter-session=lightdm-gtk-greeter @@ -14,15 +14,12 @@ homepage="https://launchpad.net/lightdm" distfiles="https://launchpad.net/lightdm/${version%.*}/$version/+download/$pkgname-$version.tar.xz" checksum=28b078979870782aaa1a9167945e1dab19cc6d699747af3d0c0c9a3bdb8dbba1 -# both install /etc/dbus-1/system.d/org.freedesktop.DisplayManager.conf -conflicts="sddm>=0" - -build_options="gir systemd" +build_options="gir" hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection)" makedepends="dbus-glib-devel libxklavier-devel libxml2-devel gtk+3-devel libxcb-devel libXdmcp-devel pam-devel vala-devel - libgcrypt-devel accountsservice-devel $(vopt_if systemd systemd-devel)" -depends="dbus accountsservice $(vopt_if systemd '' 'ConsoleKit2 upower0')" + libgcrypt-devel accountsservice-devel" +depends="dbus accountsservice ConsoleKit2 upower0" conf_files=" /etc/lightdm/keys.conf /etc/lightdm/lightdm.conf @@ -44,10 +41,6 @@ fi post_install() { # Remove provided init file and use our own. rm -rf ${DESTDIR}/etc/init - if [ "$build_option_systemd" ]; then - vinstall ${FILESDIR}/lightdm.service 644 usr/lib/systemd/system - vinstall ${FILESDIR}/lightdm.tmpfiles 644 usr/lib/tmpfiles.d lightdm.conf - fi vsv lightdm vinstall ${FILESDIR}/lightdm.rules 644 usr/share/polkit-1/rules.d vinstall ${FILESDIR}/xsession 755 etc/lightdm Xsession