Merge lp://qastaging/~compiz-team/compiz/build-fixes-part-1 into lp://qastaging/compiz/0.9.8
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~compiz-team/compiz/build-fixes-part-1 |
| Merge into: | lp://qastaging/compiz/0.9.8 |
| Diff against target: |
858 lines (+194/-127) 25 files modified
CMakeLists.txt (+1/-3) cmake/CompizPlugin.cmake (+6/-1) compizconfig/CMakeLists.txt (+4/-8) compizconfig/libcompizconfig/CMakeLists.txt (+4/-8) compizconfig/libcompizconfig/plugin/CMakeLists.txt (+0/-6) compizconfig/libcompizconfig/plugin/ccp.xml (+0/-7) compizconfig/libcompizconfig/src/CMakeLists.txt (+0/-1) compizconfig/libcompizconfig/src/compiz.cpp (+37/-19) compizconfig/libcompizconfig/src/config.c (+9/-3) compizconfig/libcompizconfig/src/ini.c (+13/-5) compizconfig/libcompizconfig/src/main.c (+36/-17) include/core/CMakeLists.txt (+0/-1) plugins/CMakeLists.txt (+1/-0) plugins/ccp/CMakeLists.txt (+1/-7) plugins/ccp/src/ccp.h (+0/-4) plugins/grid/tests/grabhandler/CMakeLists.txt (+1/-1) plugins/wall/CMakeLists.txt (+1/-0) plugins/wall/src/offset_movement/CMakeLists.txt (+3/-21) plugins/wall/src/offset_movement/tests/CMakeLists.txt (+1/-10) src/CMakeLists.txt (+5/-2) src/option/tests/CMakeLists.txt (+1/-0) src/plugin/CMakeLists.txt (+1/-0) src/privatescreen/tests/CMakeLists.txt (+1/-0) src/region/CMakeLists.txt (+64/-0) src/region/tests/CMakeLists.txt (+4/-3) |
| To merge this branch: | bzr merge lp://qastaging/~compiz-team/compiz/build-fixes-part-1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel van Vugt | Needs Fixing | ||
| compiz packagers | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2012-05-20.
Description of the change
Testers should really test the last item in the branch pipeline lp:~compiz-team/compiz/build-fixes-part-10-animationaddon-plugin
This branch fixes the "random build failure" due to missing dependencies. The problem was that an external plugin was linking libcompiz_core internally and would cause libcompiz_core to get rebuilt with the wrong header files. Since that plugin didn't actually need all of the functionality in libcompiz_core, the region calculation functions were separated out into a separate static library and this was linked instead.
This branch also removes the dependency on core.h in compizconfig. All it was pulling it was MAXSHORT / MINSHORT which is far better expressed as std::numeric_limits <short>::max () and std::numeric_limits <short>::min ()
Moved the ccp plugin to plugins/ so that we don't have to repeat a bunch of build rules for internal building
Also fixed some warnings -> -Werror -> errors related to asprintf usage
Unmerged revisions
- 3203. By Sam Spilsbury
-
Merge first part of build fixes
I spy code changes not related to the above description. Please review and remove the unrelated changes.