Merge lp:~kdub/unity-system-compositor/0.24-compatibility into lp:unity-system-compositor/ubuntu

Proposed by Kevin DuBois
Status: Rejected
Rejected by: Kevin DuBois
Proposed branch: lp:~kdub/unity-system-compositor/0.24-compatibility
Merge into: lp:unity-system-compositor/ubuntu
Diff against target: 86 lines (+35/-4)
4 files modified
debian/changelog (+18/-0)
debian/control (+2/-2)
tests/unit-tests/test_mir_input_configuration.cpp (+4/-1)
tests/unit-tests/test_session_switcher.cpp (+11/-1)
To merge this branch: bzr merge lp:~kdub/unity-system-compositor/0.24-compatibility
Reviewer Review Type Date Requested Status
Kevin DuBois (community) Abstain
Review via email: mp+300875@code.launchpad.net

Commit message

compatibility fixes for the mir 0.24 release

Description of the change

compatibility fixes for the mir 0.24 release

To post a comment you must log in.
Revision history for this message
Kevin DuBois (kdub) wrote :

need to back out 247 and keep the repowerd stuff. Awaiting silo 000 to land, as that will get repowerd back into shape.

review: Needs Fixing
297. By Kevin DuBois

compatibility fixes for mir 0.24 release

298. By Kevin DuBois

merge in base

299. By Kevin DuBois

merge in base

300. By Kevin DuBois

require mir 0.24 in control

301. By Kevin DuBois

reduce diff from 0.6

302. By Kevin DuBois

capture signature for the 6.0-ubuntu-3 release

Revision history for this message
Kevin DuBois (kdub) wrote :

alright, repowerd + usc landing, this MP unblocked.

Revision history for this message
Kevin DuBois (kdub) :
review: Abstain

Unmerged revisions

302. By Kevin DuBois

capture signature for the 6.0-ubuntu-3 release

301. By Kevin DuBois

reduce diff from 0.6

300. By Kevin DuBois

require mir 0.24 in control

299. By Kevin DuBois

merge in base

298. By Kevin DuBois

merge in base

297. By Kevin DuBois

compatibility fixes for mir 0.24 release

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-06-09 09:05:15 +0000
3+++ debian/changelog 2016-08-10 16:45:30 +0000
4@@ -1,3 +1,21 @@
5+unity-system-compositor (0.6.0-0ubuntu4) UNRELEASED; urgency=medium
6+
7+ * compatibility fixes for mir 0.24 release
8+
9+ -- Kevin DuBois <kevin.dubois@canonical.com> Tue, 09 Aug 2016 14:05:30 -0400
10+
11+unity-system-compositor (0.6.0+16.10.20160805.1-0ubuntu1) yakkety; urgency=medium
12+
13+ * No-change rebuild.
14+
15+ -- Alexandros Frantzis <alexandros.frantzis@canonical.com> Fri, 05 Aug 2016 10:18:16 +0000
16+
17+unity-system-compositor (0.6.0+16.10.20160609-0ubuntu2) yakkety; urgency=medium
18+
19+ * No-change rebuild for boost soname change.
20+
21+ -- Matthias Klose <doko@ubuntu.com> Thu, 04 Aug 2016 08:33:29 +0000
22+
23 unity-system-compositor (0.6.0+16.10.20160609-0ubuntu1) yakkety; urgency=medium
24
25 * 0.6.0 release
26
27=== modified file 'debian/control'
28--- debian/control 2016-06-01 12:03:51 +0000
29+++ debian/control 2016-08-10 16:45:30 +0000
30@@ -14,8 +14,8 @@
31 libglib2.0-dev,
32 libgles2-mesa-dev,
33 libglm-dev,
34- libmirclient-dev (>= 0.22.0),
35- libmirserver-dev (>= 0.22.0),
36+ libmirclient-dev (>= 0.24.0),
37+ libmirserver-dev (>= 0.24.0),
38 pkg-config,
39 python (>= 2.7),
40 python-setuptools,
41
42=== modified file 'tests/unit-tests/test_mir_input_configuration.cpp'
43--- tests/unit-tests/test_mir_input_configuration.cpp 2016-03-22 10:48:23 +0000
44+++ tests/unit-tests/test_mir_input_configuration.cpp 2016-08-10 16:45:30 +0000
45@@ -22,6 +22,7 @@
46 #include "mir/input/device_capability.h"
47 #include "mir/input/input_device_observer.h"
48 #include "mir/input/device.h"
49+#include "mir/input/keyboard_configuration.h"
50
51 #include <gtest/gtest.h>
52 #include <gmock/gmock.h>
53@@ -40,8 +41,10 @@
54 MOCK_CONST_METHOD0(unique_id, std::string());
55 MOCK_CONST_METHOD0(pointer_configuration, mir::optional_value<mi::PointerConfiguration>());
56 MOCK_METHOD1(apply_pointer_configuration, void(mi::PointerConfiguration const&));
57- MOCK_CONST_METHOD0(touchpad_configuration, mir::optional_value<mi::TouchpadConfiguration> ());
58+ MOCK_CONST_METHOD0(touchpad_configuration, mir::optional_value<mi::TouchpadConfiguration>());
59 MOCK_METHOD1(apply_touchpad_configuration, void(mi::TouchpadConfiguration const&));
60+ MOCK_CONST_METHOD0(keyboard_configuration, mir::optional_value<mi::KeyboardConfiguration>());
61+ MOCK_METHOD1(apply_keyboard_configuration, void(mi::KeyboardConfiguration const&));
62
63 MockDevice(mi::DeviceCapabilities caps)
64 : caps(caps)
65
66=== modified file 'tests/unit-tests/test_session_switcher.cpp'
67--- tests/unit-tests/test_session_switcher.cpp 2016-03-22 10:48:23 +0000
68+++ tests/unit-tests/test_session_switcher.cpp 2016-08-10 16:45:30 +0000
69@@ -101,7 +101,17 @@
70 mir::frontend::BufferStreamId create_buffer_stream(mir::graphics::BufferProperties const& /*props*/) override { return {}; }
71 std::shared_ptr<mir::frontend::BufferStream> get_buffer_stream(mir::frontend::BufferStreamId /*stream*/) const override { return nullptr; }
72 void destroy_buffer_stream(mir::frontend::BufferStreamId /*stream*/) override {}
73-
74+ mir::graphics::BufferID create_buffer(mir::graphics::BufferProperties const&) override
75+ {
76+ return {};
77+ }
78+ void destroy_buffer(mir::graphics::BufferID) override
79+ {
80+ }
81+ std::shared_ptr<mir::graphics::Buffer> get_buffer(mir::graphics::BufferID) override
82+ {
83+ return nullptr;
84+ }
85 std::string name() const override { return name_; }
86 void send_display_config(mir::graphics::DisplayConfiguration const&) override {}
87

Subscribers

People subscribed via source and target branches