mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-10 07:04:03 +00:00
Code Issues Releases Activity

x11/sddm: Enhance Backend.cpp patch to take into account not only /etc/login.conf

Browse Source 
but also ~/.login_conf file.

PR:		241519
Submitted by:	Martin Birgmeier <d8zNeCFG@aon.at>
This commit is contained in:
Gleb Popov 2020-02-20 13:50:01 +00:00
parent a1be0e50d0
commit b178b6cdbe
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=526571
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
x11/sddm/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= sddm
PORTVERSION= 0.18.1
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= kde@FreeBSD.org

13
x11/sddm/files/patch-src_helper_Backend.cpp
View File

@ -1,5 +1,5 @@
--- src/helper/Backend.cpp.orig 2019-03-13 09:22:35 UTC
+++ src/helper/Backend.cpp
--- src/helper/Backend.cpp.orig 2019-03-13 10:22:35.000000000 +0100
+++ src/helper/Backend.cpp 2020-02-16 16:39:53.134892000 +0100
@@ -29,6 +29,10 @@
#include <QtCore/QProcessEnvironment>
@ -11,7 +11,7 @@
namespace SDDM {
Backend::Backend(HelperApp* parent)
@@ -70,6 +74,19 @@ namespace SDDM {
@@ -70,6 +74,26 @@
.arg(mainConfig.X11.UserAuthFile.get());
env.insert(QStringLiteral("XAUTHORITY"), value);
}
@ -24,6 +24,13 @@
+ if ((lc = login_getpwclass(pw)) != 0) {
+ setclassenvironment(lc, pw, 1); /* path variables */
+ setclassenvironment(lc, pw, 0); /* non-path variables */
+ login_close(lc);
+ if ((lc = login_getuserclass(pw)) != NULL) {
+ setclassenvironment(lc, pw, 1);
+ setclassenvironment(lc, pw, 0);
+ }
+ if (lc != NULL)
+ login_close(lc);
+ /* copy all environment variables that are now set */
+ env.insert(QProcessEnvironment::systemEnvironment());
+ }