fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-04-05 13:40:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'xdg-spec-change' into 'master'

Browse source 
Support `XDG Base Dir Spec 0.8`.

See merge request xorg/xserver!836
This commit is contained in:
Edênis Freindorfer 2025-12-07 06:32:36 -03:00
commit 5865635a10
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hw/xfree86/common/xf86Helper.c
View file

@ -1166,12 +1166,12 @@ xf86LogInit(void)
if (xf86LogFileFrom == X_DEFAULT) {
/* When not running as root, we won't be able to write to /var/log */
if (geteuid() != 0) {
if ((env = getenv("XDG_DATA_HOME")))
if ((env = getenv("XDG_STATE_HOME")))
snprintf(buf, sizeof(buf), "%s/%s", env,
DEFAULT_XDG_DATA_HOME_LOGDIR);
DEFAULT_XDG_STATE_HOME_LOGDIR);
else if ((env = getenv("HOME")))
snprintf(buf, sizeof(buf), "%s/%s/%s", env,
DEFAULT_XDG_DATA_HOME, DEFAULT_XDG_DATA_HOME_LOGDIR);
DEFAULT_XDG_STATE_HOME, DEFAULT_XDG_STATE_HOME_LOGDIR);
if (env) {
xf86_mkdir_p(buf);

2
hw/xfree86/man/Xorg.man
View file

@ -271,7 +271,7 @@ as the
server log file. The default log file when running as root is
.BI @logdir@/Xorg. n .log
and for non root it is
.BI $XDG_DATA_HOME/xorg/Xorg. n .log
.BI $XDG_STATE_HOME/xorg/Xorg. n .log
where
.I n
is the display number of the

2
hw/xfree86/man/xorg.conf.man
View file

@ -452,7 +452,7 @@ The default log file name when running as root is
.RE
and for non root it is
.RS 11
.RI $XDG_DATA_HOME/xorg/Xorg. <n> .log
.RI $XDG_STATE_HOME/xorg/Xorg. <n> .log
.RE
.PP
.RS 7

4
include/meson.build
View file

@ -372,8 +372,8 @@ xorg_data.set('XORG_VERSION_CURRENT', release)
xorg_data.set_quoted('XF86CONFIGFILE', 'xorg.conf')
xorg_data.set_quoted('XCONFIGFILE', 'xorg.conf')
xorg_data.set_quoted('XCONFIGDIR', 'xorg.conf.d')
xorg_data.set_quoted('DEFAULT_XDG_DATA_HOME', '.local/share')
xorg_data.set_quoted('DEFAULT_XDG_DATA_HOME_LOGDIR', 'xorg')
xorg_data.set_quoted('DEFAULT_XDG_STATE_HOME', '.local/state')
xorg_data.set_quoted('DEFAULT_XDG_STATE_HOME_LOGDIR', 'xorg')
xorg_data.set_quoted('DEFAULT_LOGDIR', log_dir)
xorg_data.set_quoted('DEFAULT_LOGPREFIX', 'Xorg.')
xorg_data.set_quoted('DEFAULT_MODULE_PATH', join_paths(get_option('prefix'), module_dir))

8
include/xorg-config.h.meson.in
View file

@ -51,11 +51,11 @@
/* Default logfile prefix */
#mesondefine DEFAULT_LOGPREFIX
/* Default XDG_DATA dir under HOME */
#mesondefine DEFAULT_XDG_DATA_HOME
/* Default XDG_STATE dir under HOME */
#mesondefine DEFAULT_XDG_STATE_HOME
/* Default log dir under XDG_DATA_HOME */
#mesondefine DEFAULT_XDG_DATA_HOME_LOGDIR
/* Default log dir under XDG_STATE_HOME */
#mesondefine DEFAULT_XDG_STATE_HOME_LOGDIR
/* Building DRI-capable DDX. */
#mesondefine XF86DRI