[wxsvg/f25] (5 commits) ...Fix build