Merge lp:~ted/ubuntu-app-launch/xmir-by-default into lp:ubuntu-app-launch
- xmir-by-default
- Merge into trunk.17.04
Status: | Merged |
---|---|
Approved by: | dobey |
Approved revision: | 299 |
Merged at revision: | 295 |
Proposed branch: | lp:~ted/ubuntu-app-launch/xmir-by-default |
Merge into: | lp:ubuntu-app-launch |
Diff against target: |
53 lines (+11/-4) 3 files modified
debian/control (+1/-0) libubuntu-app-launch/application-impl-legacy.cpp (+8/-2) tests/exec-util-test.cc (+2/-2) |
To merge this branch: | bzr merge lp:~ted/ubuntu-app-launch/xmir-by-default |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel d'Andrada | Needs Fixing | ||
dobey (community) | Approve | ||
unity-api-1-bot | continuous-integration | Approve | |
kevin gunn | Pending | ||
Review via email: mp+318834@code.launchpad.net |
Commit message
XMir by default for Legacy apps
Description of the change
Ted Gould (ted) wrote : | # |
unity-api-1-bot (unity-api-1-bot) wrote : | # |
FAILED: Continuous integration, rev:295
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
unity-api-1-bot (unity-api-1-bot) wrote : | # |
FAILED: Continuous integration, rev:295
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
unity-api-1-bot (unity-api-1-bot) wrote : | # |
FAILED: Continuous integration, rev:296
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
unity-api-1-bot (unity-api-1-bot) wrote : | # |
FAILED: Continuous integration, rev:297
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
unity-api-1-bot (unity-api-1-bot) wrote : | # |
FAILED: Continuous integration, rev:297
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
dinamic (dinamic6661) wrote : | # |
but now it launches apps like kate or qupzilla (qt5) that run native on mir with Xmir. i guess i can workarround this just by adding x-ubuntu-
Ted Gould (ted) wrote : | # |
On Tue, 2017-03-07 at 16:30 +0000, dinamic wrote:
> but now it launches apps like kate or qupzilla (qt5) that run native
> on mir with Xmir. i guess i can workarround this just by adding x-
> ubuntu-touch=true? to the .desktop file
There are two keys, X-Ubuntu-
just want to disable XMir I'd use the first key. If you want to sign on
to full Unity8 lifecycle and such, use the second. But yes, it will
have to be opt-in for now.
unity-api-1-bot (unity-api-1-bot) wrote : | # |
FAILED: Continuous integration, rev:298
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
dinamic (dinamic6661) wrote : | # |
i see :D thanks! o/
unity-api-1-bot (unity-api-1-bot) wrote : | # |
PASSED: Continuous integration, rev:299
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
dobey (dobey) wrote : | # |
Would prefer a Recommends for libertine-tools, but meh.
Daniel d'Andrada (dandrader) wrote : | # |
Installed that in my laptop and now all qt apps are being launched under xmir!
dobey (dobey) wrote : | # |
> Installed that in my laptop and now all qt apps are being launched under xmir!
This is correct if they don't specify they should use mir by default. We can't intuit what toolkit an app uses. Majority of toolkits do not support Mir.
Preview Diff
1 | === modified file 'debian/control' |
2 | --- debian/control 2017-02-15 15:10:07 +0000 |
3 | +++ debian/control 2017-03-07 19:04:20 +0000 |
4 | @@ -78,6 +78,7 @@ |
5 | Architecture: any |
6 | Depends: ${misc:Depends}, |
7 | ${shlibs:Depends}, |
8 | + libertine-tools, |
9 | Pre-Depends: ${misc:Pre-Depends}, |
10 | Multi-Arch: same |
11 | Description: library for sending requests to the ubuntu app launch |
12 | |
13 | === modified file 'libubuntu-app-launch/application-impl-legacy.cpp' |
14 | --- libubuntu-app-launch/application-impl-legacy.cpp 2017-02-15 15:09:51 +0000 |
15 | +++ libubuntu-app-launch/application-impl-legacy.cpp 2017-03-07 19:04:20 +0000 |
16 | @@ -62,8 +62,14 @@ |
17 | rootDir = rootenv; |
18 | } |
19 | |
20 | - appinfo_ = std::make_shared<app_info::Desktop>(appId(), _keyfile, _basedir, rootDir, |
21 | - app_info::DesktopFlags::ALLOW_NO_DISPLAY, _registry); |
22 | + auto flags = app_info::DesktopFlags::ALLOW_NO_DISPLAY; |
23 | + |
24 | + if (!g_key_file_has_key(_keyfile.get(), "Desktop Entry", "X-Ubuntu-Touch", nullptr)) |
25 | + { |
26 | + flags |= app_info::DesktopFlags::XMIR_DEFAULT; |
27 | + } |
28 | + |
29 | + appinfo_ = std::make_shared<app_info::Desktop>(appId(), _keyfile, _basedir, rootDir, flags, _registry); |
30 | |
31 | if (!_keyfile) |
32 | { |
33 | |
34 | === modified file 'tests/exec-util-test.cc' |
35 | --- tests/exec-util-test.cc 2017-02-15 15:10:07 +0000 |
36 | +++ tests/exec-util-test.cc 2017-03-07 19:04:20 +0000 |
37 | @@ -211,7 +211,7 @@ |
38 | { |
39 | StartCheckEnv("foo", { |
40 | {"APP_EXEC", [](const gchar * value) { |
41 | - EXPECT_STREQ("foo", value); }}, |
42 | + EXPECT_STREQ("libertine-launch foo", value); }}, |
43 | {"APP_DESKTOP_FILE_PATH", [](const gchar * value) { |
44 | EXPECT_STREQ(CMAKE_SOURCE_DIR "/applications/foo.desktop", value); }}, |
45 | {"APP_EXEC_POLICY", [](const gchar * value) { |
46 | @@ -222,7 +222,7 @@ |
47 | {"APP_LAUNCHER_PID", [](const gchar * value) { |
48 | EXPECT_EQ(getpid(), atoi(value)); }}, |
49 | {"APP_XMIR_ENABLE", [](const gchar * value) { |
50 | - EXPECT_STREQ("0", value); }}, |
51 | + EXPECT_STREQ("1", value); }}, |
52 | }); |
53 | } |
54 |
https:/ /bileto. ubuntu. com/#/ticket/ 2531