I have included portions of this in the upstream MR: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1875
The first line too long fix cannot be applied upstream as the upstream source substitutes the font path at build time, so it doesn't appear expanded as it does in this patch. The second line too long issue was already handled by a previous commit in this MR. -- -Alan Coopersmith- alan.coopersm...@oracle.com Oracle Solaris Engineering - https://blogs.oracle.com/solaris