Bug 40860: Improve the transition from the old fontconfig file to the new one

Merge Info

Related Issues

• tor-browser#41776 (closed)
• #40860 (closed)

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

See the issue.

/cc @richard

projects/browser/RelativeLink/start-browser

@@ -340,6 +340,15 @@ setControlPortPasswd ${TOR_CONTROL_PASSWD:='"secret"'}
 # Set up custom bundled fonts. See fonts-conf(5).
 export FONTCONFIG_PATH="${HOME}/fontconfig"
 export FONTCONFIG_FILE="fonts.conf"
+[% # tor-browser#41776: We cannot make the updater remove this file.
+   # So, let's remove it on this script, since we know that at this point the
+   # browser will not need it anymore.
+   # Remove once we do a watershed release.
+ -%]
+[% IF c("var/tor-browser") -%]
+# Old fontconfig directory, not needed anymore
+rm -Rf "${HOME}/TorBrowser/Data/fontconfig"
+[% END -%]
 
 # Avoid overwriting user's dconf values. Fixes #27903.
 export GSETTINGS_BACKEND=memory