Fix build warnings

Revert two qemu fixes. They were applied to qemu only, and not qemu-native. However, quilt apply fails, so they require a fix. Will be brought back when ready.

At the same time fix wrong patch for the tiff CVE fix and improve the CVE line syntax in the patch file.