Mir

Merge lp:~alan-griffiths/mir/do-not-assume-ubuntu into lp:mir

Proposed by Alan Griffiths on 2017-10-19
Status: Merged
Merged at revision: 4297
Proposed branch: lp:~alan-griffiths/mir/do-not-assume-ubuntu
Merge into: lp:mir
Prerequisite: lp:~alan-griffiths/mir/optional-mir-egl-examples
Diff against target: 88 lines (+29/-6)
4 files modified
examples/miral-shell/miral-app.sh (+8/-2)
examples/miral-shell/miral-desktop.sh (+8/-2)
examples/miral-shell/miral-run.sh (+12/-1)
examples/miral-shell/shell_main.cpp (+1/-1)
To merge this branch: bzr merge lp:~alan-griffiths/mir/do-not-assume-ubuntu
Reviewer Review Type Date Requested Status
Chris Halse Rogers Approve on 2017-10-23
Mir CI Bot continuous-integration Needs Fixing on 2017-10-20
Alberto Aguirre (community) 2017-10-19 Approve on 2017-10-19
Review via email: mp+332489@code.launchpad.net

Commit message

Don't assume that qtubuntu-desktop is available

To post a comment you must log in.
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4297
https://mir-jenkins.ubuntu.com/job/mir-ci/3742/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5144
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5382
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5369
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5369
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5369
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5188
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5188/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5188
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5188/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5188
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5188/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5188
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5188/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5188
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5188/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5188
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5188/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5188
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5188/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5188
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5188/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3742/rebuild

review: Approve (continuous-integration)
Alberto Aguirre (albaguirre) wrote :

OK, tested through the fedora branch.

review: Approve
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/1475/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5153
    FAILURE: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1612/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1613/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5390
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5377
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5377
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5377
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5196
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5196/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5196
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5196/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5196
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5196/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5196
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5196/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5196
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5196/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5196
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5196/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5196
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5196/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5196
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5196/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Chris Halse Rogers (raof) wrote :

Ok. Although this obviously only detects qtubuntuclient on Debian-derived distros, that's expected to go away.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/miral-shell/miral-app.sh'
2--- examples/miral-shell/miral-app.sh 2017-10-13 13:20:35 +0000
3+++ examples/miral-shell/miral-app.sh 2017-10-19 11:28:07 +0000
4@@ -45,14 +45,20 @@
5 if [ -e "${socket}" ]; then echo "Error: session endpoint '${socket}' already exists"; exit 1 ;fi
6 if [ -e "${XDG_RUNTIME_DIR}/${wayland_display}" ]; then echo "Error: wayland endpoint '${wayland_display}' already exists"; exit 1 ;fi
7
8+qt_qpa_platform=ubuntumirclient
9 qtubuntu_desktop_installed=$(apt list qtubuntu-desktop 2>/dev/null | grep installed | wc -l)
10-if [ "${qtubuntu_desktop_installed}" == "0" ]; then echo "Need qtubuntu-desktop - run \"sudo apt install qtubuntu-desktop\""; exit 1 ;fi
11+if [ "${qtubuntu_desktop_installed}" == "0" ]
12+then
13+ echo "** Warning ** defaulting to Wayland backend for Qt"
14+ echo "For the best experience install qtubuntu-desktop - run \"sudo apt install qtubuntu-desktop\""
15+ qt_qpa_platform=wayland
16+fi
17
18 sh -c "${bindir}${miral_server} $* ${hostsocket} --file ${socket} --wayland-socket-name ${wayland_display} --desktop_file_hint=miral-shell.desktop"&
19
20 while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
21
22 unset QT_QPA_PLATFORMTHEME
23-MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=wayland WAYLAND_DISPLAY=${wayland_display} dbus-run-session -- ${launcher}
24+MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=${qt_qpa_platform} SDL_VIDEODRIVER=wayland WAYLAND_DISPLAY=${wayland_display} dbus-run-session -- ${launcher}
25 killall ${bindir}${miral_server}
26
27
28=== modified file 'examples/miral-shell/miral-desktop.sh'
29--- examples/miral-shell/miral-desktop.sh 2017-10-13 13:20:35 +0000
30+++ examples/miral-shell/miral-desktop.sh 2017-10-19 11:28:07 +0000
31@@ -37,8 +37,14 @@
32 if [ -e "${socket}" ]; then echo "Error: session endpoint '${socket}' already exists"; exit 1 ;fi
33 if [ -e "${XDG_RUNTIME_DIR}/${wayland_display}" ]; then echo "Error: wayland endpoint '${wayland_display}' already exists"; exit 1 ;fi
34
35+qt_qpa_platform=ubuntumirclient
36 qtubuntu_desktop_installed=$(apt list qtubuntu-desktop 2>/dev/null | grep installed | wc -l)
37-if [ "${qtubuntu_desktop_installed}" == "0" ]; then echo "Need qtubuntu-desktop - run \"sudo apt install qtubuntu-desktop\""; exit 1 ;fi
38+if [ "${qtubuntu_desktop_installed}" == "0" ]
39+then
40+ echo "** Warning ** defaulting to Wayland backend for Qt"
41+ echo "For the best experience install qtubuntu-desktop - run \"sudo apt install qtubuntu-desktop\""
42+ qt_qpa_platform=wayland
43+fi
44
45 sudo ls >> /dev/null
46 oldvt=$(sudo fgconsole)
47@@ -47,6 +53,6 @@
48 while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
49
50 unset QT_QPA_PLATFORMTHEME
51-MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=wayland WAYLAND_DISPLAY=${wayland_display} dbus-run-session -- ${launcher}
52+MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=${qt_qpa_platform} SDL_VIDEODRIVER=wayland WAYLAND_DISPLAY=${wayland_display} dbus-run-session -- ${launcher}
53 sudo killall ${bindir}${miral_server}
54
55
56=== modified file 'examples/miral-shell/miral-run.sh'
57--- examples/miral-shell/miral-run.sh 2017-10-13 13:20:35 +0000
58+++ examples/miral-shell/miral-run.sh 2017-10-19 11:28:07 +0000
59@@ -14,4 +14,15 @@
60 then extras='--app-id com.canonical.miral.Terminal'
61 fi
62 unset QT_QPA_PLATFORMTHEME
63-MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=wayland "$@" ${extras}&
64+
65+qt_qpa_platform=ubuntumirclient
66+qtubuntu_desktop_installed=$(apt list qtubuntu-desktop
67+ 2>/dev/null | grep installed | wc -l)
68+if [ "${qtubuntu_desktop_installed}" == "0" ]
69+then
70+ echo "** Warning ** defaulting to Wayland backend for Qt"
71+ echo "For the best experience install qtubuntu-desktop - run \"sudo apt install qtubuntu-desktop\""
72+ qt_qpa_platform=wayland
73+fi
74+
75+MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=${qt_qpa_platform} SDL_VIDEODRIVER=wayland "$@" ${extras}&
76
77=== modified file 'examples/miral-shell/shell_main.cpp'
78--- examples/miral-shell/shell_main.cpp 2017-08-21 15:58:34 +0000
79+++ examples/miral-shell/shell_main.cpp 2017-10-19 11:28:07 +0000
80@@ -83,7 +83,7 @@
81 {
82 CommandLineOption{[&](std::string const& ) { },
83 "desktop_file_hint", "Ignored for Unity8 compatibility", "miral-shell.desktop"},
84- CursorTheme{"DMZ-White"},
85+ CursorTheme{"default"},
86 window_managers,
87 display_configuration_options,
88 launcher,

Subscribers

People subscribed via source and target branches