[arch-commits] Commit in lxdm/trunk (PKGBUILD git-fixes.patch)

[Balló György]

    Date: Sunday, February 21, 2016 @ 12:11:34
  Author: bgyorgy
Revision: 162998

upgpkg: lxdm 0.5.3-2

Apply fixes from git (FS#48274)

Added:
  lxdm/trunk/git-fixes.patch
Modified:
  lxdm/trunk/PKGBUILD

-----------------+
 PKGBUILD        |    7 ++++-
 git-fixes.patch |   71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-21 11:08:12 UTC (rev 162997)
+++ PKGBUILD	2016-02-21 11:11:34 UTC (rev 162998)
@@ -7,7 +7,7 @@
 pkgbase=lxdm
 pkgname=(lxdm lxdm-gtk3)
 pkgver=0.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight X11 Display Manager'
 arch=('i686' 'x86_64')
 url="http://lxde.org/"
@@ -21,10 +21,12 @@
         'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin'
         'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown')
 source=(http://downloads.sourceforge.net/lxde/$pkgbase-$pkgver.tar.xz
+        git-fixes.patch
         default-config.patch
         lxdm.pam
         Xsession)
 md5sums=('061caae432634e6db38bbdc84bc6ffa0'
+         '007fc1b0ea74500ffb0817a2fa2c76e8'
          'fb2fb99acb11b6dfdb8d5fd72605b8da'
          'c941ef896248bc7c03901b513490425c'
          '6ff73570368501a06ee7badc8e415d0a')
@@ -32,6 +34,9 @@
 prepare(){
   cd $pkgbase-$pkgver
 
+  # Apply fixes from git
+  patch -Np1 -i ../git-fixes.patch
+
   # Adjust Arch-specific settings
   patch -Np1 -i ../default-config.patch
 

Added: git-fixes.patch
===================================================================
--- git-fixes.patch	                        (rev 0)
+++ git-fixes.patch	2016-02-21 11:11:34 UTC (rev 162998)
@@ -0,0 +1,71 @@
+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..e00d219 100644
+--- a/src/lxdm.c
++++ b/src/lxdm.c
+@@ -750,7 +750,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 +962,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);
+ 	}