Here's my re-diffed version of your patch, plus an entry for HAVE_GTK in
src/config.in: