Unable to compile on latest Raspbian

[ZanderBrown]

Compiling on latest Raspbian Jessie fails like so

  CC       shell-helper.lo
shell-helper.c: In function 'configure_surface':
shell-helper.c:74:40: error: 'struct weston_surface' has no member named 'committed_private'
  struct weston_view *existing_view = es->committed_private;
                                        ^
shell-helper.c: In function 'shell_helper_add_surface_to_layer':
shell-helper.c:100:17: error: 'struct weston_surface' has no member named 'committed'
  if (new_surface->committed) {
                 ^
shell-helper.c:115:13: error: 'struct weston_surface' has no member named 'committed'
  new_surface->committed = configure_surface;
             ^
shell-helper.c:116:13: error: 'struct weston_surface' has no member named 'committed_private'
  new_surface->committed_private = existing_view;
             ^
shell-helper.c: In function 'configure_panel':
shell-helper.c:123:34: error: 'struct weston_surface' has no member named 'committed_private'
  struct shell_helper *helper = es->committed_private;
                                  ^
shell-helper.c: In function 'shell_helper_set_panel':
shell-helper.c:150:9: error: 'struct weston_surface' has no member named 'committed'
  surface->committed(surface, 0, 0);
         ^
shell-helper.c:158:9: error: 'struct weston_surface' has no member named 'committed'
  surface->committed = configure_panel;
         ^
shell-helper.c:159:9: error: 'struct weston_surface' has no member named 'committed_private'
  surface->committed_private = helper;

I'm assuming there has been an API change in libweston?

[ZanderBrown]

Okay so git reset & git pull seemed to clear that up but now through everyone favourite debug technique (strategic g_debug statements everywhere) maynard crashes at weston_desktop_shell_set_grab_surface(desktop->wshell, curtain->surface);
Replacing it with desktop_shell_set_grab_surface(desktop->shell, curtain->surface); allows maynard to run but the window switcher fails to open & menu positioning is way off.