Reverted last build fix Removed xorg-server-21.1.patch (cherry picked from commit 09de476e)
mentioned in merge request !78816 (closed)