Mir

Merge lp://qastaging/~mir-team/mir/backport-1355173.trust-prompt-suspend into lp://qastaging/mir/0.8

  1. backport-1355173.trust-prompt-suspend
  2. Merge into 0.8
Proposed by Cemil Azizoglu
Status: Merged
Approved by: Cemil Azizoglu
Approved revision: no longer in the source branch.
Merged at revision: 1966
Proposed branch: lp://qastaging/~mir-team/mir/backport-1355173.trust-prompt-suspend
Merge into: lp://qastaging/mir/0.8
Diff against target: 973 lines (+468/-71)
31 files modified
CMakeLists.txt (+1/-1)
client-ABI-sha1sums (+1/-1)
common-ABI-sha1sums (+1/-1)
debian/changelog (+16/-0)
debian/control (+2/-2)
debian/libmirserver26.1.install (+1/-1)
include/common/mir_toolkit/common.h (+2/-1)
include/server/mir/scene/prompt_session.h (+24/-0)
include/server/mir/scene/prompt_session_listener.h (+2/-0)
include/server/mir/scene/prompt_session_manager.h (+12/-0)
include/server/mir/scene/session.h (+2/-0)
platform-ABI-sha1sums (+1/-1)
server-ABI-sha1sums (+5/-5)
src/include/server/mir/scene/null_prompt_session_listener.h (+2/-0)
src/server/CMakeLists.txt (+1/-1)
src/server/scene/CMakeLists.txt (+1/-0)
src/server/scene/application_session.cpp (+18/-0)
src/server/scene/application_session.h (+2/-0)
src/server/scene/prompt_session_impl.cpp (+81/-0)
src/server/scene/prompt_session_impl.h (+50/-0)
src/server/scene/prompt_session_manager_impl.cpp (+22/-9)
src/server/scene/prompt_session_manager_impl.h (+6/-0)
tests/acceptance-tests/test_prompt_session_client_api.cpp (+55/-45)
tests/include/mir_test_doubles/mock_prompt_session_listener.h (+2/-0)
tests/include/mir_test_doubles/mock_scene_session.h (+2/-0)
tests/include/mir_test_doubles/null_prompt_session.h (+16/-0)
tests/include/mir_test_doubles/null_prompt_session_manager.h (+8/-0)
tests/include/mir_test_doubles/stub_scene_session.h (+8/-0)
tests/unit-tests/scene/CMakeLists.txt (+1/-0)
tests/unit-tests/scene/test_prompt_session_impl.cpp (+110/-0)
tests/unit-tests/scene/test_prompt_session_manager.cpp (+13/-3)
To merge this branch: bzr merge lp://qastaging/~mir-team/mir/backport-1355173.trust-prompt-suspend
Reviewer Review Type Date Requested Status
Cemil Azizoglu (community) Approve
Daniel van Vugt Abstain
Chris Halse Rogers Approve
Gerry Boland Pending
Nick Dedekind Pending
Review via email: mp+246024@code.qastaging.launchpad.net

Commit message

Backport of dednick's 1355173.trust-prompt-suspend branch into mir/0.8.
(LP: #1355173)

Description of the change

.

To post a comment you must log in.
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

TODO: Need to carefully identify the broken ABIs.

(Server ABI is definitely broken.)

review: Needs Fixing
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Alright, this is adding features to the server ABI. That seems to be its purpose.

In that case we have little choice but to branch the server ABI string and make all downstream projects in RTM rebuild.

review: Needs Fixing
Revision history for this message
Chris Halse Rogers (raof) wrote :

This now looks correct to me

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

"26rtm1" is wrong. This is not a distro branch so should not contain any distro names.

review: Needs Fixing
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Fixed SONAME so that any other distro using lp:mir/0.8 isn't forced to use "rtm" it is names.

Haven't reviewed the rest yet though.

review: Abstain
Revision history for this message
Chris Halse Rogers (raof) wrote :

Fair chop.

Although I very much hope that no other distros are using lp:mir/0.8,
because this is both an ABI and API break, and totally unacceptable for
a real stable branch :).

Possibly this should be proposed to a new mir/rtm-krillin branch or
something, but I'm happy with mir/0.8 as a practical matter.

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Do we have all the external linkage required? No one's updated symbols.map for this...

review: Needs Information
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Changelog needs to mention at least two fixes that have landed (including this one). Possibly more are desirable too:
https://launchpad.net/mir/+milestone/0.8.1

review: Needs Fixing
Revision history for this message
Daniel van Vugt (vanvugt) :
review: Abstain
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

FYI, still missing two more important fixes (IMHO) after this one. Listed in:
https://launchpad.net/mir/+milestone/0.8.1

Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

ABI bumps and changelog look good now.

review: Approve

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

to all changes: