Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 4 Feb 2019 11:52:13 +0000 (UTC)
From:      Ben Woods <woodsb02@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r492117 - in head/x11/lightdm: . files
Message-ID:  <201902041152.x14BqDFC080906@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: woodsb02
Date: Mon Feb  4 11:52:12 2019
New Revision: 492117
URL: https://svnweb.freebsd.org/changeset/ports/492117

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

Added:
  head/x11/lightdm/files/patch-src_x-server-local.c   (contents, props changed)
Modified:
  head/x11/lightdm/Makefile

Modified: head/x11/lightdm/Makefile
==============================================================================
--- head/x11/lightdm/Makefile	Mon Feb  4 11:49:35 2019	(r492116)
+++ head/x11/lightdm/Makefile	Mon Feb  4 11:52:12 2019	(r492117)
@@ -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}/
 

Added: head/x11/lightdm/files/patch-src_x-server-local.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/lightdm/files/patch-src_x-server-local.c	Mon Feb  4 11:52:12 2019	(r492117)
@@ -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)

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902041152.x14BqDFC080906>