Second rebase for Mullvad Browser based on 102.9 ESR
requested to merge morgan/mullvad-browser:mullvad-browser-rebase into mullvad-browser-102.9.0esr-12.0-2
Merge Info
Related Issues
Backport Timeline
-
Immediate - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build) -
Next Minor Stable Release - patchset that needs to be verified in nightly before backport -
Eventually - patchset that needs to be verified in alpha before backport -
No Backport - patchset for the next major stable
Issue Tracking
-
Link resolved issues with appropriate Release Prep issue for changelog generation
Change Description
Rebase the existing Mullvad Browser patches to a 12.0-2 branch, squash together fixups!, migrates base-browser patches and fixups! to start of Mullvad Browser patch set after the base-browser tag in the same relative order as in base-browser.
Diff of diffs is perfect except for a change in browser/app/Makefile.in:
- printf APPLMOZB > '$(dist_dest)/Contents/PkgInfo'
+ printf APPLMULB > '$(dist_dest)/Contents/PkgInfo'
This line was originally changed to APPLMULB
in MB 1: Mullvad Browser branding
and then reverted to APPLMOZB
in Bug 4234: Use the Firefox Update Process for Base Browser.
. Re-ordering the patches (putting the updater patch closer to base-browser) changed the order so now it's back to APPMULB
again.
I'm not sure whether the original revert in the updater patch was accidental or not so I'm calling it out here.
/cc @pierov