emulators/qemu-user-static-devel: Fix build on 12 and 13

The last update broke the build on FreeBSD 12 and 13. This fixes that
with the upstreamed fix. It also moves to a slightly newer upstream
version and resolves a number of accumulated conflicts.