diff options
author | woodsb02 <woodsb02@FreeBSD.org> | 2019-02-04 19:52:12 +0800 |
---|---|---|
committer | woodsb02 <woodsb02@FreeBSD.org> | 2019-02-04 19:52:12 +0800 |
commit | 3a8db55579d8724384a4ae8dae248374aebb33ea (patch) | |
tree | 740eed50daaf5562b03ae7643004f94a1ac2030b | |
parent | b474aecc5bab7fee421f6115bd7853453145fe85 (diff) | |
download | freebsd-ports-gnome-3a8db55579d8724384a4ae8dae248374aebb33ea.tar.gz freebsd-ports-gnome-3a8db55579d8724384a4ae8dae248374aebb33ea.tar.zst freebsd-ports-gnome-3a8db55579d8724384a4ae8dae248374aebb33ea.zip |
x11/lightdm: Re-add patch accidentally deleted during last change
-rw-r--r-- | x11/lightdm/Makefile | 1 | ||||
-rw-r--r-- | x11/lightdm/files/patch-src_x-server-local.c | 24 |
2 files changed, 25 insertions, 0 deletions
diff --git a/x11/lightdm/Makefile b/x11/lightdm/Makefile index 9a517153aea5..fece8ca18e34 100644 --- a/x11/lightdm/Makefile +++ b/x11/lightdm/Makefile @@ -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}/ diff --git a/x11/lightdm/files/patch-src_x-server-local.c b/x11/lightdm/files/patch-src_x-server-local.c new file mode 100644 index 000000000000..94a59c432c92 --- /dev/null +++ b/x11/lightdm/files/patch-src_x-server-local.c @@ -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) |