[tor-dev] Ready to Integrate/Review New Marionette Version into Tor

[Sukhbir Singh]

* John Helmsen:

> David,
> 
> Ben hit the following error while running 'make testbuild':
> 
> --2018-07-26 08:33:09--
> https://downloads.sourceforge.net/stixfonts/STIXv1.1.1-latex.zip
> Resolving downloads.sourceforge.net (downloads.sourceforge.net)...
> 216.105.38.13
> Connecting to downloads.sourceforge.net
> (downloads.sourceforge.net)|216.105.38.13|:443...
> connected.
> HTTP request sent, awaiting response... 404 Not Found
> 2018-07-26 08:33:09 ERROR 404: Not Found.

(https://trac.torproject.org/projects/tor/ticket/26949 tracks this issue.)

If you want to fix it for now, you can apply this and it should work:

    diff --git a/projects/fonts/build b/projects/fonts/build
    index 9b33da9..a1e066b 100644
    --- a/projects/fonts/build
    +++ b/projects/fonts/build
    @@ -13,8 +13,8 @@ mkdir -p $distdir
        END; %]
     
     [% IF c("var/linux") || c("var/osx") %]
    -  unzip -o STIXv1.1.1-latex.zip -d STIX
    -  cp "STIX/Fonts/fonts/opentype/public/stix/STIXMath-Regular.otf" $distdir/
    +  unzip -o 2.0.0.zip -d STIX
    +  cp "STIX/stixfonts-2.0.0/archive/STIXv1.1.1/Fonts/STIX-Word/STIXMath-Regular.otf" $distdir/
     [% END %]
     [% IF c("var/linux") %]
       cp NotoEmoji-Regular.ttf $distdir/
    diff --git a/projects/fonts/config b/projects/fonts/config
    index 1547403..9d11d2c 100644
    --- a/projects/fonts/config
    +++ b/projects/fonts/config
    @@ -102,6 +102,6 @@ input_files:
       - URL: https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158/NotoSansTC-Regular.otf
         sha256sum: e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa
         enable: '[% c("var/linux") %]'
    -  - URL: https://downloads.sourceforge.net/stixfonts/STIXv1.1.1-latex.zip
    -    sha256sum: e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8
    +  - URL: https://github.com/stipub/stixfonts/archive/2.0.0.zip
    +    sha256sum: 4327a16797dabebedce28a9075671730e22c7f74831b24b1fb91e27faec5a235
         enable: '[% c("var/linux") || c("var/osx") %]'