wok-next diff lxdm/stuff/patches/git-fixes.patch @ rev 19856

Up dbus, lxdm, slitaz-configs, syslinux-slitaz-repack; add slitaz-next with all the Next-related hotfixes.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Thu Sep 07 15:25:51 2017 +0300 (2017-09-07)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/lxdm/stuff/patches/git-fixes.patch	Thu Sep 07 15:25:51 2017 +0300
     1.3 @@ -0,0 +1,93 @@
     1.4 +diff --git a/data/themes/Industrial/gtk.css b/data/themes/Industrial/gtk.css
     1.5 +index 179f0d6..f8e6432 100644
     1.6 +--- a/data/themes/Industrial/gtk.css
     1.7 ++++ b/data/themes/Industrial/gtk.css
     1.8 +@@ -17,6 +17,7 @@
     1.9 + 	color: #000000;
    1.10 + }
    1.11 + 
    1.12 ++#bottom_pane label,
    1.13 + #bottom_pane GtkLabel {
    1.14 + 	font: Sans 12;
    1.15 + 	color: #9E9D9B;
    1.16 +diff --git a/src/greeter-gdk.c b/src/greeter-gdk.c
    1.17 +index 1abbefa..ad3267a 100644
    1.18 +--- a/src/greeter-gdk.c
    1.19 ++++ b/src/greeter-gdk.c
    1.20 +@@ -22,6 +22,7 @@
    1.21 + 
    1.22 + #define XLIB_ILLEGAL_ACCESS
    1.23 + 
    1.24 ++#include <gtk/gtk.h>
    1.25 + #include <gdk/gdk.h>
    1.26 + #include <gdk/gdkx.h>
    1.27 + #include <gdk/gdkkeysyms.h>
    1.28 +@@ -88,12 +89,14 @@ static void on_ui_expose(void)
    1.29 + 	}
    1.30 + 	
    1.31 + 	cr=gdk_cairo_create(win);
    1.32 ++#if GTK_CHECK_VERSION(3,0,0)
    1.33 + 	cairo_pattern_t *pattern=gdk_window_get_background_pattern(win);
    1.34 + 	if(pattern)
    1.35 + 	{
    1.36 + 		cairo_set_source(cr,pattern);
    1.37 + 		cairo_paint(cr);
    1.38 + 	}
    1.39 ++#endif
    1.40 + 
    1.41 + 	gdk_cairo_set_source_color(cr, &bg);
    1.42 + 	cairo_rectangle(cr, rc.x, rc.y, rc.width, rc.height);
    1.43 +diff --git a/src/greeter.c b/src/greeter.c
    1.44 +index 10b7f3f..03503b6 100644
    1.45 +--- a/src/greeter.c
    1.46 ++++ b/src/greeter.c
    1.47 +@@ -146,7 +146,7 @@ static void switch_to_input_user(void)
    1.48 + 		if(user_list_scrolled)
    1.49 + 			gtk_widget_show(user_list_scrolled);
    1.50 + 		else
    1.51 +-			gtk_widget_hide(user_list);
    1.52 ++			gtk_widget_show(user_list);
    1.53 + 		gtk_widget_grab_focus(user_list);
    1.54 + 	}
    1.55 + 	else
    1.56 +diff --git a/src/lxdm.c b/src/lxdm.c
    1.57 +index a37f051..722936f 100644
    1.58 +--- a/src/lxdm.c
    1.59 ++++ b/src/lxdm.c
    1.60 +@@ -488,6 +490,9 @@ static char *lxsession_xserver_command(LXSession *s)
    1.61 + 	{
    1.62 + 		arg[arc++] = g_strdup("-nolisten");
    1.63 + 		arg[arc++] = g_strdup("tcp");
    1.64 ++	} else {
    1.65 ++		arg[arc++] = g_strdup("-listen");
    1.66 ++		arg[arc++] = g_strdup("tcp");
    1.67 + 	}
    1.68 + 	if(!novtswitch)
    1.69 + 	{
    1.70 +@@ -750,7 +755,13 @@ static char ** create_client_auth(struct passwd *pw,char **env)
    1.71 + 	if(xauth_write_file(authfile,s->display,s->mcookie)==-1)
    1.72 + 	{
    1.73 + 		g_free(authfile);
    1.74 +-		authfile = g_strdup_printf("/var/run/lxdm/.Xauth%d",pw->pw_uid);
    1.75 ++
    1.76 ++		gchar *authdir = g_strdup_printf("/var/run/lxdm/%d", pw->pw_uid);
    1.77 ++		g_mkdir_with_parents(authdir, S_IRWXU);
    1.78 ++		chown(authdir, pw->pw_uid, pw->pw_gid);
    1.79 ++
    1.80 ++		authfile = g_strdup_printf("%s/.Xauthority", authdir);
    1.81 ++		g_free(authdir);
    1.82 + 		remove(authfile);
    1.83 + 		xauth_write_file(authfile,s->display,s->mcookie);
    1.84 + 	}
    1.85 +@@ -956,6 +967,11 @@ static void on_xserver_stop(void *data,int pid, int status)
    1.86 + 		s->dpy=NULL;
    1.87 + 		ui_drop();
    1.88 + 		lxdm_startx(s);
    1.89 ++		#ifndef DISABLE_XAUTH
    1.90 ++		char temp[256];
    1.91 ++		sprintf(temp,"/var/run/lxdm/lxdm-:%d.auth",s->display);
    1.92 ++		setenv("XAUTHORITY",temp,1);
    1.93 ++		#endif
    1.94 + 		ui_prepare();
    1.95 + 		lxsession_set_active(s);
    1.96 + 	}