Fix blank screen problem

3 files changed, 8 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82656e9ab794..4b12d4ff484a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -40,7 +40,6 @@ pkgbase = lxdm-git
 	source = Xsession
 	source = lxdm.in.patch
 	source = lxdm.conf.in.patch
-	source = lxdm.c.patch
 	source = lxdm.pam
 	source = PostLogout
 	md5sums = SKIP
@@ -48,7 +47,6 @@ pkgbase = lxdm-git
 	md5sums = de8be632e7daef6787628ebb0dc94ad1
 	md5sums = b40a5e90b95b07c7fc1120da574c3149
 	md5sums = 1062f248ce6e7b3868fdc60da0645458
-	md5sums = 966499b1900eaa9b9c9021c57073c4df
 	md5sums = c941ef896248bc7c03901b513490425c
 	md5sums = 5d585acc332056b8d5be3a15d2f20d84
 
diff --git a/PKGBUILD b/PKGBUILD
index 77b7cd22a36a..4a484a0cb3be 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -32,7 +32,6 @@ source=('lxdm::git+http://git.lxde.org/git/lxde/lxdm.git'
         'Xsession'
         'lxdm.in.patch'
         'lxdm.conf.in.patch'
-        'lxdm.c.patch'
         'lxdm.pam'
         'PostLogout')
 md5sums=('SKIP'
@@ -40,7 +39,6 @@ md5sums=('SKIP'
          'de8be632e7daef6787628ebb0dc94ad1'
          'b40a5e90b95b07c7fc1120da574c3149'
          '1062f248ce6e7b3868fdc60da0645458'
-         '966499b1900eaa9b9c9021c57073c4df'
          'c941ef896248bc7c03901b513490425c'
          '5d585acc332056b8d5be3a15d2f20d84')
 
@@ -59,7 +57,6 @@ prepare() {
     
     patch -Np1 < ../lxdm.in.patch
     patch -Np1 < ../lxdm.conf.in.patch
-    patch -Np1 < ../lxdm.c.patch
 
     cp ../Xsession data/Xsession
     cp ../lxdm.pam pam/lxdm
@@ -69,7 +66,8 @@ build() {
     cd $_gitname
     
     ./autogen.sh        
-    ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin --sysconfdir=/etc --libexecdir=/usr/lib/lxdm --localstatedir=/var
+    ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin --sysconfdir=/etc \
+    	    --libexecdir=/usr/lib/lxdm --localstatedir=/var
     make
 }
 
@@ -83,7 +81,6 @@ package() {
     # Home directory
     install -dm 755 ${pkgdir}/var/lib/lxdm    
     echo 'GDK_CORE_DEVICE_EVENTS=true' > "$pkgdir"/var/lib/lxdm/.pam_environment
-    chown -R 121:121 "$pkgdir/var/lib/lxdm"
 
     # Custom themes
     cp -r ${srcdir}/lxdm-themes/* ${pkgdir}/usr/share/lxdm/themes
diff --git a/lxdm.install b/lxdm.install
index 49ce33319c41..7eb72f83c8d1 100755
--- a/lxdm.install
+++ b/lxdm.install
@@ -1,14 +1,11 @@
 pkgname=lxdm-git
 
-post_install() {
-	getent group lxdm > /dev/null 2>&1 && \
-	groupmod -g 121 lxdm > /dev/null 2>&1 || \
-	groupadd -g 121 lxdm
-	getent passwd lxdm > /dev/null 2>&1 && \
-	usermod -c 'Lightweight X11 Display Manager' -u 121 -g 121 -d /var/lib/lxdm -s /sbin/nologin lxdm > /dev/null 2>&1 || \
-	useradd -c 'Lightweight X11 Display Manager' -u 121 -g 121 -d /var/lib/lxdm -s /sbin/nologin lxdm
-	passwd -l lxdm > /dev/null
+post_remove() {
+    getent passwd lxdm &> /dev/null && userdel lxdm &> /dev/null
+}
 
+post_install() {
+    post_remove
 cat << EOF
 
     >>> There're two custom themes for lxdm: ArchStripes and ArchDark
@@ -19,9 +16,6 @@ EOF
 }
 
 post_upgrade() {
-	post_install
+    post_install
 }
 
-post_remove() {	
-	getent passwd lxdm > /dev/null 2>&1 && userdel lxdm
-}