lp://qastaging/~compiz-team/compiz/compiz.fix_1120009.3.debug

Branch merges

Propose for merging

No branches dependent on this one.

Superseded for merging into lp://qastaging/compiz/0.9.9

MC Return: Pending requested 2013-02-14

Brandon Schaefer: Pending requested 2013-02-14

PS Jenkins bot: Pending (continuous-integration) requested 2013-02-14

Diff: 559 lines (+241/-122)

16 files modified

CMakeLists.txt (+35/-38)
cmake/CompizCommon.cmake (+1/-0)
cmake/FindGoogleTest.cmake (+46/-0)
cmake/FindXorgGTest.cmake (+43/-0)
cmake/GoogleTest.cmake (+20/-0)
cmake/XorgGTest.cmake (+14/-0)
debian/control (+3/-0)
debian/patches/series (+2/-2)
src/event.cpp (+4/-0)
src/screen.cpp (+8/-0)
src/window.cpp (+2/-0)
tests/system/xorg-gtest/CMakeLists.txt (+3/-31)
tests/system/xorg-gtest/tests/CMakeLists.txt (+2/-0)
tests/xorg-gtest/CMakeLists.txt (+49/-0)
tests/xorg-gtest/src/CMakeLists.txt (+0/-51)
tests/xorg-gtest/src/compiz-xorg-gtest.cpp (+9/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3562. By Sam Spilsbury on 2013-02-14

More debugging and disable problematic patches

3561. By Sam Spilsbury on 2013-02-13

Some debugging info

3560. By Sam Spilsbury on 2013-02-13

Check for the right xorg-gtest version

3559. By Sam Spilsbury on 2013-02-12

Move compiz-xorg-gtest to the right place

3558. By Sam Spilsbury on 2013-02-12

xserver-xorg-dev

3557. By Sam Spilsbury on 2013-02-12

Add the right dependencies and ensure we don't build any tests if COMPIZ_BUILD_TESTING is off

3556. By Sam Spilsbury on 2013-02-12

Merge lp:~compiz-team/compiz/compiz.fix_1120009.1

3555. By Sam Spilsbury on 2013-02-12

Clean up the Find Google Test and Xorg GTest logic, put them in their own cmake files
behind their own functions. Make it so that all users can see xorg-gtest and not just the users
in tests/

3554. By MC Return on 2013-01-10

Reintroduce the thumbnail (Window previews) plugin.
Just prevent building of thumbnail for GLES. It compiles and works for GL.
(LP: #1020825)

Also fixed transparency issues with glow and window-like-background by
adding calls to enable/disable GL_BLEND. Fixes: https://bugs.launchpad.net/bugs/1020825.

Approved by Daniel van Vugt.

3553. By Daniel van Vugt on 2013-01-10

Revert the opengl ABI bump. It was not required but actually causes Unity
to fail to start now (until someone rebuilds Unity).