From c5fe79e3c01d97dda3448eca34ef5ea342193735 Mon Sep 17 00:00:00 2001 From: freaj Date: Mon, 30 Mar 2015 11:39:16 +0200 Subject: sddm-consolekit: add new package to [pcr] --- pcr/sddm-consolekit/PKGBUILD | 47 +++++++++++++++++++++++++++++++ pcr/sddm-consolekit/sddm-consolekit.patch | 13 +++++++++ pcr/sddm-consolekit/sddm-upower.patch | 12 ++++++++ pcr/sddm-consolekit/sddm.install | 24 ++++++++++++++++ 4 files changed, 96 insertions(+) create mode 100644 pcr/sddm-consolekit/PKGBUILD create mode 100644 pcr/sddm-consolekit/sddm-consolekit.patch create mode 100644 pcr/sddm-consolekit/sddm-upower.patch create mode 100644 pcr/sddm-consolekit/sddm.install (limited to 'pcr') diff --git a/pcr/sddm-consolekit/PKGBUILD b/pcr/sddm-consolekit/PKGBUILD new file mode 100644 index 000000000..7252cab46 --- /dev/null +++ b/pcr/sddm-consolekit/PKGBUILD @@ -0,0 +1,47 @@ +# Maintainer : freaj +# Maintainer (Manjaro): artoo +# Contributor (Manjaro): Andrea Scarpino + +_pkgname=sddm + +pkgname=sddm-consolekit +pkgver=0.11.0 +pkgrel=1 +pkgdesc='QML based X11 display manager' +arch=('i686' 'x86_64') +url='http://github.com/sddm/sddm' +license=('GPL') +depends=('qt5-declarative') +makedepends=('cmake' 'python-docutils' 'qt5-tools') +install="${_pkgname}.install" +backup=('usr/share/sddm/scripts/Xsetup') +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}-upower.patch") +sha256sums=('80d53f075c275f744bd547523d6d640baccfacb4e463a71ec0facb8231b832ce' + '4cbe522c84956d13d751856b8c66f2beca210c9ec65712e261bfe2bf94fb0da5' + '6a2efbc0cd65d8f63a3f1288051001b18da5d00f5ce0ddbac1656a69c3a1a29f') + +prepare() { + mkdir -p build + cd ${_pkgname}-${pkgver} + patch -p1 -i ${srcdir}/${_pkgname}-consolekit.patch + patch -p1 -i ${srcdir}/${_pkgname}-upower.patch +} + +build() { + cd build + cmake ../${_pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/sddm \ + -DBUILD_MAN_PAGES=ON + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/sddm-consolekit/sddm-consolekit.patch b/pcr/sddm-consolekit/sddm-consolekit.patch new file mode 100644 index 000000000..acdfdc1a4 --- /dev/null +++ b/pcr/sddm-consolekit/sddm-consolekit.patch @@ -0,0 +1,13 @@ +diff --git a/data/scripts/Xsession b/data/scripts/Xsession +index a5d270d..4b48524 100755 +--- a/data/scripts/Xsession ++++ b/data/scripts/Xsession +@@ -74,7 +74,7 @@ case $session in + exec xterm -geometry 80x24-0-0 + ;; + *) +- eval exec "$session" ++ eval exec ck-launch-session "$session" + ;; + esac + exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." diff --git a/pcr/sddm-consolekit/sddm-upower.patch b/pcr/sddm-consolekit/sddm-upower.patch new file mode 100644 index 000000000..8c0f34c27 --- /dev/null +++ b/pcr/sddm-consolekit/sddm-upower.patch @@ -0,0 +1,12 @@ +diff -u -r sddm-0.9.0.orig/src/daemon/PowerManager.cpp sddm-0.9.0/src/daemon/PowerManager.cpp +--- sddm-0.9.0.orig/src/daemon/PowerManager.cpp 2014-10-01 18:40:37.402683578 +0200 ++++ sddm-0.9.0/src/daemon/PowerManager.cpp 2014-10-01 18:40:43.502618164 +0200 +@@ -197,7 +197,7 @@ + m_backends << new Login1Backend(); + + // check if upower interface exists +- if (interface->isServiceRegistered(UPOWER_SERVICE)) ++// if (interface->isServiceRegistered(UPOWER_SERVICE)) + m_backends << new UPowerBackend(); + } + diff --git a/pcr/sddm-consolekit/sddm.install b/pcr/sddm-consolekit/sddm.install new file mode 100644 index 000000000..904a73ac2 --- /dev/null +++ b/pcr/sddm-consolekit/sddm.install @@ -0,0 +1,24 @@ +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 +} + +post_remove() { + if getent passwd sddm >/dev/null; then + userdel sddm + fi + if getent group sddm >/dev/null; then + groupdel sddm + fi +} -- cgit v1.2.3-54-g00ecf