Merge lp:~mzanetti/qtmir/rebuild-for-mirsurface-appid into lp:qtmir

[Michael Zanetti]

move appId from local interface down to unity-api interface.

unity-api gained a MirSurfaceInterface::appId property which is already implemented here but needs to be exposed to the shell now.

Prereq-archive: ppa:ci-train-ppa-service/2514

related:

https://code.launchpad.net/~mzanetti/unity-api/mirsurface-appid/+merge/319949

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

FAILED: Continuous integration, rev:618
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/578/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4480/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4508
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4335/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4335/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4335/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4335/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4335/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4335/console

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

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/qtmir/rebuild-for-mirsurface-appid]

619. By Michael Zanetti on 2017-03-16

fix provides

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

FAILED: Continuous integration, rev:619
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/579/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4491/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4519
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4346/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4346/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4346/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4346/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4346/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4346/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:619
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/580/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4493/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4521
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4348/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4348/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4348/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4348/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4348/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4348/console

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

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/qtmir/rebuild-for-mirsurface-appid]

620. By Michael Zanetti on 2017-03-16

update gles patch

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

PASSED: Continuous integration, rev:620
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/583/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4497
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4525
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4352
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4352/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4352
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4352/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4352
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4352/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4352
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4352/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4352
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4352/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4352
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4352/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

If we are moving appId() down to unity-api then please update code accordingly:

1 - remove "virtual QString appId() const = 0;" from src/modules/Unity/Application/mirsurfaceinterface.h

2 - In mirsurface.h move the "QString appId() const override;" declaration up to the "unity::shell::application::MirSurfaceInterface" block

review: Needs Fixing

[lp:~mzanetti/qtmir/rebuild-for-mirsurface-appid]

621. By Michael Zanetti on 2017-03-16

properly move the method around

[Michael Zanetti (mzanetti)]

> If we are moving appId() down to unity-api then please update code
> accordingly:
>
> 1 - remove "virtual QString appId() const = 0;" from
> src/modules/Unity/Application/mirsurfaceinterface.h
>
> 2 - In mirsurface.h move the "QString appId() const override;" declaration up
> to the "unity::shell::application::MirSurfaceInterface" block

done. didn't know there is another mirsurfaceinterface.h although I was a bit surprised that it was already marked as "override" in mirsurface.h

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

PASSED: Continuous integration, rev:621
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/587/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4512
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4540
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4367
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4367/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4367
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4367/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4367
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4367/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4367
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4367/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4367
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4367/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4367
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4367/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

Thanks

review: Approve

Unmerged revisions

621. By Michael Zanetti on 2017-03-16

properly move the method around

620. By Michael Zanetti on 2017-03-16

update gles patch

619. By Michael Zanetti on 2017-03-16

fix provides

618. By Michael Zanetti on 2017-03-15

bump api requirement

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-02-08 19:53:50 +0000
+++ CMakeLists.txt	2017-03-16 15:27:59 +0000
@@ -90,7 +90,7 @@
 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
 pkg_check_modules(QTDBUSTEST libqtdbustest-1 REQUIRED)
 pkg_check_modules(QTDBUSMOCK libqtdbusmock-1 REQUIRED)
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=26)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=27)
 pkg_check_modules(CGMANAGER libcgmanager REQUIRED)
 pkg_check_modules(CONTENT_HUB libcontent-hub>=0.2 REQUIRED)
 

=== modified file 'debian/control'
--- debian/control	2017-03-07 23:41:44 +0000
+++ debian/control	2017-03-16 15:27:59 +0000
@@ -25,7 +25,7 @@
                libubuntu-app-launch3-dev,
                libubuntu-application-api-dev (>= 2.1.0),
                libudev-dev,
-               libunity-api-dev (>= 8.2),
+               libunity-api-dev (>= 8.5),
                liburl-dispatcher1-dev,
                libxkbcommon-dev,
                libxrender-dev,
@@ -102,7 +102,7 @@
 Conflicts: libqtmir,
            libunity-mir1,
 Provides: unity-application-impl,
-          unity-application-impl-26,
+          unity-application-impl-27,
 Description: Qt plugin for Unity specific Mir APIs
  QtMir provides Qt/QML bindings for Mir features that are exposed through the
  qtmir-desktop or qtmir-android QPA plugin such as Application management

=== modified file 'debian/gles-patches/convert-to-gles.patch'
--- debian/gles-patches/convert-to-gles.patch	2017-02-15 13:20:44 +0000
+++ debian/gles-patches/convert-to-gles.patch	2017-03-16 15:27:59 +0000
@@ -84,7 +84,7 @@
 -Conflicts: libqtmir,
 -           libunity-mir1,
 -Provides: unity-application-impl,
--          unity-application-impl-26,
+-          unity-application-impl-27,
 -Description: Qt plugin for Unity specific Mir APIs
 - QtMir provides Qt/QML bindings for Mir features that are exposed through the
 - qtmir-desktop or qtmir-android QPA plugin such as Application management

=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
--- src/modules/Unity/Application/mirsurface.cpp	2017-03-07 23:42:05 +0000
+++ src/modules/Unity/Application/mirsurface.cpp	2017-03-16 15:27:59 +0000
@@ -572,6 +572,20 @@
     return m_extraInfo->persistentId;
 }
 
+QString MirSurface::appId() const
+{
+    QString appId;
+
+    if (m_session && m_session->application()) {
+        appId = m_session->application()->appId();
+    } else if (m_session) {
+        appId = m_session->name();
+    } else {
+        appId.append("-");
+    }
+    return appId;
+}
+
 void MirSurface::requestState(Mir::State state)
 {
     INFO_MSG << "(" << unityapiMirStateToStr(state) << ")";
@@ -770,20 +784,6 @@
     Q_EMIT sizeChanged(m_size);
 }
 
-QString MirSurface::appId() const
-{
-    QString appId;
-
-    if (m_session && m_session->application()) {
-        appId = m_session->application()->appId();
-    } else if (m_session) {
-        appId = m_session->name();
-    } else {
-        appId.append("-");
-    }
-    return appId;
-}
-
 void MirSurface::setKeymap(const QString &layoutPlusVariant)
 {
     if (m_keymap == layoutPlusVariant) {

=== modified file 'src/modules/Unity/Application/mirsurface.h'
--- src/modules/Unity/Application/mirsurface.h	2017-02-02 09:17:48 +0000
+++ src/modules/Unity/Application/mirsurface.h	2017-03-16 15:27:59 +0000
@@ -66,6 +66,8 @@
 
     QString persistentId() const override;
 
+    QString appId() const override;
+
     QSize size() const override;
     void resize(int width, int height) override;
     Q_INVOKABLE void resize(const QSize &size) override { resize(size.width(), size.height()); }
@@ -148,8 +150,6 @@
             Qt::TouchPointStates qtTouchPointStates,
             ulong qtTimestamp) override;
 
-    QString appId() const override;
-
     QCursor cursor() const override;
 
     void setKeymap(const QString &) override;

=== modified file 'src/modules/Unity/Application/mirsurfaceinterface.h'
--- src/modules/Unity/Application/mirsurfaceinterface.h	2016-11-22 18:01:11 +0000
+++ src/modules/Unity/Application/mirsurfaceinterface.h	2017-03-16 15:27:59 +0000
@@ -99,8 +99,6 @@
             Qt::TouchPointStates qtTouchPointStates,
             ulong qtTimestamp) = 0;
 
-    virtual QString appId() const = 0;
-
     virtual QCursor cursor() const = 0;
 
     virtual SessionInterface* session() = 0;