libgpg-error: fix patch no longer applying, refactor