lxdm-consolekit-0.5.3-4: rebuild

3 files changed, 120 insertions, 28 deletions

diff --git a/pcr/lxdm-consolekit/PKGBUILD b/pcr/lxdm-consolekit/PKGBUILD
index c3e4860ca..5c400a691 100644
--- a/pcr/lxdm-consolekit/PKGBUILD
+++ b/pcr/lxdm-consolekit/PKGBUILD
@@ -1,19 +1,19 @@
-# Maintainer: David P. <megver83@parabola.nu>
-# Contributor: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
-# Contributor: AndyRTR <andyrtr@archlinux.org>
-# Contributor: kiefer <jorgelmadrid@gmail.com>
-# Maintainer: Aaditya Bagga <aaditya_gnulinux@zoho.com>
+# Contributor (Arch): Balló György <ballogyor+arch at gmail dot com>
+# Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor (Arch): AndyRTR <andyrtr@archlinux.org>
+# Contributor (Arch): kiefer <jorgelmadrid@gmail.com>
+# Maintainer (Arch): Aaditya Bagga <aaditya_gnulinux@zoho.com>
+# Maintainer: David P. <megver83@openmailbox.org>
+# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=lxdm-consolekit
 _pkgname=lxdm
 pkgver=0.5.3
-pkgrel=1.1
+pkgrel=4
 pkgdesc='LXDM with consolekit support enabled'
 arch=('armv7h' 'i686' 'x86_64')
 url="https://sourceforge.net/projects/lxdm/"
 license=('GPL')
