Thu May 10 00:01:50 UTC 2012

3 files changed, 39 insertions, 35 deletions

diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD
index fc74689a8..f968b228c 100644
--- a/extra/slim/PKGBUILD
+++ b/extra/slim/PKGBUILD
@@ -1,62 +1,48 @@
-# $Id: PKGBUILD 148930 2012-02-05 11:56:28Z ibiru $
+# $Id: PKGBUILD 158739 2012-05-08 16:15:26Z tpowa $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Hugo Ideler <hugoideler@dse.nl>
 
 pkgname=slim
-pkgver=1.3.2
-pkgrel=7
+pkgver=1.3.3
+pkgrel=2
 pkgdesc='Desktop-independent graphical login manager for X11'
 arch=('i686' 'x86_64')
 url='http://slim.berlios.de/'
 license=('GPL2')
-depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft')
+depends=('consolekit' 'pam' 'libxmu' 'libpng' 'libjpeg' 'libxft')
+makedepends=('cmake')
 backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim')
 source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'rc.d'
         'pam.d'
         'logrotate'
+        'slim.service'
         'ptr_pam.patch'
-        'no-host.patch'
-        'restart.patch'
-        'sigterm.patch'
-        'session-name.patch'
-        'tty-slowness.patch'
-        'slim-1.3.2-libpng15.patch')
-sha1sums=('e421d5487732c8317f8f591906661e014b036358'
-          '6fe0ba83509af634bce47be34e30995965bffc79'
-          'a0e991ef0ac5120465a3be014a26e70ba073b6ae'
-          'b969cc902c1d9915a5609141a652c77b2732407b'
-          '640668c984a13593a1bfba8d3b503c005d5f401e'
-          'b86eddd083fb9f6259e46c735f55ebe76c655bd3'
-          '2d526bc0c498bf307ee50e2d22b4f53ffa0c4435'
-          '0b35048723c527fb824c5e0f9b9064f751871785'
-          'fdd35562ce010babaeb793f92f9906fdcdaf3f9f'
-          '213fefe8533c845ea8c40585b6a8097820d5e5d2'
-          '3cd674e548f4e0aadbbd32a67b4efd1ed263afef')
+        'session-name.patch')
+
 
 install=install
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sed -i -e 's/png12/png15/g' Makefile
+        cd "${srcdir}/${pkgname}-${pkgver}"
 	patch -p1 -i ../ptr_pam.patch # FS#23995: pointer mishandling confuses PAM
-	patch -p1 -i ../no-host.patch # cf patch: do not set PAM host
-	patch -p1 -i ../restart.patch # cf patch: restart X server if killed
-	patch -p1 -i ../sigterm.patch # FS#23984: do not wait for input when SIGTERM'd
 	patch -p1 -i ../session-name.patch # FS#26693: fix default session name
-	patch -p1 -i ../tty-slowness.patch # FS#18313: fix sluggish TTY after slim start
-	patch -p0 -i ../slim-1.3.2-libpng15.patch
-
-	make USE_PAM=1
+        cd ${srcdir}
+        mkdir build
+        cd build
+        cmake ../${pkgbase}-${pkgver} \
+                -DCMAKE_BUILD_TYPE=Release \
+                -DCMAKE_SKIP_RPATH=ON \
+                -DCMAKE_INSTALL_PREFIX=/usr \
+                -DUSE_PAM=yes -DUSE_CONSOLEKIT=yes
+	make
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" MANDIR=/usr/share/man install
+        cd  ${srcdir}/build/
+	make DESTDIR="${pkgdir}" install
 
 	install -D -m755 ../rc.d "${pkgdir}"/etc/rc.d/slim
 	install -D -m644 ../pam.d "${pkgdir}"/etc/pam.d/slim
@@ -65,4 +51,13 @@ package() {
 	# Provide sane defaults
 	sed -i 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' "${pkgdir}"/etc/slim.conf
 	sed -i 's|/var/run/slim.lock|/var/lock/slim.lock|' "${pkgdir}"/etc/slim.conf
+        # install systemd files
+        install -D -m644 ${srcdir}/slim.service ${pkgdir}/usr/lib/systemd/system/slim.service
 }
+md5sums=('ce53e44c1e4a2eacf5bb7688ee2a5de8'
+         'd8ea9c4dee2811524b67f4f666311a1f'
+         'ebfff3417058619a1328284ae0e2f48e'
+         '43da096480bf72c3ccec8ad8400f34f0'
+         'aef560f5a765582b2a7fc1fac5b323a7'
+         'ae4b237d472ec5d373e30080aa0ff804'
+         'ebcb6829028615686de7b64ceeaaf8ed')
diff --git a/extra/slim/pam.d b/extra/slim/pam.d
index 78a981f74..4a6b53d0f 100644
--- a/extra/slim/pam.d
+++ b/extra/slim/pam.d
@@ -7,4 +7,3 @@ password        required        pam_unix.so
 session         required        pam_limits.so
 session         required        pam_unix.so
 session         optional        pam_loginuid.so
-session         optional        pam_ck_connector.so
diff --git a/extra/slim/slim.service b/extra/slim/slim.service
new file mode 100644
index 000000000..26093a8bf
--- /dev/null
+++ b/extra/slim/slim.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=SLiM Simple Login Manager
+Requires=dev-tty7.device
+After=dev-tty7.device systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/slim -nodaemon
+
+[Install]
+WantedBy=graphical.target