xbps: fix merged patch from master (v2).