1836718 - Snap build fails to apply native-messaging-portal.patch since conversion of NativeMessaging to ES module

Status: RESOLVED FIXED

(Firefox Build System :: Third Party Packaging, defect)

Description

[Kestrel]

Snap build error:

Applying patch /root/project/patches/native-messaging-portal.patch
...
can't find file to patch at input line 50
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- a/toolkit/components/extensions/NativeMessaging.jsm
|+++ b/toolkit/components/extensions/NativeMessaging.jsm
--------------------------
No file to patch.  Skipping patch.

https://github.com/canonical/firefox-snap/actions/workflows/nightly-build.yml

Regressed by Bug 1824612.

Comment 1

[:gerard-majax]

Looks like Amin is already working on this.

Comment 2

[Amin Bandali [:bandali]]

I've been indeed. :) I pushed 9dbf42bce65d4018552fdc10d560ec9f53b457df to nightly, refreshing the patch. It has fixed the nightly build, and after a quick double-check by Alexandre, I'll cherry-pick it to beta as well.

Comment 3

[:gerard-majax]

Gentle reminder that you also need to take over https://phabricator.services.mozilla.com/D140803 and update it

Comment 4

[Amin Bandali [:bandali]]

Ack, I've taken over https://phabricator.services.mozilla.com/D140803 per your suggestion, and it is on my todo list.

Comment 5

[Donal Meehan [:dmeehan]]

I see the cherry-pick to beta mentioned in comment 2 was pushed - 0b8b579c22e3032da712ccdc3c2c63ee3579bb6a
:gerard-majax anything else needed here or can this be resolved?

Comment 6

[:gerard-majax]

I'll let Amin answer, but I believe we want to close when the updated patch has made it to phab.

Comment 7

[Amin Bandali [:bandali]]

Indeed. I just pushed to https://phabricator.services.mozilla.com/D140803 rebasing against latest central and changing a call to ChromeUtils.import to ChromeUtils.importESModule.

./mach build and ./mach test toolkit/components/extensions/test/xpcshell/test_ext_native_messaging_portal.js both passed locally on my machine, so I'll go ahead and mark this as resolved.

Tangentially related, I'll later look more closely into the diffs between the patch in Phabricator and the one we carry in firefox-snap.git, but from a quick look, we don't seem to have anything in firefox-snap.git that isn't in Phabricator.