Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
-
c78f6080
by Pier Angelo Vendrame at 2023-05-17T19:15:20+02:00
2 changed files:
Changes:
| ... | ... | @@ -340,6 +340,15 @@ setControlPortPasswd ${TOR_CONTROL_PASSWD:='"secret"'} |
| 340 | 340 | # Set up custom bundled fonts. See fonts-conf(5).
|
| 341 | 341 | export FONTCONFIG_PATH="${HOME}/fontconfig"
|
| 342 | 342 | export FONTCONFIG_FILE="fonts.conf"
|
| 343 | +[% # tor-browser#41776: We cannot make the updater remove this file.
|
|
| 344 | + # So, let's remove it on this script, since we know that at this point the
|
|
| 345 | + # browser will not need it anymore.
|
|
| 346 | + # Remove once we do a watershed release.
|
|
| 347 | + -%]
|
|
| 348 | +[% IF c("var/tor-browser") -%]
|
|
| 349 | +# Old fontconfig directory, not needed anymore
|
|
| 350 | +rm -Rf "${HOME}/TorBrowser/Data/fontconfig"
|
|
| 351 | +[% END -%]
|
|
| 343 | 352 | |
| 344 | 353 | # Avoid overwriting user's dconf values. Fixes #27903.
|
| 345 | 354 | export GSETTINGS_BACKEND=memory
|
| ... | ... | @@ -222,6 +222,15 @@ for tbdir in "${TBDIRS[@]}" |
| 222 | 222 | do
|
| 223 | 223 | [% IF c("var/linux") -%]
|
| 224 | 224 | mv Bundle-Data/linux/Data/fontconfig "$tbdir/"
|
| 225 | + [% IF c("var/tor-browser") -%]
|
|
| 226 | + # tor-browser#41776: We cannot remove the old fontconfig file with the
|
|
| 227 | + # updater. So, let's keep it for the mar generation, but remove it from
|
|
| 228 | + # new packages.
|
|
| 229 | + # Remove once we do a watershed release.
|
|
| 230 | + oldfontconfig="$tbdir/TorBrowser/Data/fontconfig"
|
|
| 231 | + mkdir -p $oldfontconfig
|
|
| 232 | + cp "$tbdir/fontconfig/fonts.conf" "$oldfontconfig/"
|
|
| 233 | + [% END -%]
|
|
| 225 | 234 | [% END -%]
|
| 226 | 235 | |
| 227 | 236 | mkdir -p "$tbdir/$DOCSPATH"
|
| ... | ... | @@ -357,6 +366,12 @@ cd $distdir |
| 357 | 366 | [% END -%]
|
| 358 | 367 | |
| 359 | 368 | [% IF c("var/linux") %]
|
| 369 | + [% IF c("var/tor-browser") %]
|
|
| 370 | + # We need the old fontconfig files only when updating from old installations
|
|
| 371 | + # that include it, but do not add it to new packages!
|
|
| 372 | + # Remove once we do a watershed release.
|
|
| 373 | + rm -rf "$TBDIR/TorBrowser/Data/fontconfig"
|
|
| 374 | + [% END -%]
|
|
| 360 | 375 | [% c('tar', {
|
| 361 | 376 | tar_src => [ '$PKG_DIR' ],
|
| 362 | 377 | tar_args => '-cJf $OUTDIR/' _ c("var/project-name") _ '-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_${PKG_LOCALE}.tar.xz',
|