gtk+3: move some more files to -demo; move dbus-x11 rdep to the x11 build option.