x11/lightdm: Re-add patch accidentally deleted during last change

This commit is contained in:
Ben Woods 2019-02-04 11:52:12 +00:00
parent 97d5faf776
commit 95efea9e02
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=492117
2 changed files with 25 additions and 0 deletions

View file

@ -3,6 +3,7 @@
PORTNAME= lightdm
PORTVERSION= 1.28.0
PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= https://github.com/CanonicalLtd/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/

View file

@ -0,0 +1,24 @@
--- src/x-server-local.c.orig 2018-08-30 00:35:31 UTC
+++ src/x-server-local.c
@@ -530,17 +530,13 @@ x_server_local_start (DisplayServer *display_server)
}
}
- /* Pass through library variables */
- if (g_getenv ("LD_PRELOAD"))
- process_set_env (priv->x_server_process, "LD_PRELOAD", g_getenv ("LD_PRELOAD"));
- if (g_getenv ("LD_LIBRARY_PATH"))
- process_set_env (priv->x_server_process, "LD_LIBRARY_PATH", g_getenv ("LD_LIBRARY_PATH"));
- if (g_getenv ("PATH"))
- process_set_env (priv->x_server_process, "PATH", g_getenv ("PATH"));
-
/* Variable required for regression tests */
if (g_getenv ("LIGHTDM_TEST_ROOT"))
+ {
process_set_env (priv->x_server_process, "LIGHTDM_TEST_ROOT", g_getenv ("LIGHTDM_TEST_ROOT"));
+ process_set_env (priv->x_server_process, "LD_PRELOAD", g_getenv ("LD_PRELOAD"));
+ process_set_env (priv->x_server_process, "LD_LIBRARY_PATH", g_getenv ("LD_LIBRARY_PATH"));
+ }
gboolean result = process_start (priv->x_server_process, FALSE);
if (result)