Merge ~3v1n0/ubuntu-app-platform:master into ubuntu-app-platform:master

Proposed by Marco Trevisan (Treviño)
Status: Merged
Merged at revision: ac442a2813c6d6b6f3cfa4372cd328f6d4bf9060
Proposed branch: ~3v1n0/ubuntu-app-platform:master
Merge into: ubuntu-app-platform:master
Prerequisite: ~3v1n0/ubuntu-app-platform:remove-obsolete-plugins
Diff against target: 18 lines (+2/-1)
1 file modified
snapcraft.yaml (+2/-1)
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve
Tim Peeters Needs Information
Review via email: mp+311953@code.launchpad.net

This proposal supersedes a proposal from 2016-11-28.

Commit message

snapcraft.yaml: load indicator-qt5 remote part

It adds proper support to app-indicators in classic space.

Description of the change

See https://github.com/3v1n0/indicators-examples-snaps for more infos or the part definition at https://github.com/3v1n0/appindicators-snapcraft-parts

Removed also the unneeded and outdated custom plugins (the x-qmake one specifically was pointing to the wrong location, thus causing indicator-qt5 not to compile).

To post a comment you must log in.
Revision history for this message
Tim Peeters (tpeeters) wrote : Posted in a previous version of this proposal

Thanks for the MR, but can you separate adding of a dependency and removing the plugins into separate MRs to make it easier to review?

Perhaps a bug report describing the the outdated plugins is useful too.

review: Needs Fixing
Revision history for this message
Tim Peeters (tpeeters) wrote :

Why does this need to go in the ubuntu-app-platform?

Perhaps the question is similar for [desktop-ubuntu-app-platform], see https://wiki.ubuntu.com/snapcraft/parts. That needs to be included in the after: for apps that use ubuntu-app-platform. But perhaps we can just include it all in the platform snap?

review: Needs Information
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Mh, I'm not sure what you mean...

Adding it to the after part of desktop-ubuntu-app-platform, isn't probably the best thing, as I think if this is just available for all the apps using the app-platform.

Anyway this will will work only in unity7, as for unity8 we still need to address this.

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

No news in this?

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Sorry, I was on a long leave when this was discussed.

So, compile appmenu-qt5 as part of every application build? Wouldn't it be possible to just stage appmenu-qt5 in ubuntu-app-platform to share also that? If one needs the to-be-SRU:d patches to xenial and there are SRU problems, maybe it'd make sense to land to xenial overlay PPA instead as ubuntu-app-platform is anyway built with the overlay PPA.

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

> So, compile appmenu-qt5 as part of every application build?

Nope, being this in the runtime, it will be needed only when compiling the runtime, so... It doesn't seem like a problem to me, in the mean time.

> Wouldn't it be possible to just stage appmenu-qt5 in ubuntu-app-platform to
> share also that?

That was my idea, but needs time to SRU...

> maybe it'd make sense to land to xenial overlay PPA instead as ubuntu-app-platform
> is anyway built with the overlay PPA.

Ok, this is a better thing... I've added a no-change rebuild here:
https://bileto.ubuntu.com/#/ticket/2487

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Timo, since appmenu-qt5 is in xenial+overlay, I've updated the branch accordingly,

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

This should be ok, just that currently not allowed to upload anything new even to the edge channel so this won't be in store yet.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/snapcraft.yaml b/snapcraft.yaml
index c9cd641..58ea1d0 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -100,6 +100,8 @@ parts:
100 - qtdeclarative5-ubuntu-contacts0.1100 - qtdeclarative5-ubuntu-contacts0.1
101 # Add a droid derived Sans-Serif style CJK font101 # Add a droid derived Sans-Serif style CJK font
102 - fonts-wqy-microhei102 - fonts-wqy-microhei
103 # Unity7 desktop integration (menus and indicators with snap support)
104 - appmenu-qt5
103 # OSK105 # OSK
104 - ubuntu-keyboard-arabic106 - ubuntu-keyboard-arabic
105 - ubuntu-keyboard-autopilot107 - ubuntu-keyboard-autopilot
@@ -162,4 +164,3 @@ parts:
162 - etc/xdg/maliit.org/164 - etc/xdg/maliit.org/
163 - usr/lib/maliit/plugins165 - usr/lib/maliit/plugins
164 - usr/share/maliit/plugins166 - usr/share/maliit/plugins
165

Subscribers

People subscribed via source and target branches