gtkcombobox has been renamed to gtkcombobutton but not
all of the files that depend on it have been updated
and doesn't build from a fresh checkout.
The patch includes the changes necessary to use
gtkcombobutton instead of gtkcombobox and also includes
WANT_AUTOMAKE=1.7 in autogen.sh so it uses the correct
version of automake (at least on my box)