lp:compiz-core r2961 fails to build with glib 2.30 (seems to require 2.31)

The offending upstream bug in the glib headers:
https://bugzilla.gnome.org/show_bug.cgi?id=663880

And more build failures caused by
https://code.launchpad.net/~smspillaz/compiz-core/compiz-core.fix-880707-test-v3/+merge/89402

[ 96%] Building CXX object plugins/composite/tests/paintscheduler/CMakeFiles/compiz_paintscheduler_test.dir/test-paintscheduler.cpp.o
/home/dan/bzr/compiz-core/fix-921406/plugins/composite/tests/paintscheduler/test-paintscheduler.cpp:169:10: error: field ‘eventMutex’ has incomplete type
/home/dan/bzr/compiz-core/fix-921406/plugins/composite/tests/paintscheduler/test-paintscheduler.cpp:170:9: error: field ‘eventCondition’ has incomplete type
/home/dan/bzr/compiz-core/fix-921406/plugins/composite/tests/paintscheduler/test-paintscheduler.cpp: In static member function ‘static void DRMVBlankWaiter::vblankHandler(int, unsigned int, unsigned int, unsigned int, void*)’:
/home/dan/bzr/compiz-core/fix-921406/plugins/composite/tests/paintscheduler/test-paintscheduler.cpp:459:5: error: ‘class DRMVBlankWaiter’ has no member named ‘eventMutex’
/home/dan/bzr/compiz-core/fix-921406/plugins/composite/tests/paintscheduler/test-paintscheduler.cpp:464:5: error: ‘class DRMVBlankWaiter’ has no member named ‘eventCondition’
/home/dan/bzr/compiz-core/fix-921406/plugins/composite/tests/paintscheduler/test-paintscheduler.cpp:465:5: error: ‘class DRMVBlankWaiter’ has no member named ‘eventMutex’
/home/dan/bzr/compiz-core/fix-921406/plugins/composite/tests/paintscheduler/test-paintscheduler.cpp: In constructor ‘DRMVBlankWaiter::DRMVBlankWaiter(DummyPaintDispatch*, unsigned int)’:
/home/dan/bzr/compiz-core/fix-921406/plugins/composite/tests/paintscheduler/test-paintscheduler.cpp:509:20: error: ‘eventMutex’ was not declared in this scope
/home/dan/bzr/compiz-core/fix-921406/plugins/composite/tests/paintscheduler/test-paintscheduler.cpp:509:30: error: ‘g_mutex_init’ was not declared in this scope
/home/dan/bzr/compiz-core/fix-921406/plugins/composite/tests/paintscheduler/test-paintscheduler.cpp:510:20: error: ‘eventCondition’ was not declared in this scope
/home/dan/bzr/compiz-core/fix-921406/plugins/composite/tests/paintscheduler/test-paintscheduler.cpp:510:34: error: ‘g_cond_init’ was not declared in this scope
/home/dan/bzr/compiz-core/fix-921406/plugins/composite/tests/paintscheduler/test-paintscheduler.cpp:558:111: error: ‘g_thread_try_new’ was not declared in this scope
/home/dan/bzr/compiz-core/fix-921406/plugins/composite/tests/paintscheduler/test-paintscheduler.cpp: In member function ‘virtual bool DRMVBlankWaiter::waitVBlank()’:
/home/dan/bzr/compiz-core/fix-921406/plugins/composite/tests/paintscheduler/test-paintscheduler.cpp:609:5: error: ‘eventMutex’ was not declared in this scope
/home/dan/bzr/compiz-core/fix-921406/plugins/composite/tests/paintscheduler/test-paintscheduler.cpp:611:2: error: ‘eventCondition’ was not declared in this scope
make[2]: *** [plugins/composite/tests/paintscheduler/CMakeFiles/compiz_paintscheduler_test.dir/test-paintscheduler.cpp.o] Error 1
make[1]: *** [plugins/composite/tests/paintscheduler/CMakeFiles/compiz_paintscheduler_test.dir/all] Error 2
make: *** [all] Error 2