diff -Nru qtmir-0.4.8+15.04.20160815/CMakeLists.txt qtmir-0.4.8+15.04.20160819/CMakeLists.txt --- qtmir-0.4.8+15.04.20160815/CMakeLists.txt 2016-08-15 20:02:10.000000000 +0000 +++ qtmir-0.4.8+15.04.20160819/CMakeLists.txt 2016-08-19 14:37:32.000000000 +0000 @@ -67,9 +67,9 @@ find_package(Threads REQUIRED) -pkg_check_modules(MIRSERVER mirserver>=0.22 REQUIRED) -pkg_check_modules(MIRCLIENT mirclient>=0.22 REQUIRED) -pkg_check_modules(MIRRENDERERGLDEV mir-renderer-gl-dev>=0.22 REQUIRED) +pkg_check_modules(MIRSERVER mirserver>=0.24 REQUIRED) +pkg_check_modules(MIRCLIENT mirclient>=0.24 REQUIRED) +pkg_check_modules(MIRRENDERERGLDEV mir-renderer-gl-dev>=0.24 REQUIRED) pkg_check_modules(XKBCOMMON xkbcommon REQUIRED) pkg_check_modules(GLIB glib-2.0 REQUIRED) diff -Nru qtmir-0.4.8+15.04.20160815/debian/changelog qtmir-0.4.8+15.04.20160819/debian/changelog --- qtmir-0.4.8+15.04.20160815/debian/changelog 2016-08-19 14:40:57.000000000 +0000 +++ qtmir-0.4.8+15.04.20160819/debian/changelog 2016-08-19 14:40:57.000000000 +0000 @@ -1,8 +1,14 @@ -qtmir (0.4.8+15.04.20160815-0ubuntu1) vivid; urgency=medium +qtmir (0.4.8+15.04.20160819-0ubuntu1) vivid; urgency=medium * No change rebuild for UAL ABI change - -- Ted Gould Mon, 15 Aug 2016 20:02:41 +0000 + -- Ted Gould Fri, 19 Aug 2016 14:38:12 +0000 + +qtmir (0.4.8+16.10.20160816.1-0ubuntu1) yakkety; urgency=medium + + * compatibility changes for mir 0.24.0 + + -- Kevin DuBois Tue, 16 Aug 2016 11:41:40 +0000 qtmir (0.4.8+16.10.20160810-0ubuntu1) yakkety; urgency=medium diff -Nru qtmir-0.4.8+15.04.20160815/debian/control qtmir-0.4.8+15.04.20160819/debian/control --- qtmir-0.4.8+15.04.20160815/debian/control 2016-08-19 14:40:57.000000000 +0000 +++ qtmir-0.4.8+15.04.20160819/debian/control 2016-08-19 14:40:57.000000000 +0000 @@ -12,9 +12,9 @@ libglib2.0-dev, libgsettings-qt-dev, liblttng-ust-dev, - libmirclient-dev (>= 0.22.0), - libmircommon-dev (>= 0.22.0), - libmirserver-dev (>= 0.22.0), + libmirclient-dev (>= 0.24.0), + libmircommon-dev (>= 0.24.0), + libmirserver-dev (>= 0.24.0), libmtdev-dev, libprocess-cpp-dev, libqt5sensors5-dev, diff -Nru qtmir-0.4.8+15.04.20160815/src/platforms/mirserver/screen.cpp qtmir-0.4.8+15.04.20160819/src/platforms/mirserver/screen.cpp --- qtmir-0.4.8+15.04.20160815/src/platforms/mirserver/screen.cpp 2016-08-15 20:02:10.000000000 +0000 +++ qtmir-0.4.8+15.04.20160819/src/platforms/mirserver/screen.cpp 2016-08-19 14:37:32.000000000 +0000 @@ -215,8 +215,8 @@ m_type = screen.type; // Physical screen size - m_physicalSize.setWidth(screen.physical_size_mm.width.as_float()); - m_physicalSize.setHeight(screen.physical_size_mm.height.as_float()); + m_physicalSize.setWidth(static_cast(screen.physical_size_mm.width.as_int())); + m_physicalSize.setHeight(static_cast(screen.physical_size_mm.height.as_int())); // Screen capabilities m_modes = screen.modes; diff -Nru qtmir-0.4.8+15.04.20160815/tests/framework/fake_surface.h qtmir-0.4.8+15.04.20160819/tests/framework/fake_surface.h --- qtmir-0.4.8+15.04.20160815/tests/framework/fake_surface.h 2016-08-15 20:02:10.000000000 +0000 +++ qtmir-0.4.8+15.04.20160819/tests/framework/fake_surface.h 2016-08-19 14:37:32.000000000 +0000 @@ -100,6 +100,11 @@ void set_cursor_stream(std::shared_ptr const&, geometry::Displacement const&) override {} void rename(std::string const&) override {} std::shared_ptr primary_buffer_stream() const override { return nullptr; } + void set_confine_pointer_state(MirPointerConfinementState) {} + MirPointerConfinementState confine_pointer_state() const + { + return mir_pointer_unconfined; + } }; } // namespace scene diff -Nru qtmir-0.4.8+15.04.20160815/tests/framework/mock_mir_session.h qtmir-0.4.8+15.04.20160819/tests/framework/mock_mir_session.h --- qtmir-0.4.8+15.04.20160815/tests/framework/mock_mir_session.h 2016-08-15 20:02:10.000000000 +0000 +++ qtmir-0.4.8+15.04.20160819/tests/framework/mock_mir_session.h 2016-08-19 14:37:32.000000000 +0000 @@ -68,8 +68,9 @@ void configure_streams(Surface&, std::vector const&) override;; MOCK_METHOD1(send_input_device_change, void(std::vector> const&)); - //void send_input_device_change(std::vector> const& devices) = 0; - + MOCK_METHOD1(create_buffer, mir::graphics::BufferID(mir::graphics::BufferProperties const&)); + MOCK_METHOD1(destroy_buffer, void(mir::graphics::BufferID)); + MOCK_METHOD1(get_buffer, std::shared_ptr(mir::graphics::BufferID)); private: std::string m_sessionName; diff -Nru qtmir-0.4.8+15.04.20160815/tests/framework/mock_surface.h qtmir-0.4.8+15.04.20160819/tests/framework/mock_surface.h --- qtmir-0.4.8+15.04.20160815/tests/framework/mock_surface.h 2016-08-15 20:02:10.000000000 +0000 +++ qtmir-0.4.8+15.04.20160819/tests/framework/mock_surface.h 2016-08-19 14:37:32.000000000 +0000 @@ -87,6 +87,9 @@ MOCK_METHOD1(with_most_recent_buffer_do, void(std::function const& exec)); MOCK_METHOD2(set_cursor_stream, void(std::shared_ptr const&, geometry::Displacement const&)); + + MOCK_METHOD1(set_confine_pointer_state, void(MirPointerConfinementState)); + MOCK_CONST_METHOD0(confine_pointer_state, MirPointerConfinementState()); }; } // namespace scene diff -Nru qtmir-0.4.8+15.04.20160815/tests/mirserver/WindowManager/stub_session.cpp qtmir-0.4.8+15.04.20160819/tests/mirserver/WindowManager/stub_session.cpp --- qtmir-0.4.8+15.04.20160815/tests/mirserver/WindowManager/stub_session.cpp 2016-08-15 20:02:10.000000000 +0000 +++ qtmir-0.4.8+15.04.20160819/tests/mirserver/WindowManager/stub_session.cpp 2016-08-19 14:37:32.000000000 +0000 @@ -131,3 +131,17 @@ void StubSession::send_input_device_change(std::vector> const& /*devices*/) { } + +mir::graphics::BufferID StubSession::create_buffer(mir::graphics::BufferProperties const&) +{ + return {}; +} + +void StubSession::destroy_buffer(mir::graphics::BufferID) +{ +} + +std::shared_ptr StubSession::get_buffer(mir::graphics::BufferID) +{ + return nullptr; +} diff -Nru qtmir-0.4.8+15.04.20160815/tests/mirserver/WindowManager/stub_session.h qtmir-0.4.8+15.04.20160819/tests/mirserver/WindowManager/stub_session.h --- qtmir-0.4.8+15.04.20160815/tests/mirserver/WindowManager/stub_session.h 2016-08-15 20:02:10.000000000 +0000 +++ qtmir-0.4.8+15.04.20160819/tests/mirserver/WindowManager/stub_session.h 2016-08-19 14:37:32.000000000 +0000 @@ -56,6 +56,9 @@ void configure_streams(mir::scene::Surface& surface, std::vector const& config) override; void send_input_device_change(std::vector> const& devices) override; + mir::graphics::BufferID create_buffer(mir::graphics::BufferProperties const& properties) override; + void destroy_buffer(mir::graphics::BufferID) override; + std::shared_ptr get_buffer(mir::graphics::BufferID) override; }; #endif //QPAMIRSERVER_STUBSESSION_H diff -Nru qtmir-0.4.8+15.04.20160815/tests/mirserver/WindowManager/stub_surface.cpp qtmir-0.4.8+15.04.20160819/tests/mirserver/WindowManager/stub_surface.cpp --- qtmir-0.4.8+15.04.20160815/tests/mirserver/WindowManager/stub_surface.cpp 2016-08-15 20:02:10.000000000 +0000 +++ qtmir-0.4.8+15.04.20160819/tests/mirserver/WindowManager/stub_surface.cpp 2016-08-19 14:37:32.000000000 +0000 @@ -197,3 +197,12 @@ void StubSurface::rename(std::string const& /*title*/) { } + +void StubSurface::set_confine_pointer_state(MirPointerConfinementState) +{ +} + +MirPointerConfinementState StubSurface::confine_pointer_state() const +{ + return mir_pointer_unconfined; +} diff -Nru qtmir-0.4.8+15.04.20160815/tests/mirserver/WindowManager/stub_surface.h qtmir-0.4.8+15.04.20160819/tests/mirserver/WindowManager/stub_surface.h --- qtmir-0.4.8+15.04.20160815/tests/mirserver/WindowManager/stub_surface.h 2016-08-15 20:02:10.000000000 +0000 +++ qtmir-0.4.8+15.04.20160819/tests/mirserver/WindowManager/stub_surface.h 2016-08-19 14:37:32.000000000 +0000 @@ -63,6 +63,8 @@ void set_keymap(MirInputDeviceId id, std::string const& model, std::string const& layout, std::string const& variant, std::string const& options) override; void rename(std::string const& title) override; + void set_confine_pointer_state(MirPointerConfinementState state) override; + MirPointerConfinementState confine_pointer_state() const override; }; #endif //QPAMIRSERVER_STUB_SURFACE_H