Revert an upstream commit to enable compiling without external glib2. Edit the 'disable UI compilation' patch to match the original upstream commit more closely. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
