From af0f866fb9d74fd0d5d503c213799d259da9a95b Mon Sep 17 00:00:00 2001 From: David P Date: Wed, 22 Mar 2017 10:24:12 -0300 Subject: Re-added sddm-consolekit --- pcr/sddm-consolekit/PKGBUILD | 56 +++++++++++++++ pcr/sddm-consolekit/sddm-consolekit.patch | 9 +++ pcr/sddm-consolekit/sddm-pam_kwallet.patch | 10 +++ pcr/sddm-consolekit/sddm.conf | 105 +++++++++++++++++++++++++++++ pcr/sddm-consolekit/sddm.install | 15 +++++ 5 files changed, 195 insertions(+) create mode 100644 pcr/sddm-consolekit/PKGBUILD create mode 100644 pcr/sddm-consolekit/sddm-consolekit.patch create mode 100644 pcr/sddm-consolekit/sddm-pam_kwallet.patch create mode 100644 pcr/sddm-consolekit/sddm.conf create mode 100644 pcr/sddm-consolekit/sddm.install (limited to 'pcr/sddm-consolekit') diff --git a/pcr/sddm-consolekit/PKGBUILD b/pcr/sddm-consolekit/PKGBUILD new file mode 100644 index 000000000..75866939f --- /dev/null +++ b/pcr/sddm-consolekit/PKGBUILD @@ -0,0 +1,56 @@ +# Maintainer: artoo +# Contributor: Andrea Scarpino + +_pkgname=sddm + +pkgname=sddm-consolekit +pkgver=0.14.0 +pkgrel=2 +pkgdesc='QML based X11 display manager' +arch=('i686' 'x86_64') +url='http://github.com/sddm/sddm' +license=('GPL') +depends=('qt5-declarative' 'dbus-openrc' 'eudev-systemd' 'consolekit') +makedepends=('extra-cmake-modules' 'python-docutils' 'qt5-tools') +install="${_pkgname}.install" +backup=('usr/share/sddm/scripts/Xsetup' + 'etc/pam.d/sddm' + 'etc/sddm.conf') +conflicts=('display-manager' 'sddm') +provides=('display-manager' 'sddm') +source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgname}/${_pkgname}/archive/v${pkgver}.tar.gz" + "${_pkgname}-consolekit.patch" + "${_pkgname}-pam_kwallet.patch" + 'sddm.conf' + "sddm-fix-avatars.patch::https://github.com/sddm/sddm/commit/ecb903e4.patch") +sha256sums=('a551551a6ba324e9c384c89bc63e871de65fea3740eadbea2d63df86045f8205' + 'a998f8a2594cd1e81f402605f01075477a017269b0ac93a22f5faa7d355d18e0' + 'dc46a0132cf0ea722a69cff45ed1ded3c93ade008e22fc90d1b797ca85ed535a' + 'ffcb9885cb41da54a97f62c2538975fbb9dc80c2b58326d479a87ea0f56f02cf' + 'b091f02d6d5b2ddc9d5208b17213a181c6e8deae23e5633d694119e79b66d38b') + +prepare() { + mkdir -p build + cd ${_pkgname}-${pkgver} + patch -p1 -i ${srcdir}/${_pkgname}-consolekit.patch + patch -p1 -i ${srcdir}/${_pkgname}-pam_kwallet.patch + patch -p1 -i ${srcdir}/sddm-fix-avatars.patch +} + +build() { + cd build + cmake ../${_pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/sddm \ + -DDBUS_CONFIG_FILENAME=org.freedesktop.sddm.conf \ + -DBUILD_MAN_PAGES=ON + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +# sed -e 's|pam_systemd.so|pam_ck_connector.so nox11|' -i ${pkgdir}/etc/pam.d/sddm-greeter + install -m 755 ${srcdir}/sddm.conf ${pkgdir}/etc +} diff --git a/pcr/sddm-consolekit/sddm-consolekit.patch b/pcr/sddm-consolekit/sddm-consolekit.patch new file mode 100644 index 000000000..64ea06482 --- /dev/null +++ b/pcr/sddm-consolekit/sddm-consolekit.patch @@ -0,0 +1,9 @@ +--- a/data/scripts/Xsession 2016-08-28 14:52:04.910181422 +0200 ++++ b/data/scripts/Xsession 2016-08-28 14:53:07.157184480 +0200 +@@ -91,5 +91,5 @@ + if [ -z "$@" ]; then + exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." + else +- exec $@ ++ exec ck-launch-session $@ + fi diff --git a/pcr/sddm-consolekit/sddm-pam_kwallet.patch b/pcr/sddm-consolekit/sddm-pam_kwallet.patch new file mode 100644 index 000000000..ff1c4d2dd --- /dev/null +++ b/pcr/sddm-consolekit/sddm-pam_kwallet.patch @@ -0,0 +1,10 @@ +--- a/services/sddm.pam 2015-08-17 18:06:19.000000000 +0200 ++++ b/services/sddm.pam 2016-02-21 19:54:08.654091951 +0100 +@@ -4,3 +4,7 @@ + account include system-login + password include system-login + session include system-login ++-auth optional pam_kwallet.so kdehome=.kde4 ++-auth optional pam_kwallet5.so ++-session optional pam_kwallet.so ++-session optional pam_kwallet5.so auto_start diff --git a/pcr/sddm-consolekit/sddm.conf b/pcr/sddm-consolekit/sddm.conf new file mode 100644 index 000000000..78118cf56 --- /dev/null +++ b/pcr/sddm-consolekit/sddm.conf @@ -0,0 +1,105 @@ +[Autologin] +# Autologin again on session exit +Relogin=false + +# Autologin session +Session= + +# Autologin user +User= + + +[General] +# Halt command +HaltCommand=/usr/bin/shutdown -h -P + +# Initial NumLock state +# Valid values: on|off|none +# If property is set to none, numlock won't be changed +Numlock=none + +# Reboot command +RebootCommand=/usr/bin/shutdown -r now + + +[Theme] +# Current theme name +Current=breeze + +# Cursor theme +CursorTheme=breeze_cursors + +# Face icon directory +# The files should be in username.face.icon format +FacesDir=/usr/share/sddm/faces + +# Theme directory path +ThemeDir=/usr/share/sddm/themes + + +[Users] +# Default $PATH +DefaultPath=/bin:/usr/bin:/usr/local/bin + +# Hidden shells +# Users with these shells as their default won't be listed +HideShells= + +# Hidden users +HideUsers= + +# Maximum user id for displayed users +MaximumUid=60000 + +# Minimum user id for displayed users +MinimumUid=1000 + +# Remember the session of the last successfully logged in user +RememberLastSession=true + +# Remember the last successfully logged in user +RememberLastUser=true + + +[WaylandDisplay] +# Wayland session script path +# A script to execute when starting the desktop session +SessionCommand=/usr/share/sddm/scripts/wayland-session + +# Session description directory +SessionDir=/usr/share/wayland-sessions + + +[XDisplay] +# Xsetup script path +# A script to execute when starting the display server +DisplayCommand=/usr/share/sddm/scripts/Xsetup + +# Xstop script path +# A script to execute when stopping the display server +DisplayStopCommand=/usr/share/sddm/scripts/Xstop + +# Minimum VT +# The lowest virtual terminal number that will be used. +MinimumVT=7 + +# X server arguments +ServerArguments=-nolisten tcp + +# X server path +ServerPath=/usr/bin/X + +# Xsession script path +# A script to execute when starting the desktop session +SessionCommand=/usr/share/sddm/scripts/Xsession + +# Session description directory +SessionDir=/usr/share/xsessions + +# Xauth path +XauthPath=/usr/bin/xauth + +# Xephyr path +XephyrPath=/usr/bin/Xephyr + + diff --git a/pcr/sddm-consolekit/sddm.install b/pcr/sddm-consolekit/sddm.install new file mode 100644 index 000000000..f078c1466 --- /dev/null +++ b/pcr/sddm-consolekit/sddm.install @@ -0,0 +1,15 @@ +post_install() { + if ! getent group sddm > /dev/null; then + groupadd --system sddm + fi + if ! getent passwd sddm > /dev/null; then + useradd -c "Simple Desktop Display Manager" --system -d /var/lib/sddm -s /usr/bin/nologin -g sddm sddm + passwd -l sddm > /dev/null + fi + mkdir -p /var/lib/sddm + chown -R sddm:sddm /var/lib/sddm > /dev/null +} + +post_upgrade() { + post_install $1 +} -- cgit v1.2.3