1390071 - Snap: Missing .desktop file

Status: RESOLVED FIXED

(Release Engineering :: Release Requests, defect)

Description

[Johan Lorenzo [:jlorenzo]]

First review came out of the Snap Store:

> desktop interfaces (unity7,x11) specified without a corresponding meta/gui/*.desktop
> file. If using snapcraft, please see https://snapcraft.io/docs/build-snaps/metadata#fixed-assets.
> Otherwise, please provide a desktop file in meta/gui/*.desktop (it should reference one of
> the 'apps' from your snapcraft/snap.yaml). lint-snap-v2_meta_gui_desktop
> 
> Please provide a desktop file and reupload.
> 
> Thank you for uploading a snap!
> 
> To check review details, go to https://dashboard.snapcraft.io/dev/snaps/8148/review/rev/1/

Comment 1

[Johan Lorenzo [:jlorenzo]]

Attachment: Bug 1390071 - Snap: Add required .desktop file

Review commit: https://reviewboard.mozilla.org/r/168292/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/168292/

Comment 2

[Mihai Tabara [:mtabara]⌚️GMT]

Comment on attachment 8896986 [details]
Bug 1390071 - Snap: Add required .desktop file

https://reviewboard.mozilla.org/r/168292/#review173478

Comment 3

[Johan Lorenzo [:jlorenzo]]

This is a first revision. The desktop file come from the one they used at Ubuntu[1], so the Ubuntu people won't see any change. I manually replaced the variables because:
* MOZ_OFFICIAL_BRANDING => We currently only ship official builds
* @MOZ_DISPLAY_NAME@ => Same thing. I replaced it by "Firefox"
* @MOZ_APP_NAME@ => Thanks to our snapcraft.yaml[2], we know the command line will be "firefox" alone.

We should probably depend on the l10n toolchain. I filed bug 1390152 to keep track of this. 

[1] http://bazaar.launchpad.net/~mozillateam/firefox/firefox-trunk.head/view/head:/debian/firefox.desktop.in
[2] https://searchfox.org/mozilla-central/rev/6482c8a5fa5c7446e82ef187d1a1faff49e3379e/taskcluster/docker/firefox-snap/snapcraft.yaml.in#8

Comment 4

[Johan Lorenzo [:jlorenzo]]

I tested the patch locally with an ubuntu docker instance. I crafted the snap, and extracted it[1] and verified that the file:
> squashfs-root/meta/gui/firefox.desktop
existed.

snapcraft didn't report any additional error.

[1] unsquashfs firefox_*_amd64.snap

Comment 5

[Johan Lorenzo [:jlorenzo]]

Landed on beta at: https://hg.mozilla.org/releases/mozilla-beta/rev/5f81b09432e0f866815ef111c2bc761128adcd53

Landing on central will follow after the next beta, if it worked.

Comment 6

[Nick Thomas [:nthomas] (UTC+12)]

For 56.0b3 build1 we got:
The path 'prime/distribution/firefox.desktop' set for 'desktop' in 'firefox' does not exist.

Full log - http://mozilla-release-logs.s3.amazonaws.com/mozilla-beta/firefox-56.0b3/build1/mozilla-beta_snap_generation-all-HgAhgaYZT4q1QV5uT-ApUg-0

Comment 7

[Johan Lorenzo [:jlorenzo]]

Hmmm, that part was working for me on a local ubuntu docker image. I ran snapcraft v2.33. Maybe the real docker image is too old. I'm looking into this.

Comment 8

[Johan Lorenzo [:jlorenzo]]

Attachment: bug1390071-part2.patch

My previous guess was wrong. We use the latest snapcraft client, because we perform a `dist-upgrade` at each run.

That was working on another instance because I hadn't run `runme.sh` but copy and pasted some commands. I reproduce the error locally, on the real docker image, with `runme.sh`. This fixes the missing desktop file.

Comment 9

[Mihai Tabara [:mtabara]⌚️GMT]

Comment on attachment 8897786 [details] [diff] [review]
bug1390071-part2.patch

Review of attachment 8897786 [details] [diff] [review]:
-----------------------------------------------------------------

Sgtm. Sorry I didn't catch this in review either :(

Comment 10

[Johan Lorenzo [:jlorenzo]]

Part 2 landed on beta at https://hg.mozilla.org/releases/mozilla-beta/rev/0c44b874c9f5de687e4f3bb72c60da65d6c5c5c8

Comment 11

[Johan Lorenzo [:jlorenzo]]

Was fixed in comment 10.

Comment 12

[Johan Lorenzo [:jlorenzo]]

Oops, I just realized that landed only on beta (56) back then. I should fix it in 57 too.

Comment 13

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/0741dc11bd62
Snap: Add required .desktop file r=mtabara

Comment 14

[Johan Lorenzo [:jlorenzo]]

57 is currently in both mozilla-central and mozilla-beta. Uplift will be done by sheriffs after comment 13 reached central.

Comment 15

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/0741dc11bd62

Comment 16

[Johan Lorenzo [:jlorenzo]]

Landed on beta https://hg.mozilla.org/releases/mozilla-beta/rev/d9d005572999dd76652d5d8d40a87cc78b0b4866