Mir

Merge lp:~mir-team/mir/fix-1353658-0.6 into lp:mir/0.6

  1. fix-1353658-0.6
  2. Merge into 0.6
Proposed by Daniel van Vugt
Status: Rejected
Rejected by: Cemil Azizoglu
Proposed branch: lp:~mir-team/mir/fix-1353658-0.6
Merge into: lp:mir/0.6
Diff against target: 11 lines (+1/-0)
1 file modified
src/platform/graphics/symbols.map (+1/-0)
To merge this branch: bzr merge lp:~mir-team/mir/fix-1353658-0.6
Reviewer Review Type Date Requested Status
Cemil Azizoglu (community) Disapprove
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+230046@code.launchpad.net

This proposal supersedes a proposal from 2014-08-08.

Commit message

graphics: expose create_native_platform in libmirplatformgraphics.so

Nested servers (like unity8) need this symbol, and they will throw an
exception if they cant find it. (LP: #1353658)

Description of the change

Note the lack of changelog entry, because this fix may not land until 0.6.1. Although that would be pointless.

If it does land in 0.6.0 then someone needs to add a changelog entry.

To post a comment you must log in.
lp:~mir-team/mir/fix-1353658-0.6 updated
1827. By Daniel van Vugt

Empty commit to work around LP bugs.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1827
http://jenkins.qa.ubuntu.com/job/mir-0.6-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-0.6-utopic-amd64-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/mir-0.6-utopic-amd64-ci/2/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-0.6-utopic-armhf-ci/2/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1261
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1244/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/179/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-0.6-ci/2/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

This is pulled in along with other content from devel. Willl be merged a part of the 0.6->trunk MP.

review: Disapprove

Unmerged revisions

1827. By Daniel van Vugt

Empty commit to work around LP bugs.

1826. By Kevin DuBois

graphics: expose create_native_platform in libmirplatformgraphics.so

Nested servers (like unity8) need this symbol, and they will throw an
exception if they cant find it. (LP: #1353658)

1825. By Cemil Azizoglu

Change 1348330 to a "partial fix".

1824. By Cemil Azizoglu

Updated changelog.

1823. By Alan Griffiths

  packaging: fix some errors in the package config files.

1822. By Robert Carr

Add a script for updating client and server sha1sum files.

1821. By Daniel van Vugt

Condense and deduplicate references to MIR_VERSION_*.

1820. By Kevin DuBois

Simplify the demo shell occlusion detection. Fixes: https://bugs.launchpad.net/bugs/1348330.

1819. By Chris Halse Rogers

Finish off the removal of libmirprotobuf.

1818. By Alan Griffiths

platformgraphics - restrict the exports of the platform libraries.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/platform/graphics/symbols.map'
2--- src/platform/graphics/symbols.map 2014-07-31 10:28:09 +0000
3+++ src/platform/graphics/symbols.map 2014-08-08 06:58:22 +0000
4@@ -2,6 +2,7 @@
5 global:
6 add_platform_options;
7 create_platform;
8+ create_native_platform;
9 mir_server_mesa_egl_native_display_is_valid;
10 local: *;
11 };

Subscribers

People subscribed via source and target branches

to all changes: