Tweak the wxWidgets patches so that they apply cleanly to Makefile.in Closes: #34963 [via git-merge-pr]