Page MenuHomeFreeBSD

x11-servers/xorg-server: Add upstream patch for xkbcomp directory
ClosedPublic

Authored by manu on Apr 9 2024, 3:31 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, May 10, 4:10 AM
Unknown Object (File)
Mon, May 6, 9:23 AM
Unknown Object (File)
Wed, May 1, 1:49 AM
Unknown Object (File)
Tue, Apr 30, 11:13 PM
Unknown Object (File)
Fri, Apr 26, 4:56 AM
Unknown Object (File)
Mon, Apr 15, 9:11 AM
Unknown Object (File)
Mon, Apr 15, 9:10 AM
Unknown Object (File)
Mon, Apr 15, 9:05 AM
Subscribers
None

Details

Summary

Add a patch commited upstream but not present in any releases (except
Xwayland ones) as xorg-server releases stopped a while ago. This adds
a fallback to use $XDG_RUNTIME_DIR for xkbcomp result file if the user
can't write to the configured directory, which is unlikely for xorg-server
as it's SUID but it is likely for xephyr or xvfb.
While here use the meson default for xkb_dir as it's the same as the one we
provide and use also the default for xkb_output_dir which defaults to
xkb_dir/compiled which is a link to /var/lib/xkb (setup by the xkeyboard-config
port).

Sponsored by: Beckhoff Automation GmbH & Co. KG

Test Plan

With the patch and using Xephyr :

access("/usr/local/share/X11/xkb/compiled/",X_OK|W_OK) ERR#13 'Permission denied'
access("/var/run/xdg/manu",X_OK|W_OK) = 0 (0x0)

Diff Detail

Repository
R11 FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable