diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2015-10-21 08:38:54 +1300 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2015-10-21 08:38:54 +1300 |
commit | ac3ca9ff21f1837081d2368e3d10f31b2280d425 (patch) | |
tree | 15a9375f3aedd0c3ee47f64025fd6c87c444ea29 /debian | |
parent | c4672bcc43ffbe5938681a6480a6abf58d034f66 (diff) | |
download | lightdm-ac3ca9ff21f1837081d2368e3d10f31b2280d425.tar.gz |
Refresh patches
Diffstat (limited to 'debian')
-rw-r--r-- | debian/patches/04_language_handling.patch | 2 | ||||
-rw-r--r-- | debian/patches/autologin-session-workaround.patch | 2 | ||||
-rw-r--r-- | debian/patches/xorg-1.17.patch | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch index 09d56244..f9d86855 100644 --- a/debian/patches/04_language_handling.patch +++ b/debian/patches/04_language_handling.patch @@ -75,7 +75,7 @@ Index: trunk/src/seat.c =================================================================== --- trunk.orig/src/seat.c +++ trunk/src/seat.c -@@ -1003,7 +1003,7 @@ configure_session (Session *session, Ses +@@ -1006,7 +1006,7 @@ configure_session (Session *session, Ses } if (language && language[0] != '\0') { diff --git a/debian/patches/autologin-session-workaround.patch b/debian/patches/autologin-session-workaround.patch index 1d977d7b..cede85de 100644 --- a/debian/patches/autologin-session-workaround.patch +++ b/debian/patches/autologin-session-workaround.patch @@ -6,7 +6,7 @@ Index: trunk/src/seat.c =================================================================== --- trunk.orig/src/seat.c +++ trunk/src/seat.c -@@ -1033,7 +1033,12 @@ create_user_session (Seat *seat, const g +@@ -1036,7 +1036,12 @@ create_user_session (Seat *seat, const g if (autostart) { const gchar *autologin_session_name = seat_get_string_property (seat, "autologin-session"); diff --git a/debian/patches/xorg-1.17.patch b/debian/patches/xorg-1.17.patch index 9f7ecfd2..0db6cc88 100644 --- a/debian/patches/xorg-1.17.patch +++ b/debian/patches/xorg-1.17.patch @@ -3,11 +3,11 @@ Author: Robert Ancell <robert.ancell@canonical.com> Bug: https://bugs.launchpad.net/bugs/1449282 === modified file 'src/x-server-local.c' -Index: 1.16/src/x-server-local.c +Index: trunk/src/x-server-local.c =================================================================== ---- 1.16.orig/src/x-server-local.c -+++ 1.16/src/x-server-local.c -@@ -477,6 +477,7 @@ x_server_local_start (DisplayServer *dis +--- trunk.orig/src/x-server-local.c ++++ trunk/src/x-server-local.c +@@ -534,6 +534,7 @@ x_server_local_start (DisplayServer *dis /* Connect to a remote server using XDMCP */ if (server->priv->xdmcp_server != NULL) { @@ -15,9 +15,9 @@ Index: 1.16/src/x-server-local.c if (server->priv->xdmcp_port != 0) g_string_append_printf (command, " -port %d", server->priv->xdmcp_port); g_string_append_printf (command, " -query %s", server->priv->xdmcp_server); -@@ -485,6 +486,8 @@ x_server_local_start (DisplayServer *dis +@@ -547,6 +548,8 @@ x_server_local_start (DisplayServer *dis } - else if (!server->priv->allow_tcp) + else g_string_append (command, " -nolisten tcp"); + else + g_string_append (command, " -listen tcp"); |