[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 40830: The fontconfig directory is missing in Base Browser

[Pier Angelo Vendrame (@pierov)]

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build


Commits:
07f09f39 by Pier Angelo Vendrame at 2023-03-29T09:37:33+02:00
Bug 40830: The fontconfig directory is missing in Base Browser

- - - - -


2 changed files:

- projects/browser/RelativeLink/start-browser
- projects/browser/build


Changes:

=====================================
projects/browser/RelativeLink/start-browser
=====================================
@@ -338,7 +338,7 @@ setControlPortPasswd ${TOR_CONTROL_PASSWD:='"secret"'}
 [% END -%]
 
 # Set up custom bundled fonts. See fonts-conf(5).
-export FONTCONFIG_PATH="${HOME}/[% c('var/ProjectName') %]/Data/fontconfig"
+export FONTCONFIG_PATH="${HOME}/fontconfig"
 export FONTCONFIG_FILE="fonts.conf"
 
 # Avoid overwriting user's dconf values. Fixes #27903.


=====================================
projects/browser/build
=====================================
@@ -219,6 +219,10 @@ tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/browser.tar.gz
 
 for tbdir in "${TBDIRS[@]}"
 do
+  [% IF c("var/linux") -%]
+    mv Bundle-Data/linux/Data/fontconfig "$tbdir/"
+  [% END -%]
+
   mkdir -p "$tbdir/$DOCSPATH"
   cp -a Bundle-Data/Docs/* "$tbdir/$DOCSPATH"
   [% IF c("var/tor-browser") -%]



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/07f09f3999ef20e64ba6a26569938517c4f1bfa3

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/07f09f3999ef20e64ba6a26569938517c4f1bfa3
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20230329/4fe29057/attachment-0001.htm>