hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-29 02:31:18 +00:00
Code Issues Projects Releases Wiki Activity

os: Fix builds with -Dxdmcp=false
Some checks are pending
Build X servers / xserver-build-ubuntu (push) Waiting to run
Details
Build X servers / drivers-build-ubuntu (push) Waiting to run
Details
Build X servers / xserver-build-mingw32-ubuntu (push) Waiting to run
Details
Build X servers / xserver-build-macos (push) Waiting to run
Details
Build X servers / xserver-build-freebsd (push) Waiting to run
Details
Build X servers / xserver-build-dragonflybsd (push) Waiting to run
Details
Build X servers / Release pushed tag (push) Blocked by required conditions
Details
check PRs for merge conflicts / notify (push) Waiting to run
Details
delete old workflow runs / delete_old_workflow_runs (push) Waiting to run
Details
delete old workflow runs / purge_deleted_branch_workflows (push) Waiting to run
Details

Browse source 
Fixes: https://github.com/X11Libre/xserver/issues/239
Signed-off-by: stefan11111 <stefan11111@shitposting.expert>
This commit is contained in:
stefan11111 2025-09-20 13:45:06 +03:00 • committed by Enrico Weigelt
commit 5943ca5a1d
8 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/meson.build
View file

@ -243,7 +243,7 @@ conf_data.set('XACE', '1')
conf_data.set('XCMISC', '1')
conf_data.set('XCSECURITY', build_xsecurity ? '1' : false)
conf_data.set('CONFIG_NAMESPACE', build_namespace ? '1' : false)
conf_data.set('XDMCP', xdmcp_dep.found() ? '1' : false)
conf_data.set('XDMCP', build_xdmcp ? '1' : false)
conf_data.set('XF86BIGFONT', build_xf86bigfont ? '1' : false)
conf_data.set('XF86DRI', build_dri1 ? '1' : false)
conf_data.set('XF86VIDMODE', 1)

6
meson.build
View file

@ -427,10 +427,8 @@ else
endif
endif
xdmcp_dep = dependency('', required : false)
if get_option('xdmcp')
xdmcp_dep = dependency('xdmcp')
endif
build_xdmcp = get_option('xdmcp')
xdmcp_dep = dependency('xdmcp', required : build_xdmcp)
has_xdm_auth = get_option('xdm-auth-1')

3
os/access.c
View file

@ -180,7 +180,10 @@ SOFTWARE.
#include "dixstruct.h"
#include "xace.h"
#ifdef XDMCP
#include "xdmcp.h"
#endif
Bool defeatAccessControl = FALSE;

3
os/auth.c
View file

@ -48,7 +48,10 @@ from The Open Group.
#include "os/auth.h"
#ifdef XDMCP
#include "xdmcp.h"
#endif
#include "xdmauth.h"
#include "mitauth.h"

2
os/connection.c
View file

@ -115,7 +115,9 @@ SOFTWARE.
#include <systemd/sd-daemon.h>
#endif
#ifdef XDMCP
#include "xdmcp.h"
#endif
#define MAX_CONNECTIONS (1<<16)

2
os/meson.build
View file

@ -55,7 +55,7 @@ if conf_data.get('HAVE_SIGACTION').to_int() != 0
srcs_os += 'busfault.c'
endif
if get_option('xdmcp')
if build_xdmcp
srcs_os += 'xdmcp.c'
endif

4
os/utils.c
View file

@ -70,7 +70,11 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include "dixfont.h"
#include <X11/fonts/libxfont2.h>
#include "osdep.h"
#ifdef XDMCP
#include "xdmcp.h"
#endif
#include "extension.h"
#include <signal.h>
#ifndef WIN32

4
os/xdmauth.c
View file

@ -43,7 +43,11 @@ from The Open Group.
#include "os.h"
#include "osdep.h"
#ifdef XDMCP
#include "xdmcp.h"
#endif
#include "xdmauth.h"
#include "dixstruct.h"