From fee40a6d7dc5725df2013dba0d881e8778ffc8a9 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 5 Aug 2018 10:57:26 +0200 Subject: [PATCH] sddm: resolve conflict with lightdm --- srcpkgs/sddm/template | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/srcpkgs/sddm/template b/srcpkgs/sddm/template index c9461a3ded4..04431e520e0 100644 --- a/srcpkgs/sddm/template +++ b/srcpkgs/sddm/template @@ -2,15 +2,17 @@ pkgname=sddm reverts=0.16.0_1 version=0.15.0 -revision=2 +revision=3 build_style=cmake -configure_args="-DBUILD_MAN_PAGES=1 -DNO_SYSTEMD=1 -DUSE_ELOGIND=1 -DLOGIN_DEFS_PATH=/etc/login.defs" +configure_args="-DBUILD_MAN_PAGES=1 -DNO_SYSTEMD=1 -DUSE_ELOGIND=1 + -DLOGIN_DEFS_PATH=${XBPS_SRCPKGDIR}/shadow/files/login.defs + -DDBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf" hostmakedepends="extra-cmake-modules pkg-config python-docutils" makedepends="qt5-declarative-devel qt5-tools-devel pam-devel elogind-devel" depends="dbus" short_desc="QML based X11 display manager" maintainer="Michael Aldridge " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://github.com/sddm/sddm" distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" checksum=7a84089b2e424097664bf7cfb24bdc5896ba0eebf8d54eb77bcac6d16db1e358 @@ -28,12 +30,6 @@ conf_files=" /etc/pam.d/sddm-greeter /etc/pam.d/sddm-autologin" -# Both install /etc/dbus-1/system.d/org.freedesktop.DisplayManager.conf -conflicts="lightdm>=0" - -pre_configure() { - touch -f /etc/login.defs -} post_install() { sed -i 's,systemd,ck_connector,g' ${DESTDIR}/etc/pam.d/sddm-greeter vsv sddm