-groups=('lxde')
 depends=('gtk2' 'xorg-server' 'consolekit')
 makedepends=('intltool' 'iso-codes')
 optdepends=('gtk-engines: default GTK+ theme'
@@ -25,17 +25,22 @@ install=$_pkgname.install
 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/lxdm/$_pkgname-$pkgver.tar.xz
+source=(https://downloads.sourceforge.net/lxdm/$_pkgname-$pkgver.tar.xz
+        git-fixes.patch
         default-config.patch
         lxdm.pam
         Xsession)
-md5sums=('061caae432634e6db38bbdc84bc6ffa0'
-         'd42d17443e544beee46a9ab47cb24b86'
-         '06f54c141668495b1e600dc56d3cec1a'
-         '6ceea02bf33f6d122365f83435f976ab')
+sha256sums=('4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f'
+            'ca3b225fb85a4e87ebb48e2b1a20f4bab86bf619a9ad927f08fdc819bc435bb4'
+            '9d0a942d857b641927ce908dc05802339ada09577e591f7bec2cd7630c46f4be'
+            '6f7b8078730c13a33ae8c82334d91f1c394e04cec6e667b2814cf7d3a0722957'
+            'c55316e0083c6a8c6fe195e009f271d7cce1da04f04e1640848d76630decfebe')
 
 prepare(){
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd $_pkgname-$pkgver
+
+  # Apply fixes from git
+  patch -Np1 -i ../git-fixes.patch
 
   # Adjust Arch-specific settings
   patch -Np1 -i ../default-config.patch
@@ -49,19 +54,14 @@ prepare(){
 }
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd $_pkgname-$pkgver
   ./configure --prefix=/usr --sbindir=/usr/bin --libexecdir=/usr/lib/lxdm \
-              --sysconfdir=/etc --localstatedir=/var
+              --sysconfdir=/etc --localstatedir=/var --with-systemdsystemunitdir=no
   make
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd $_pkgname-$pkgver
   make DESTDIR="$pkgdir" install
   chmod 644 "$pkgdir/etc/lxdm/lxdm.conf"
-
-  # 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"
 }
diff --git a/pcr/lxdm-consolekit/git-fixes.patch b/pcr/lxdm-consolekit/git-fixes.patch
new file mode 100644
index 000000000..ee4f2147d
--- /dev/null
+++ b/pcr/lxdm-consolekit/git-fixes.patch
@@ -0,0 +1,93 @@
+diff --git a/data/themes/Industrial/gtk.css b/data/themes/Industrial/gtk.css
+index 179f0d6..f8e6432 100644
+--- a/data/themes/Industrial/gtk.css
++++ b/data/themes/Industrial/gtk.css
+@@ -17,6 +17,7 @@
+ 	color: #000000;
+ }
+ 
++#bottom_pane label,
+ #bottom_pane GtkLabel {
+ 	font: Sans 12;
+ 	color: #9E9D9B;
+diff --git a/src/greeter-gdk.c b/src/greeter-gdk.c
+index 1abbefa..ad3267a 100644
+--- a/src/greeter-gdk.c
++++ b/src/greeter-gdk.c
+@@ -22,6 +22,7 @@
+ 
+ #define XLIB_ILLEGAL_ACCESS
+ 
++#include <gtk/gtk.h>
+ #include <gdk/gdk.h>
+ #include <gdk/gdkx.h>
+ #include <gdk/gdkkeysyms.h>
+@@ -88,12 +89,14 @@ static void on_ui_expose(void)
+ 	}
+ 	
+ 	cr=gdk_cairo_create(win);
++#if GTK_CHECK_VERSION(3,0,0)
+ 	cairo_pattern_t *pattern=gdk_window_get_background_pattern(win);
+ 	if(pattern)
+ 	{
+ 		cairo_set_source(cr,pattern);
+ 		cairo_paint(cr);
+ 	}
++#endif
+ 
+ 	gdk_cairo_set_source_color(cr, &bg);
+ 	cairo_rectangle(cr, rc.x, rc.y, rc.width, rc.height);
+diff --git a/src/greeter.c b/src/greeter.c
+index 10b7f3f..03503b6 100644
+--- a/src/greeter.c
++++ b/src/greeter.c
+@@ -146,7 +146,7 @@ static void switch_to_input_user(void)
+ 		if(user_list_scrolled)
+ 			gtk_widget_show(user_list_scrolled);
+ 		else
+-			gtk_widget_hide(user_list);
++			gtk_widget_show(user_list);
+ 		gtk_widget_grab_focus(user_list);
+ 	}
+ 	else
+diff --git a/src/lxdm.c b/src/lxdm.c
+index a37f051..722936f 100644
+--- a/src/lxdm.c
++++ b/src/lxdm.c
+@@ -488,6 +490,9 @@ static char *lxsession_xserver_command(LXSession *s)
+ 	{
+ 		arg[arc++] = g_strdup("-nolisten");
+ 		arg[arc++] = g_strdup("tcp");
++	} else {
++		arg[arc++] = g_strdup("-listen");
++		arg[arc++] = g_strdup("tcp");
+ 	}
+ 	if(!novtswitch)
+ 	{
+@@ -750,7 +755,13 @@ static char ** create_client_auth(struct passwd *pw,char **env)
+ 	if(xauth_write_file(authfile,s->display,s->mcookie)==-1)
+ 	{
+ 		g_free(authfile);
+-		authfile = g_strdup_printf("/var/run/lxdm/.Xauth%d",pw->pw_uid);
++
++		gchar *authdir = g_strdup_printf("/var/run/lxdm/%d", pw->pw_uid);
++		g_mkdir_with_parents(authdir, S_IRWXU);
++		chown(authdir, pw->pw_uid, pw->pw_gid);
++
++		authfile = g_strdup_printf("%s/.Xauthority", authdir);
++		g_free(authdir);
+ 		remove(authfile);
+ 		xauth_write_file(authfile,s->display,s->mcookie);
+ 	}
+@@ -956,6 +967,11 @@ static void on_xserver_stop(void *data,int pid, int status)
+ 		s->dpy=NULL;
+ 		ui_drop();
+ 		lxdm_startx(s);
++		#ifndef DISABLE_XAUTH
++		char temp[256];
++		sprintf(temp,"/var/run/lxdm/lxdm-:%d.auth",s->display);
++		setenv("XAUTHORITY",temp,1);
++		#endif
+ 		ui_prepare();
+ 		lxsession_set_active(s);
+ 	}
diff --git a/pcr/lxdm-consolekit/lxdm.install b/pcr/lxdm-consolekit/lxdm.install
index 2a212a573..c07e7c6ca 100644
--- a/pcr/lxdm-consolekit/lxdm.install
+++ b/pcr/lxdm-consolekit/lxdm.install
@@ -1,11 +1,10 @@
 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
+    usermod -L -c 'Lightweight X11 Display Manager' -d /var/lib/lxdm -s /sbin/nologin lxdm > /dev/null 2>&1 || \
+    useradd -rM -c 'Lightweight X11 Display Manager' -d /var/lib/lxdm -s /sbin/nologin lxdm
+  mkdir -p /var/lib/lxdm
+  chown lxdm:lxdm /var/lib/lxdm
+  chmod 700 /var/lib/lxdm
 }
 
 post_upgrade() {