QtMir

Merge lp://staging/~nick-dedekind/qtmir/persistent_surface_id into lp://staging/qtmir

  1. persistent_surface_id
  2. Merge into trunk
Proposed by Nick Dedekind
Status: Superseded
Proposed branch: lp://staging/~nick-dedekind/qtmir/persistent_surface_id
Merge into: lp://staging/qtmir
Prerequisite: lp://staging/~mir-team/qtmir/mir-0.24-compatibility
Diff against target: 514 lines (+132/-27)
17 files modified
CMakeLists.txt (+1/-1)
debian/control (+2/-2)
debian/gles-patches/convert-to-gles.patch (+7/-7)
src/modules/Unity/Application/mirsurface.cpp (+10/-3)
src/modules/Unity/Application/mirsurface.h (+4/-0)
src/modules/Unity/Application/mirsurfacemanager.cpp (+16/-2)
src/modules/Unity/Application/mirsurfacemanager.h (+6/-1)
src/platforms/mirserver/mirserver.h (+1/-0)
tests/framework/CMakeLists.txt (+1/-0)
tests/framework/fake_mirsurface.cpp (+2/-0)
tests/framework/fake_mirsurface.h (+1/-0)
tests/framework/mock_persistent_surface_store.cpp (+30/-0)
tests/framework/mock_persistent_surface_store.h (+24/-0)
tests/framework/qtmir_test.cpp (+18/-5)
tests/framework/qtmir_test.h (+3/-0)
tests/modules/SurfaceManager/mirsurface_test.cpp (+4/-4)
tests/modules/SurfaceManager/mirsurfaceitem_test.cpp (+2/-2)
To merge this branch: bzr merge lp://staging/~nick-dedekind/qtmir/persistent_surface_id
Reviewer Review Type Date Requested Status
Daniel d'Andrada (community) Needs Fixing
Unity8 CI Bot (community) continuous-integration Needs Fixing
Review via email: mp+297293@code.staging.launchpad.net

This proposal supersedes a proposal from 2016-06-09.

This proposal has been superseded by a proposal from 2016-08-22.

Commit message

Added implementation for MirSurfaceInterface::persistentId

Description of the change

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~unity-team/unity-api/persistent_surface_id/+merge/303552
https://code.launchpad.net/~nick-dedekind/unity8/persistent_surface_id/+merge/296994

 * Did you perform an exploratory manual test run of your code change and any related functionality?
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Requires mir 0.24

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:506
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/273/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/1942/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1968
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1902
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1902
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1902
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1893/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1893/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1893/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1893/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1893/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1893/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1893/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1893/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1893/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/273/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:507
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/274/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/1952/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1978
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1912
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1912
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1912
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1903/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1903/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1903/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1903/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1903/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1903/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1903/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1903/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1903/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/274/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote : Posted in a previous version of this proposal

Shouldn't you bump the required mir version to something higher than 0.22 as the needed API will land only in a later version?

review: Needs Information
Revision history for this message
Daniel d'Andrada (dandrader) wrote : Posted in a previous version of this proposal

/home/dandrader/qtmir/persistent_surface_id/src/platforms/mirserver/screen.cpp:218:59: error: 'const Width {aka const class mir::geometry::detail::IntWrapper<mir::geometry::WidthTag>}' has no member named 'as_float'
/home/dandrader/qtmir/persistent_surface_id/src/platforms/mirserver/screen.cpp:219:61: error: 'const Height {aka const class mir::geometry::detail::IntWrapper<mir::geometry::HeightTag>}' has no member named 'as_float'

/home/dandrader/qtmir/persistent_surface_id/tests/framework/qtmir_test.cpp:168:92: required from here
/usr/include/c++/5/ext/new_allocator.h:120:4: error: invalid new-expression of abstract class type 'mir::scene::MockSession'

Getting some build failures. Maybe it needs to have some "mir-0.23 compatibility branch" as prereq...

Revision history for this message
Nick Dedekind (nick-dedekind) wrote : Posted in a previous version of this proposal

> /home/dandrader/qtmir/persistent_surface_id/src/platforms/mirserver/screen.cpp
> :218:59: error: 'const Width {aka const class
> mir::geometry::detail::IntWrapper<mir::geometry::WidthTag>}' has no member
> named 'as_float'
> /home/dandrader/qtmir/persistent_surface_id/src/platforms/mirserver/screen.cpp
> :219:61: error: 'const Height {aka const class
> mir::geometry::detail::IntWrapper<mir::geometry::HeightTag>}' has no member
> named 'as_float'
>
> /home/dandrader/qtmir/persistent_surface_id/tests/framework/qtmir_test.cpp:168
> :92: required from here
> /usr/include/c++/5/ext/new_allocator.h:120:4: error: invalid new-expression of
> abstract class type 'mir::scene::MockSession'
>
> Getting some build failures. Maybe it needs to have some "mir-0.23
> compatibility branch" as prereq...

You building against trunk (aka 0.24)?

Revision history for this message
Nick Dedekind (nick-dedekind) wrote : Posted in a previous version of this proposal

> >
> /home/dandrader/qtmir/persistent_surface_id/src/platforms/mirserver/screen.cpp
> > :218:59: error: 'const Width {aka const class
> > mir::geometry::detail::IntWrapper<mir::geometry::WidthTag>}' has no member
> > named 'as_float'
> >
> /home/dandrader/qtmir/persistent_surface_id/src/platforms/mirserver/screen.cpp
> > :219:61: error: 'const Height {aka const class
> > mir::geometry::detail::IntWrapper<mir::geometry::HeightTag>}' has no member
> > named 'as_float'
> >
> >
> /home/dandrader/qtmir/persistent_surface_id/tests/framework/qtmir_test.cpp:168
> > :92: required from here
> > /usr/include/c++/5/ext/new_allocator.h:120:4: error: invalid new-expression
> of
> > abstract class type 'mir::scene::MockSession'
> >
> > Getting some build failures. Maybe it needs to have some "mir-0.23
> > compatibility branch" as prereq...
>
> You building against trunk (aka 0.24)?

Right, you're building against the prereq mir branch i guess. There's a compatibility branch for mir 0.24 which I've added (lp:~mir-team/qtmir/mir-0.24-compatibility). I need to resubmit this proposal with it as a prereq.

Revision history for this message
Daniel d'Andrada (dandrader) wrote : Posted in a previous version of this proposal

On 13/06/2016 11:20, Nick Dedekind wrote:
> Right, you're building against the prereq mir branch i guess. There's a compatibility branch for mir 0.24 which I've added (lp:~mir-team/qtmir/mir-0.24-compatibility). I need to resubmit this proposal with it as a prereq.

I thought mir trunk would be 0.23, but ok.

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:507
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/275/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/1958/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1984
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1918
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1918
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1918
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1909/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/275/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

Annoyingly the changelog for mir/trunk hasn't been updated to 0.24 yet. So I need to wait until then before updating the mir requirement or it won't build.

lp://staging/~nick-dedekind/qtmir/persistent_surface_id updated
508. By Nick Dedekind

merged with parent

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:508
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/276/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/1960/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1986
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1920
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1920
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1920
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1911/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1911/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1911/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1911/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1911/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1911/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1911/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1911/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1911/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/276/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

silo 036 is about to land and it has lp:~kdub/qtmir/0.24-compatibility

Please rebase this branch on top of it as there are many conflicts.

review: Needs Fixing

Unmerged revisions

508. By Nick Dedekind

merged with parent

507. By Nick Dedekind

removed persistentId from log

506. By Nick Dedekind

gles

505. By Nick Dedekind

persistentId

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches