Tue Apr 3 00:01:35 UTC 2012

4 files changed, 53 insertions, 10 deletions

diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index 20c9c3eb4..9613a4eb0 100644
--- a/community/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 67372 2012-03-10 19:36:34Z bpiotrowski $
+# $Id: PKGBUILD 68758 2012-04-01 15:10:08Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: kiefer <jorgelmadrid@gmail.com>
 
 pkgname=lxdm
 pkgver=0.4.1
-pkgrel=8
+pkgrel=9
 pkgdesc="Lightweight Display Manager (part of LXDE)"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/lxdm/"
@@ -18,30 +18,33 @@ backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession'
         'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin'
         'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown')
 source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
-        lxdm.patch lxdm-conf.patch lxdm-pam.patch Xsession.patch lxdm-daemon)
+        glib2-2.32.0.patch lxdm.patch lxdm.conf.patch Xsession.patch
+        lxdm-daemon lxdm-pam)
 md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
+         'a1e3c46a8bef691bc544028f5b6cfe22'
          'baed9055e8825a5511712bc095197519'
          'c50dd01b715b0a236407d48066191601'
-         'b20fe3c8487a039050986d60e45233a9'
          'd2e4a4a22ee2aa1a986be154c647b6c6'
-         '705f394052fdd0dec22e95321d170de0')
+         '705f394052fdd0dec22e95321d170de0'
+         'b20fe3c8487a039050986d60e45233a9')
 
 build() {
-  	cd "$srcdir/$pkgname-$pkgver"
+  	cd $srcdir/$pkgname-$pkgver
+  	patch -Np1 -i $srcdir/glib2-2.32.0.patch
     ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm
 	make
   	
-	patch -Np0 -i $srcdir/lxdm.patch
-    patch -Np0 -i $srcdir/lxdm-conf.patch
+ 	patch -Np0 -i $srcdir/lxdm.patch
+    patch -Np0 -i $srcdir/lxdm.conf.patch
     patch -Np0 -i $srcdir/Xsession.patch
 }
 
 
 package() {
-  	cd "$srcdir/$pkgname-$pkgver"
+  	cd $srcdir/$pkgname-$pkgver
   	make DESTDIR="${pkgdir}" install
 
-	install -m644 ${srcdir}/lxdm-pam.patch ${pkgdir}/etc/pam.d/lxdm
+	install -m644 ${srcdir}/lxdm-pam ${pkgdir}/etc/pam.d/lxdm
 	install -Dm755 ${srcdir}/lxdm-daemon ${pkgdir}/etc/rc.d/lxdm
     install -d ${pkgdir}/var/{lib,run}/lxdm
 
diff --git a/community/lxdm/glib2-2.32.0.patch b/community/lxdm/glib2-2.32.0.patch
new file mode 100644
index 000000000..cebfc6133
--- /dev/null
+++ b/community/lxdm/glib2-2.32.0.patch
@@ -0,0 +1,21 @@
+From: dgod <dgod.osa@gmail.com>
+Date: Sun, 25 Dec 2011 07:23:19 +0000 (+0800)
+Subject: fix event check bug caused cpu 100%
+X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde%2Flxdm;a=commitdiff_plain;h=d4e41ecb;hp=f0951bdf736026b041001e846d2cb93f7f2852e1
+
+fix event check bug caused cpu 100%
+---
+
+diff --git a/src/lxcom.c b/src/lxcom.c
+index 02763eb..18ee12e 100644
+--- a/src/lxcom.c
++++ b/src/lxcom.c
+@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout)
+ 
+ static gboolean lxcom_check(GSource *source)
+ {
+-	return TRUE;
++	return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE;
+ }
+ 
+ static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data)
diff --git a/community/lxdm/lxdm-pam b/community/lxdm/lxdm-pam
new file mode 100644
index 000000000..3f5df04a7
--- /dev/null
+++ b/community/lxdm/lxdm-pam
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth            requisite       pam_nologin.so
+auth            required        pam_env.so
+auth            required        pam_unix.so
+account         required        pam_unix.so
+session         required        pam_limits.so
+session         required        pam_unix.so
+password        required        pam_unix.so
diff --git a/community/lxdm/lxdm.conf.patch b/community/lxdm/lxdm.conf.patch
new file mode 100644
index 000000000..1744e557e
--- /dev/null
+++ b/community/lxdm/lxdm.conf.patch
@@ -0,0 +1,11 @@
+--- data/lxdm.conf.orig	2011-11-01 17:57:59.208757577 +0100
++++ data/lxdm.conf	2011-11-01 18:03:55.608741945 +0100
+@@ -27,7 +27,7 @@
+ gtk_theme=Clearlooks
+ 
+ ## background of the greeter
+-bg=/usr/share/backgrounds/default.png
++# bg=/usr/share/backgrounds/default.png
+ 
+ ## if show bottom pane
+ bottom_pane=1