Mir

Merge lp://staging/mir/0.14 into lp://staging/mir/ubuntu

  1. 0.14
  2. Merge into ubuntu
Proposed by Alberto Aguirre
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 2729
Merge reported by: Alberto Aguirre
Merged at revision: not available
Proposed branch: lp://staging/mir/0.14
Merge into: lp://staging/mir/ubuntu
Diff against target: 159 lines (+84/-5) (has conflicts)
5 files modified
CMakeLists.txt (+5/-0)
debian/changelog (+31/-0)
examples/eglapp.c (+14/-0)
src/platforms/android/server/fb_device.cpp (+7/-5)
tests/unit-tests/graphics/android/test_fb_device.cpp (+27/-0)
Text conflict in CMakeLists.txt
Text conflict in debian/changelog
Text conflict in examples/eglapp.c
To merge this branch: bzr merge lp://staging/mir/0.14
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Mir development team Pending
Review via email: mp+268525@code.staging.launchpad.net

Commit message

Mir 0.14.1

Description of the change

Mir 0.14.1

To post a comment you must log in.
Revision history for this message
Alberto Aguirre (albaguirre) wrote :

Backport of https://code.launchpad.net/~afrantzis/mir/fix-1486535-emulator-failures/+merge/268521

lp://staging/mir/0.14 updated
2726. By Alberto Aguirre

Update version in cmake

2727. By Alberto Aguirre

Workaround for GLibMainLoopTest.propagates_exception_from_server_action failure

The test fails with GCC5 when using -O2 options in armhf which seems to be caused by using identical lambda definitions.
As a workaround the exception message is changed to force the compiler to generate a unique implementation instead of sharing one;this allows the exception to be caught as expected.

Cherry-pick from lp:mir r2820

2728. By Alberto Aguirre

Format changelog

2729. By Alberto Aguirre

Merge changelog from archive

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

FAILED: Continuous integration, rev:2725
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/71/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/27/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/444/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1116/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/26/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/29/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2729
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/72/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/28/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/445/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1117/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/30/console

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

review: Needs Fixing (continuous-integration)
lp://staging/mir/0.14 updated
2730. By kevin gunn

update changelog with released status

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: