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

Commits:

3 changed files:

Changes:

  • projects/browser/Bundle-Data/linux/Data/fontconfig/fonts.conf deleted
    1 
    -<?xml version="1.0"?>
    2 
    -<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
    3 
    -<!--
    4 
    -**DO NOT EDIT THIS FILE!**
    5 
    -This file sets Tor Browser's bundled fonts as the only available system fonts
    6 
    -and standardizes rendering settings.
    7 
    -Any changes might deanonymize you, or expose you to fingerprinting vectors.
    8 
    --->
    9 
    -<!--
    10 
    -Derived from fonts.conf.in of Fontconfig.
    11 
    -
    12 
    -Copyright © 2000,2001,2002,2003,2004,2006,2007 Keith Packard
    13 
    -Copyright © 2005 Patrick Lam
    14 
    -Copyright © 2009 Roozbeh Pournader
    15 
    -Copyright © 2008,2009 Red Hat, Inc.
    16 
    -Copyright © 2008 Danilo Šegan
    17 
    -Copyright © 2012 Google, Inc.
    18 
    -
    19 
    -
    20 
    -Permission to use, copy, modify, distribute, and sell this software and its
    21 
    -documentation for any purpose is hereby granted without fee, provided that
    22 
    -the above copyright notice appear in all copies and that both that
    23 
    -copyright notice and this permission notice appear in supporting
    24 
    -documentation, and that the name of the author(s) not be used in
    25 
    -advertising or publicity pertaining to distribution of the software without
    26 
    -specific, written prior permission.  The authors make no
    27 
    -representations about the suitability of this software for any purpose.  It
    28 
    -is provided "as is" without express or implied warranty.
    29 
    -
    30 
    -THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
    31 
    -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
    32 
    -EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
    33 
    -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
    34 
    -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
    35 
    -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
    36 
    -PERFORMANCE OF THIS SOFTWARE.
    37 
    --->
    38 
    -<fontconfig>
    39 
    -
    40 
    -<!-- Font directory list -->
    41 
    -
    42 
    -	<dir prefix="cwd">fonts</dir>
    43 
    -
    44 
    -<!--
    45 
    -  Accept deprecated 'mono' alias, replacing it with 'monospace'
    46 
    --->
    47 
    -	<match target="pattern">
    48 
    -		<test qual="any" name="family">
    49 
    -			<string>mono</string>
    50 
    -		</test>
    51 
    -		<edit name="family" mode="assign" binding="same">
    52 
    -			<string>monospace</string>
    53 
    -		</edit>
    54 
    -	</match>
    55 
    -
    56 
    -<!--
    57 
    -  Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
    58 
    --->
    59 
    -	<match target="pattern">
    60 
    -		<test qual="any" name="family">
    61 
    -			<string>sans serif</string>
    62 
    -		</test>
    63 
    -		<edit name="family" mode="assign" binding="same">
    64 
    -			<string>sans-serif</string>
    65 
    -		</edit>
    66 
    -	</match>
    67 
    -
    68 
    -<!--
    69 
    -  Accept deprecated 'sans' alias, replacing it with 'sans-serif'
    70 
    --->
    71 
    -	<match target="pattern">
    72 
    -		<test qual="any" name="family">
    73 
    -			<string>sans</string>
    74 
    -		</test>
    75 
    -		<edit name="family" mode="assign" binding="same">
    76 
    -			<string>sans-serif</string>
    77 
    -		</edit>
    78 
    -	</match>
    79 
    -
    80 
    -<!--
    81 
    -  Set our default generic families.
    82 
    --->
    83 
    -	<match target="pattern">
    84 
    -		<test qual="any" name="family">
    85 
    -			<string>sans-serif</string>
    86 
    -		</test>
    87 
    -		<edit name="family" mode="assign" binding="same">
    88 
    -			<string>Arimo</string>
    89 
    -		</edit>
    90 
    -	</match>
    91 
    -	<match target="pattern">
    92 
    -		<test qual="any" name="family">
    93 
    -			<string>serif</string>
    94 
    -		</test>
    95 
    -		<edit name="family" mode="assign" binding="same">
    96 
    -			<string>Tinos</string>
    97 
    -		</edit>
    98 
    -	</match>
    99 
    -	<match target="pattern">
    100 
    -		<test qual="any" name="family">
    101 
    -			<string>monospace</string>
    102 
    -		</test>
    103 
    -		<edit name="family" mode="assign" binding="same">
    104 
    -			<string>Cousine</string>
    105 
    -		</edit>
    106 
    -	</match>
    107 
    -
    108 
    -<!--
    109 
    -  tor-browser#41799, tor-browser-build#41237: Add some aliases for
    110 
    -  compatibility.
    111 
    --->
    112 
    -	<match target="pattern">
    113 
    -		<test qual="any" name="family">
    114 
    -			<string>Arial</string>
    115 
    -		</test>
    116 
    -		<edit name="family" mode="assign" binding="same">
    117 
    -			<string>Arimo</string>
    118 
    -		</edit>
    119 
    -	</match>
    120 
    -	<match target="pattern">
    121 
    -		<test qual="any" name="family">
    122 
    -			<string>Times New Roman</string>
    123 
    -		</test>
    124 
    -		<edit name="family" mode="assign" binding="same">
    125 
    -			<string>Tinos</string>
    126 
    -		</edit>
    127 
    -	</match>
    128 
    -	<match target="pattern">
    129 
    -		<test qual="any" name="family">
    130 
    -			<string>Courier New</string>
    131 
    -		</test>
    132 
    -		<edit name="family" mode="assign" binding="same">
    133 
    -			<string>Cousine</string>
    134 
    -		</edit>
    135 
    -	</match>
    136 
    -	<match target="pattern">
    137 
    -		<test qual="any" name="family">
    138 
    -			<string>Helvetica</string>
    139 
    -		</test>
    140 
    -		<edit name="family" mode="assign" binding="same">
    141 
    -			<string>Arimo</string>
    142 
    -		</edit>
    143 
    -	</match>
    144 
    -	<match target="pattern">
    145 
    -		<test qual="any" name="family">
    146 
    -			<string>Times</string>
    147 
    -		</test>
    148 
    -		<edit name="family" mode="assign" binding="same">
    149 
    -			<string>Tinos</string>
    150 
    -		</edit>
    151 
    -	</match>
    152 
    -	<match target="pattern">
    153 
    -		<test qual="any" name="family">
    154 
    -			<string>Courier</string>
    155 
    -		</test>
    156 
    -		<edit name="family" mode="assign" binding="same">
    157 
    -			<string>Cousine</string>
    158 
    -		</edit>
    159 
    -	</match>
    160 
    -
    161 
    -<!-- Font cache directory list -->
    162 
    -
    163 
    -	<cachedir prefix="xdg">fontconfig</cachedir>
    164 
    -
    165 
    -	<config>
    166 
    -<!--
    167 
    -  Rescan configuration every 30 seconds when FcFontSetList is called
    168 
    - -->
    169 
    -		<rescan>
    170 
    -			<int>30</int>
    171 
    -		</rescan>
    172 
    -	</config>
    173 
    -
    174 
    -	<!-- Standardize rendering settings. -->
    175 
    -	<match target="pattern">
    176 
    -		<edit name="antialias" mode="assign"><bool>true</bool></edit>
    177 
    -		<edit name="autohint" mode="assign"><bool>false</bool></edit>
    178 
    -		<edit name="hinting" mode="assign"><bool>true</bool></edit>
    179 
    -		<edit name="hintstyle" mode="assign"><const>hintfull</const></edit>
    180 
    -		<edit name="lcdfilter" mode="assign"><const>lcddefault</const></edit>
    181 
    -		<edit name="rgba" mode="assign"><const>none</const></edit>
    182 
    -	</match>
    183 
    -</fontconfig>

  • projects/browser/RelativeLink/start-browser
    ... ... @@ -376,19 +376,6 @@ TOR_CONTROL_PASSWD environment variable."
    376 376 
     setControlPortPasswd ${TOR_CONTROL_PASSWD:='"secret"'}
    377 377 
     [% END -%]
    378 378
    379 
    -# Set up custom bundled fonts. See fonts-conf(5).
    380 
    -export FONTCONFIG_PATH="$browser_dir/fontconfig"
    381 
    -export FONTCONFIG_FILE="fonts.conf"
    382 
    -[% # tor-browser#41776: We cannot make the updater remove this file.
    383 
    -   # So, let's remove it on this script, since we know that at this point the
    384 
    -   # browser will not need it anymore.
    385 
    -   # Remove once we do a watershed release.
    386 
    - -%]
    387 
    -[% IF c("var/tor-browser") -%]
    388 
    -# Old fontconfig directory, not needed anymore
    389 
    -rm -Rf "${HOME}/TorBrowser/Data/fontconfig"
    390 
    -[% END -%]
    391 
    -
    392 379 
     # Avoid overwriting user's dconf values. Fixes #27903.
    393 380 
     export GSETTINGS_BACKEND=memory
    394 381

  • projects/browser/build
    ... ... @@ -221,19 +221,6 @@ tar -C "${TB_STAGE_DIR}" -xf [% c('input_files_by_name/firefox') %]/browser.tar.
    221 221
    222 222 
     for tbdir in "${TBDIRS[@]}"
    223 223 
     do
    224 
    -  [% IF c("var/linux") -%]
    225 
    -    mv Bundle-Data/linux/Data/fontconfig "$tbdir/"
    226 
    -    [% IF c("var/tor-browser") -%]
    227 
    -      # tor-browser#41776: We cannot remove the old fontconfig file with the
    228 
    -      # updater. So, let's keep it for the mar generation, but remove it from
    229 
    -      # new packages.
    230 
    -      # Remove once we do a watershed release.
    231 
    -      oldfontconfig="$tbdir/TorBrowser/Data/fontconfig"
    232 
    -      mkdir -p $oldfontconfig
    233 
    -      cp "$tbdir/fontconfig/fonts.conf" "$oldfontconfig/"
    234 
    -    [% END -%]
    235 
    -  [% END -%]
    236 
    -
    237 224 
       mkdir -p "$tbdir/$DOCSPATH"
    238 225 
       cp -a Bundle-Data/Docs/* "$tbdir/$DOCSPATH"
    239 226 
       [% IF c("var/tor-browser") -%]

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help