Merge lp:~aacid/unity-system-compositor/noChangeRebuild into lp:unity-system-compositor

[Albert Astals Cid]

 Bla bla

Ignore

[lp:~aacid/unity-system-compositor/noChangeRebuild]

309. By Albert Astals Cid on 2017-03-27

Merge lp:~alan-griffiths/unity-system-compositor/compatibility

Unmerged revisions

309. By Albert Astals Cid on 2017-03-27

Merge lp:~alan-griffiths/unity-system-compositor/compatibility

308. By Albert Astals Cid on 2017-03-27

[ Albert Astals Cid ]
Bla bla

=== modified file 'debian/changelog'
--- debian/changelog	2017-01-17 16:59:15 +0000
+++ debian/changelog	2017-03-27 14:46:44 +0000
@@ -1,8 +1,12 @@
-unity-system-compositor (0.9.0-0ubuntu1) UNRELEASED; urgency=medium
+unity-system-compositor (0.9.1-0ubuntu2) UNRELEASED; urgency=medium
 
+  [ Cemil Azizoglu ]
   * Update for compatibility with Mir 0.26
 
- -- Cemil Azizoglu <[e-mail]>  Tue, 17 Jan 2017 10:58:13 -0600
+  [ Albert Astals Cid ]
+  * Bla bla
+
+ -- Albert Astals Cid <tsdgeos@tsdgeos-ThinkPad-Yoga-460>  Mon, 27 Mar 2017 15:17:38 +0200
 
 unity-system-compositor (0.8.0+17.04.20161206-0ubuntu1) zesty; urgency=medium
 
 
=== modified file 'tests/include/usc/test/mock_display.h'
--- tests/include/usc/test/mock_display.h	2016-11-09 18:13:05 +0000
+++ tests/include/usc/test/mock_display.h	2017-03-27 14:46:44 +0000
@@ -21,6 +21,7 @@
 
 #include <mir/graphics/display.h>
 #include <mir/graphics/virtual_output.h>
+#include <mir/version.h>
 #include <gmock/gmock.h>
 
 namespace usc
@@ -53,11 +54,15 @@
 
     void resume() override {};
 
+#if MIR_SERVER_VERSION < MIR_VERSION_NUMBER(0, 27, 0)
     std::shared_ptr<mir::graphics::Cursor> create_hardware_cursor(
         std::shared_ptr<mir::graphics::CursorImage> const&) override
     {
         return {};
     };
+#else
+    std::shared_ptr<mir::graphics::Cursor> create_hardware_cursor() override { return {}; }
+#endif
 
     std::unique_ptr<mir::graphics::VirtualOutput> create_virtual_output(int, int) override
     { return std::unique_ptr<mir::graphics::VirtualOutput>{}; }
 
=== modified file 'tests/unit-tests/test_mir_input_configuration.cpp'
--- tests/unit-tests/test_mir_input_configuration.cpp	2017-01-19 19:49:44 +0000
+++ tests/unit-tests/test_mir_input_configuration.cpp	2017-03-27 14:46:44 +0000
@@ -25,6 +25,11 @@
 #include "mir/input/mir_keyboard_config.h"
 #include "mir/input/mir_pointer_config.h"
 #include "mir/input/mir_touchpad_config.h"
+#include <mir/version.h>
+
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
+#include <mir/input/mir_touchscreen_config.h>
+#endif
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -54,6 +59,11 @@
         ON_CALL(*this, capabilities()).WillByDefault(Return(this->caps));
     }
 
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
+    mir::optional_value<MirTouchscreenConfig> touchscreen_configuration() const { return {}; }
+    void apply_touchscreen_configuration(MirTouchscreenConfig const&) {}
+#endif
+
     mi::DeviceCapabilities caps;
 };
 
 
=== modified file 'tests/unit-tests/test_session_switcher.cpp'
--- tests/unit-tests/test_session_switcher.cpp	2017-02-06 12:48:40 +0000
+++ tests/unit-tests/test_session_switcher.cpp	2017-03-27 14:46:44 +0000
@@ -20,6 +20,7 @@
 #include "src/spinner.h"
 
 #include "mir/frontend/session.h"
+#include <mir/version.h>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -105,6 +106,7 @@
     {
         return {};
     }
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
     mir::graphics::BufferID create_buffer(mir::geometry::Size, MirPixelFormat) override
     {
         return {};
@@ -113,6 +115,7 @@
     {
         return {};
     }
+#endif
     void destroy_buffer(mir::graphics::BufferID) override
     {
     }