pool/gnome-session
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 181430 from GNOME:Factory

Browse Source 
- Fix gnome-session-kdm-support.patch: gcc 4.8 became stricter in
  the use of snprintf.

OBS-URL: https://build.opensuse.org/request/show/181430
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=136
This commit is contained in:
Stephan Kulow 2013-06-30 04:58:40 +00:00 committed by Git OBS Bridge
commit 126cd9b015
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnome-session-kdm-support.patch
View File

@ -104,7 +104,7 @@ Index: gnome-session-3.4.1/gnome-session/gdm.c
return FALSE; return FALSE;
} }
@@ -299,13 +304,76 @@ gdm_init_protocol_connection (GdmProtoco @@ -299,13 +304,78 @@ gdm_init_protocol_connection (GdmProtoco
if (!gdm_authenticate_connection (data)) { if (!gdm_authenticate_connection (data)) {
g_warning ("Failed to authenticate with GDM"); g_warning ("Failed to authenticate with GDM");
@ -123,6 +123,7 @@ Index: gnome-session-3.4.1/gnome-session/gdm.c
+ char *dm_display; + char *dm_display;
+ char *dm_control; + char *dm_control;
+ char *p0 = NULL; + char *p0 = NULL;
+ int width;
+ +
+ g_assert (data->fd <= 0); + g_assert (data->fd <= 0);
+ +
@ -150,8 +151,9 @@ Index: gnome-session-3.4.1/gnome-session/gdm.c
+ return FALSE; + return FALSE;
+ } + }
+ +
+ width = p0 ? p0 - dm_display : 512;
+ snprintf (addr.sun_path, sizeof (addr.sun_path), "%s/dmctl-%.*s/socket", + snprintf (addr.sun_path, sizeof (addr.sun_path), "%s/dmctl-%.*s/socket",
+ dm_control, p0 ? p0 - dm_display : 512, dm_display); + dm_control, width, dm_display);
+ addr.sun_family = AF_UNIX; + addr.sun_family = AF_UNIX;
+ +
+ g_free (dm_display); + g_free (dm_display);
@ -182,7 +184,7 @@ Index: gnome-session-3.4.1/gnome-session/gdm.c
static void static void
gdm_parse_query_response (GdmProtocolData *data, gdm_parse_query_response (GdmProtocolData *data,
const char *response) const char *response)
@@ -360,7 +428,23 @@ gdm_parse_query_response (GdmProtocolDat @@ -360,7 +430,23 @@ gdm_parse_query_response (GdmProtocolDat
} }
static void static void
@ -207,7 +209,7 @@ Index: gnome-session-3.4.1/gnome-session/gdm.c
{ {
time_t current_time; time_t current_time;
char *response; char *response;
@@ -373,26 +457,35 @@ gdm_update_logout_actions (GdmProtocolDa @@ -373,26 +459,35 @@ gdm_update_logout_actions (GdmProtocolDa
data->last_update = current_time; data->last_update = current_time;
@ -250,7 +252,7 @@ Index: gnome-session-3.4.1/gnome-session/gdm.c
return TRUE; return TRUE;
} }
@@ -400,7 +493,7 @@ gdm_is_available (void) @@ -400,7 +495,7 @@ gdm_is_available (void)
gboolean gboolean
gdm_supports_logout_action (GdmLogoutAction action) gdm_supports_logout_action (GdmLogoutAction action)
{ {
@ -259,7 +261,7 @@ Index: gnome-session-3.4.1/gnome-session/gdm.c
return (gdm_protocol_data.available_actions & action) != 0; return (gdm_protocol_data.available_actions & action) != 0;
} }
@@ -408,21 +501,15 @@ gdm_supports_logout_action (GdmLogoutAct @@ -408,21 +503,15 @@ gdm_supports_logout_action (GdmLogoutAct
GdmLogoutAction GdmLogoutAction
gdm_get_logout_action (void) gdm_get_logout_action (void)
{ {
@ -284,7 +286,7 @@ Index: gnome-session-3.4.1/gnome-session/gdm.c
switch (action) { switch (action) {
case GDM_LOGOUT_ACTION_NONE: case GDM_LOGOUT_ACTION_NONE:
@@ -439,16 +526,58 @@ gdm_set_logout_action (GdmLogoutAction a @@ -439,16 +528,58 @@ gdm_set_logout_action (GdmLogoutAction a
break; break;
} }
@ -346,7 +348,7 @@ Index: gnome-session-3.4.1/gnome-session/gdm.c
} }
void void
@@ -456,16 +585,16 @@ gdm_new_login (void) @@ -456,16 +587,16 @@ gdm_new_login (void)
{ {
char *response; char *response;

6
gnome-session.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 26 17:31:51 UTC 2013 - mgorse@suse.com
- Fix gnome-session-kdm-support.patch: gcc 4.8 became stricter in
the use of snprintf.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 15 14:10:24 UTC 2013 - dimstar@opensuse.org Wed May 15 14:10:24 UTC 2013 - dimstar@opensuse.org