Merge lp:~gerboland/qtubuntu/fix-ftbfs-mir0.25 into lp:qtubuntu

[Gerry Boland]

Remove mircommon specifier for header, fix other ftbfs with mir 0.25

[Albert Astals Cid (aacid)]

debugextension.cpp:22:39: fatal error: mir_toolkit/debug/surface.h: No such file or directory
 #include <mir_toolkit/debug/surface.h>

review: Needs Fixing

[lp:~gerboland/qtubuntu/fix-ftbfs-mir0.25]

363. By Gerry Boland on 2016-12-19

[debian] Bump mirclient required version

[Gerry Boland (gerboland)]

You're missing libmirclient-debug-extension-dev

[Albert Astals Cid (aacid)]

Looks good.

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:362
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/164/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3588
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3616
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3462
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3462/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3462
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3462/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3462
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3462/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3462
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3462/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3462
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3462/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3462
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3462/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/164/rebuild

review: Approve (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:363
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/166/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3671
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3699
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3541
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3541/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3541
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3541/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3541
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3541/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3541
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3541/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3541
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3541/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3541
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3541/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/166/rebuild

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Confirming working at https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/1985/+packages

review: Approve

=== modified file 'debian/control'
--- debian/control	2016-09-22 19:45:30 +0000
+++ debian/control	2016-12-19 10:24:12 +0000
@@ -10,7 +10,7 @@
                libgles2-mesa-dev,
                libglib2.0-dev,
                libinput-dev,
-               libmirclient-dev (>= 0.13.0),
+               libmirclient-dev (>= 0.25.0),
                libmirclient-debug-extension-dev,
                libmtdev-dev,
                libubuntu-application-api-dev (>= 2.9.0),

=== modified file 'src/ubuntumirclient/input.cpp'
--- src/ubuntumirclient/input.cpp	2016-11-04 13:24:35 +0000
+++ src/ubuntumirclient/input.cpp	2016-12-19 10:24:12 +0000
@@ -232,6 +232,8 @@
         return "surface_output";
     case mir_event_type_input_device_state:
         return "input_device_state";
+    case mir_event_type_surface_placement:
+        return "surface_placement";
     }
     Q_UNREACHABLE();
 }
@@ -328,6 +330,8 @@
     case mir_input_event_type_pointer:
         dispatchPointerEvent(window, ev);
         break;
+    case mir_input_event_types:
+        Q_UNREACHABLE();
     }
 }
 
@@ -370,6 +374,9 @@
             break;
         case mir_touch_action_change:
             touchPoint.state = Qt::TouchPointMoved;
+            break;
+        case mir_touch_actions:
+            Q_UNREACHABLE();
         }
 
         touchPoints.append(touchPoint);
@@ -530,6 +537,8 @@
     case mir_pointer_action_leave:
         QWindowSystemInterface::handleLeaveEvent(window);
         break;
+    case mir_pointer_actions:
+        Q_UNREACHABLE();
     }
 }
 

=== modified file 'src/ubuntumirclient/screen.h'
--- src/ubuntumirclient/screen.h	2016-04-28 14:09:54 +0000
+++ src/ubuntumirclient/screen.h	2016-12-19 10:24:12 +0000
@@ -20,7 +20,7 @@
 #include <qpa/qplatformscreen.h>
 #include <QSurfaceFormat>
 
-#include <mircommon/mir_toolkit/common.h> // just for MirFormFactor enum
+#include <mir_toolkit/common.h> // just for MirFormFactor enum
 
 #include "cursor.h"