diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2015-10-21 08:39:19 +1300 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2015-10-21 08:39:19 +1300 |
| commit | 575aa0c9325e68a60514cea949a40164e8c2670b (patch) | |
| tree | 5b6fbe3fba3fd8b2625bb59c093fe77a7f6fe484 | |
| parent | ac3ca9ff21f1837081d2368e3d10f31b2280d425 (diff) | |
| download | lightdm-575aa0c9325e68a60514cea949a40164e8c2670b.tar.gz | |
Drop debian/patches/xorg-1.17.patch - we now detect this
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/xorg-1.17.patch | 26 |
2 files changed, 0 insertions, 27 deletions
diff --git a/debian/patches/series b/debian/patches/series index 7f14c0ad..d3ba2550 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 04_language_handling.patch 05_translate_debian_files.patch autologin-session-workaround.patch -xorg-1.17.patch diff --git a/debian/patches/xorg-1.17.patch b/debian/patches/xorg-1.17.patch deleted file mode 100644 index 0db6cc88..00000000 --- a/debian/patches/xorg-1.17.patch +++ /dev/null @@ -1,26 +0,0 @@ -Description: The X.org X server 1.17 doesn't listen on TCP by default, we need to pass -listen to enable it -Author: Robert Ancell <robert.ancell@canonical.com> -Bug: https://bugs.launchpad.net/bugs/1449282 - -=== modified file 'src/x-server-local.c' -Index: trunk/src/x-server-local.c -=================================================================== ---- 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) - { -+ g_string_append (command, " -listen tcp"); - 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); -@@ -547,6 +548,8 @@ x_server_local_start (DisplayServer *dis - } - else - g_string_append (command, " -nolisten tcp"); -+ else -+ g_string_append (command, " -listen tcp"); - - if (server->priv->vt >= 0) - g_string_append_printf (command, " vt%d -novtswitch", server->priv->vt); |