diff --git a/srcpkgs/kde-workspace/files/kdm.service b/srcpkgs/kde-workspace/files/kdm.service deleted file mode 100644 index c57aba920cb..00000000000 --- a/srcpkgs/kde-workspace/files/kdm.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=K Display Manager -After=systemd-user-sessions.service - -[Service] -ExecStart=/usr/bin/kdm -nodaemon - -[Install] -Alias=display-manager.service diff --git a/srcpkgs/kde-workspace/template b/srcpkgs/kde-workspace/template index c691cd6e7ac..e06b2a3d281 100644 --- a/srcpkgs/kde-workspace/template +++ b/srcpkgs/kde-workspace/template @@ -4,7 +4,7 @@ _kappversion=15.04.1 pkgname=kde-workspace version=4.11.19 -revision=1 +revision=2 short_desc="Provides the interface and basic tools for the KDE workspace" maintainer="Juan RP " license="GPL, LGPL, FDL" @@ -15,7 +15,7 @@ checksum=1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 build_style=cmake configure_args="-Wno-dev -DKDE4_BUILD_TESTS=OFF -DSYSCONF_INSTALL_DIR=/etc -DWITH_Xmms=OFF -DWITH_libgps=OFF -DWITH_NepomukCore=OFF -DWITH_Soprano=OFF - $(vopt_if systemd '-DWITH-CkConnector=OFF' '-DWITH_CkConnector=ON')" + -DWITH_CkConnector=ON" # XXX prison. hostmakedepends="cmake automoc4 pkg-config" @@ -27,7 +27,7 @@ makedepends="libressl-devel qt-devel phonon-devel libdbusmenu-qt-devel strigi-de libXtst-devel libXft-devel glib-devel fontconfig-devel kdepimlibs-devel libsensors-devel wayland-devel MesaLib-devel pam-devel libusb-compat-devel NetworkManager-devel pciutils-devel libraw1394-devel python-devel libqalculate-devel - akonadi-devel qjson-devel $(vopt_if systemd '' ConsoleKit-devel)" + akonadi-devel qjson-devel ConsoleKit-devel" depends="kde-wallpapers>=${_kdeversion} kde-base-artwork>=${_kdeversion}" conf_files=" /etc/kdm/kdmrc @@ -41,7 +41,6 @@ make_dirs=" /etc/kde/env 0755 root root /etc/kde/shutdown 0755 root root /var/lib/kdm 0755 kdm kdm" -build_options="systemd" pre_configure() { sed -e "s,@PKG_SYSCONFDIR@,/etc,g" -i kdm/kcm/main.cpp @@ -52,9 +51,6 @@ post_install() { for f in kde kde-np kscreensaver; do install -m644 ${FILESDIR}/${f}.pam ${DESTDIR}/etc/pam.d/${f} done - if [ "$build_option_systemd" ]; then - vinstall ${FILESDIR}/kdm.service 644 usr/lib/systemd/system - fi vsv kdm vmkdir usr/share/xsessions ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop \