Page MenuHomeFreeBSD

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

Authored by manu on Apr 9 2024, 3:31 PM.
Referenced Files
Unknown Object (File)
Mon, Jul 1, 12:46 AM
Unknown Object (File)
Sun, Jun 23, 7:16 AM
Unknown Object (File)
Jun 11 2024, 4:28 AM
Unknown Object (File)
Jun 10 2024, 9:46 PM
Unknown Object (File)
May 29 2024, 4:24 AM
Unknown Object (File)
May 27 2024, 12:05 AM
Unknown Object (File)
May 23 2024, 4:36 PM
Unknown Object (File)
May 17 2024, 11:22 AM



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

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

Lint Skipped
Tests Skipped
Build Status
Buildable 56989
Build 53877: arc lint + arc unit