xbps: add patch from git master to fix regression with pkg conflicts.