lp:~vanvugt/compiz/fix-1067598
- Get this branch:
- bzr branch lp:~vanvugt/compiz/fix-1067598
Branch merges
- PS Jenkins bot (community): Needs Fixing (continuous-integration)
- Brandon Schaefer (community): Approve
- Compiz Maintainers: Pending requested
-
Diff: 94 lines (+23/-5)5 files modifiedinclude/core/CMakeLists.txt (+1/-0)
include/core/option.h (+4/-3)
include/core/templates.h (+14/-0)
src/rect/include/core/rect.h (+2/-1)
src/region/include/core/region.h (+2/-1)
Related bugs
Bug #1067598: Unity fails to build due to explicit instantiation of templates in compiz. | Critical | Fix Released |
Related blueprints
Branch information
Recent revisions
- 3431. By Daniel van Vugt
-
Make core extern std templates compatible with C++0x projects like Unity.
(LP: #1067598) - 3430. By Daniel van Vugt
-
Restore cube transparency support for the top and bottom faces. It got
deleted as part of the GLES merge (r3320) in 0.9.8.0.
(LP: #1048272)
. Fixes: https://bugs.launchpad .net/bugs/ 1048272. Approved by Sam Spilsbury, PS Jenkins bot, MC Return. - 3428. By Daniel van Vugt
-
Ensure template instances relating to CompRect are only instantiated in core
and never in any plugin.
(LP: #1067219)
. Fixes: https://bugs.launchpad .net/bugs/ 1067219. Approved by Sam Spilsbury, PS Jenkins bot. - 3427. By Daniel van Vugt
-
Templates relating to CompRegion should only be instantiated in core and
never in any plugins.
(LP: #1067218)Note: This required removing -std=c++0x from the opengl plugin. That flag
was causing opengl to have slightly different symbol requirements to the
template instance in core. Not that it matters because -std=c++0x appears to
have been unused by opengl.
. Fixes: https://bugs.launchpad .net/bugs/ 1067218. Approved by Sam Spilsbury. - 3426. By Daniel van Vugt
-
Remove duplicate point.h (LP: #1067234)
I had to keep the copy in include/ rather than the one in src/ because it's
used by include/core/{window, screen} .h. Doing it the other way around caused
pain and complication.. Fixes: https://bugs.launchpad .net/bugs/ 1067234. Approved by . - 3425. By Sam Spilsbury
-
Don't write plugins-
with-set- keys every single time we read a schema, if
the value is already in plugins-with-set- keys. Added tests to demonstrate
behaviour.
(LP: #1064791)vanvugt says: This also seems to fix LP: #1044662, somehow.. Fixes: https:/
/bugs.launchpad .net/bugs/ 1064791. Approved by Daniel van Vugt. - 3424. By Sam Spilsbury
-
Remove redundant checks in Expo which could cause grid to be triggered in
expo. (LP: #1037142)We'd be checking for a condition that could never be true, as we pass
noOptions () to expoTerm. Better just to not have that check at all, since
it's useless in a post 0.8 world... Fixes: https:/
/bugs.launchpad .net/bugs/ 1037142. Approved by Daniel van Vugt. - 3423. By Daniel van Vugt
-
Templates related to the opengl plugin should only be instantiated in the
opengl plugin. Ensure users of opengl.h don't also get local copies
instantiated.
(LP: #1066795) (LP: #1066798). Fixes: https://bugs.launchpad .net/bugs/ 1066795, https:/ /bugs.launchpad .net/bugs/ 1066798. Approved by Sam Spilsbury.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:compiz/0.9.9