testing/lightdm: add user, initd script, fix localstatedir

4 files changed, 154 insertions, 6 deletions

diff --git a/testing/lightdm/APKBUILD b/testing/lightdm/APKBUILD
index 429875be51..368305b566 100644
--- a/testing/lightdm/APKBUILD
+++ b/testing/lightdm/APKBUILD
@@ -2,17 +2,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lightdm
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-desktop display manager"
 url="http://www.freedesktop.org/wiki/Software/LightDM"
 arch="all"
 license="GPL-3"
-depends=""
+depends="dbus"
 depends_dev=""
-makedepends="linux-pam-dev gtk+3.0-dev libxklavier-dev"
-install=""
+makedepends="linux-pam-dev gtk+3.0-dev libxklavier-dev libxext-dev
+	autoconf automake libtool gobject-introspection-dev"
+install="$pkgname.pre-install"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="http://people.ubuntu.com/~robert-ancell/lightdm/releases/lightdm-$pkgver.tar.gz"
+source="http://people.ubuntu.com/~robert-ancell/lightdm/releases/lightdm-$pkgver.tar.gz
+	lightdm-x11-configure.patch
+	lightdm.initd"
 
 _builddir="$srcdir"/lightdm-$pkgver
 prepare() {
@@ -29,8 +32,10 @@ build() {
 	cd "$_builddir"
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
+		--localstatedir=/var \
 		--enable-liblightdm-gobject \
 		--enable-gtk-greeter \
+		--with-greeter-session=lightdm-gtk-greeter \
 		|| return 1
 
 	# workaround build bug
@@ -44,6 +49,10 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 	rm -f "$pkgdir"/usr/lib/*.la
 	mv "$pkgdir"/usr/lib/locale "$pkgdir"/usr/share/
+
+	install -Dm755 "$srcdir"/lightdm.initd "$pkgdir"/etc/init.d/lightdm
 }
 
-md5sums="c2347200b1af29c677ef5ad83855217b  lightdm-1.1.0.tar.gz"
+md5sums="c2347200b1af29c677ef5ad83855217b  lightdm-1.1.0.tar.gz
+10b9a72013ed824a12a8720ff28810a1  lightdm-x11-configure.patch
+9eb01e4202919424face9bafbda4936c  lightdm.initd"
diff --git a/testing/lightdm/lightdm-x11-configure.patch b/testing/lightdm/lightdm-x11-configure.patch
new file mode 100644
index 0000000000..e1819eaa49
--- /dev/null
+++ b/testing/lightdm/lightdm-x11-configure.patch
@@ -0,0 +1,122 @@
+--- ./configure.orig
++++ ./configure
+@@ -17154,10 +17154,12 @@
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+         gtk+-3.0
+         gmodule-export-2.0
++	x11
+     \""; } >&5
+   ($PKG_CONFIG --exists --print-errors "
+         gtk+-3.0
+         gmodule-export-2.0
++	x11
+     ") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+@@ -17165,6 +17167,7 @@
+   pkg_cv_LIGHTDM_GTK_GREETER_CFLAGS=`$PKG_CONFIG --cflags "
+         gtk+-3.0
+         gmodule-export-2.0
++	x11
+     " 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+@@ -17180,10 +17183,12 @@
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+         gtk+-3.0
+         gmodule-export-2.0
++	x11
+     \""; } >&5
+   ($PKG_CONFIG --exists --print-errors "
+         gtk+-3.0
+         gmodule-export-2.0
++	x11
+     ") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+@@ -17191,6 +17196,7 @@
+   pkg_cv_LIGHTDM_GTK_GREETER_LIBS=`$PKG_CONFIG --libs "
+         gtk+-3.0
+         gmodule-export-2.0
++	x11
+     " 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+@@ -17215,11 +17221,13 @@
+ 	        LIGHTDM_GTK_GREETER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
+         gtk+-3.0
+         gmodule-export-2.0
++	x11
+     " 2>&1`
+         else
+ 	        LIGHTDM_GTK_GREETER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
+         gtk+-3.0
+         gmodule-export-2.0
++	x11
+     " 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+@@ -17250,10 +17258,12 @@
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+         gtk+-3.0
+         gmodule-export-2.0
++	x11
+     \""; } >&5
+   ($PKG_CONFIG --exists --print-errors "
+         gtk+-3.0
+         gmodule-export-2.0
++	x11
+     ") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+@@ -17261,6 +17271,7 @@
+   pkg_cv_LIGHTDM_GTK_GREETER_CFLAGS=`$PKG_CONFIG --cflags "
+         gtk+-3.0
+         gmodule-export-2.0
++	x11
+     " 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+@@ -17276,10 +17287,12 @@
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+         gtk+-3.0
+         gmodule-export-2.0
++	x11
+     \""; } >&5
+   ($PKG_CONFIG --exists --print-errors "
+         gtk+-3.0
+         gmodule-export-2.0
++	x11
+     ") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+@@ -17287,6 +17300,7 @@
+   pkg_cv_LIGHTDM_GTK_GREETER_LIBS=`$PKG_CONFIG --libs "
+         gtk+-3.0
+         gmodule-export-2.0
++	x11
+     " 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+@@ -17311,11 +17325,13 @@
+ 	        LIGHTDM_GTK_GREETER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
+         gtk+-3.0
+         gmodule-export-2.0
++	x11
+     " 2>&1`
+         else
+ 	        LIGHTDM_GTK_GREETER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
+         gtk+-3.0
+         gmodule-export-2.0
++	x11
+     " 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+@@ -17324,6 +17340,7 @@
+ 	as_fn_error $? "Package requirements (
+         gtk+-3.0
+         gmodule-export-2.0
++	x11
+     ) were not met:
+ 
+ $LIGHTDM_GTK_GREETER_PKG_ERRORS
diff --git a/testing/lightdm/lightdm.initd b/testing/lightdm/lightdm.initd
new file mode 100755
index 0000000000..4e560c3fcc
--- /dev/null
+++ b/testing/lightdm/lightdm.initd
@@ -0,0 +1,11 @@
+#!/sbin/runscript
+
+depends() {
+	needs localmount dbus
+}
+
+description="Lightweigh display manager"
+command="/usr/sbin/lightdm"
+command_background="yes"
+pidfile="/var/run/lightdm.pid"
+
diff --git a/testing/lightdm/lightdm.pre-install b/testing/lightdm/lightdm.pre-install
new file mode 100644
index 0000000000..99a5b137e7
--- /dev/null
+++ b/testing/lightdm/lightdm.pre-install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+name=lightdm
+addgroup -S $name 2>/dev/null
+adduser -S -H -h /dev/null -s /bin/false -D -G $name $name 2>/dev/null
+exit 0