Changeset 222128 in webkit


Ignore:
Timestamp:
Sep 16, 2017 2:27:22 AM (7 years ago)
Author:
Carlos Garcia Campos
Message:

[GTK] Bump fontconfig version to 2.12.4
​https://bugs.webkit.org/show_bug.cgi?id=176997

Reviewed by Michael Catanzaro.

It's the latest stable version and we can get rid of the patches we have.

  • WebKitTestRunner/gtk/fonts/fonts.conf: Remove hinting config we no longer need with newer FreeType and

deprecated <blank> that current fontconfig just ignores.

  • gtk/jhbuild.modules:
  • gtk/patches/fontconfig-2.11.1-add-autogen.patch: Removed.
  • gtk/patches/fontconfig-Avoid-conflicts-with-integer-width-macros-from-TS-18661-1-2014.patch: Removed.
  • gtk/patches/fontconfig-Fix-the-build-issue-with-gperf-3.1.patch: Removed.
  • gtk/patches/fontconfig-fix-osx-cache.diff: Removed.
Location:
trunk/Tools
Files:
4 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r222122 r222128  
     12017-09-16  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Bump fontconfig version to 2.12.4
     4        https://bugs.webkit.org/show_bug.cgi?id=176997
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        It's the latest stable version and we can get rid of the patches we have.
     9
     10        * WebKitTestRunner/gtk/fonts/fonts.conf: Remove hinting config we no longer need with newer FreeType and
     11        deprecated <blank> that current fontconfig just ignores.
     12        * gtk/jhbuild.modules:
     13        * gtk/patches/fontconfig-2.11.1-add-autogen.patch: Removed.
     14        * gtk/patches/fontconfig-Avoid-conflicts-with-integer-width-macros-from-TS-18661-1-2014.patch: Removed.
     15        * gtk/patches/fontconfig-Fix-the-build-issue-with-gperf-3.1.patch: Removed.
     16        * gtk/patches/fontconfig-fix-osx-cache.diff: Removed.
     17
    1182017-09-15  Lucas Forschler  <lforschler@apple.com>
    219

  • trunk/Tools/WebKitTestRunner/gtk/fonts/fonts.conf

    r187527 r222128  
    22<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
    33<fontconfig>
    4 
    5     <!-- Due to patent (http://freetype.sourceforge.net/patents.html)
    6          issues hinting gives different results depending on the
    7          freetype version of the linux distribution, avoiding hinting
    8          gives more consistent results. When all the distributions
    9          release freetype the 2.4, which enables by default the
    10          hinting method that was patented, we could undo this change
    11          and try the hinting again. -->
    12     <match target="font">
    13         <edit name="hinting" mode="assign">
    14             <bool>false</bool>
    15         </edit>
    16     </match>
    174
    185    <!-- This system may have turned off selection of bitmap fonts, but
    … …  
    368355    </match>
    369356
    370     <config>
    371         <!-- These are the default Unicode chars that are expected to be blank
    372              in fonts. All other blank chars are assumed to be broken and won't
    373              appear in the resulting charsets -->
    374         <blank>
    375             <int>0x0020</int>    <!-- SPACE -->
    376             <int>0x00A0</int>    <!-- NO-BREAK SPACE -->
    377             <int>0x00AD</int>    <!-- SOFT HYPHEN -->
    378             <int>0x034F</int>    <!-- COMBINING GRAPHEME JOINER -->
    379             <int>0x0600</int>    <!-- ARABIC NUMBER SIGN -->
    380             <int>0x0601</int>    <!-- ARABIC SIGN SANAH -->
    381             <int>0x0602</int>    <!-- ARABIC FOOTNOTE MARKER -->
    382             <int>0x0603</int>    <!-- ARABIC SIGN SAFHA -->
    383             <int>0x06DD</int>    <!-- ARABIC END OF AYAH -->
    384             <int>0x070F</int>    <!-- SYRIAC ABBREVIATION MARK -->
    385             <int>0x115F</int>    <!-- HANGUL CHOSEONG FILLER -->
    386             <int>0x1160</int>    <!-- HANGUL JUNGSEONG FILLER -->
    387             <int>0x1680</int>    <!-- OGHAM SPACE MARK -->
    388             <int>0x17B4</int>    <!-- KHMER VOWEL INHERENT AQ -->
    389             <int>0x17B5</int>    <!-- KHMER VOWEL INHERENT AA -->
    390             <int>0x180E</int>    <!-- MONGOLIAN VOWEL SEPARATOR -->
    391             <int>0x2000</int>    <!-- EN QUAD -->
    392             <int>0x2001</int>    <!-- EM QUAD -->
    393             <int>0x2002</int>    <!-- EN SPACE -->
    394             <int>0x2003</int>    <!-- EM SPACE -->
    395             <int>0x2004</int>    <!-- THREE-PER-EM SPACE -->
    396             <int>0x2005</int>    <!-- FOUR-PER-EM SPACE -->
    397             <int>0x2006</int>    <!-- SIX-PER-EM SPACE -->
    398             <int>0x2007</int>    <!-- FIGURE SPACE -->
    399             <int>0x2008</int>    <!-- PUNCTUATION SPACE -->
    400             <int>0x2009</int>    <!-- THIN SPACE -->
    401             <int>0x200A</int>    <!-- HAIR SPACE -->
    402             <int>0x200B</int>    <!-- ZERO WIDTH SPACE -->
    403             <int>0x200C</int>    <!-- ZERO WIDTH NON-JOINER -->
    404             <int>0x200D</int>    <!-- ZERO WIDTH JOINER -->
    405             <int>0x200E</int>    <!-- LEFT-TO-RIGHT MARK -->
    406             <int>0x200F</int>    <!-- RIGHT-TO-LEFT MARK -->
    407             <int>0x2028</int>    <!-- LINE SEPARATOR -->
    408             <int>0x2029</int>    <!-- PARAGRAPH SEPARATOR -->
    409             <int>0x202A</int>    <!-- LEFT-TO-RIGHT EMBEDDING -->
    410             <int>0x202B</int>    <!-- RIGHT-TO-LEFT EMBEDDING -->
    411             <int>0x202C</int>    <!-- POP DIRECTIONAL FORMATTING -->
    412             <int>0x202D</int>    <!-- LEFT-TO-RIGHT override -->
    413             <int>0x202E</int>    <!-- RIGHT-TO-LEFT override -->
    414             <int>0x202F</int>    <!-- NARROW NO-BREAK SPACE -->
    415             <int>0x205F</int>    <!-- MEDIUM MATHEMATICAL SPACE -->
    416             <int>0x2060</int>    <!-- WORD JOINER -->
    417             <int>0x2061</int>    <!-- FUNCTION APPLICATION -->
    418             <int>0x2062</int>    <!-- INVISIBLE TIMES -->
    419             <int>0x2063</int>    <!-- INVISIBLE SEPARATOR -->
    420             <int>0x206A</int>    <!-- INHIBIT SYMMETRIC SWAPPING -->
    421             <int>0x206B</int>    <!-- ACTIVATE SYMMETRIC SWAPPING -->
    422             <int>0x206C</int>    <!-- INHIBIT ARABIC FORM SHAPING -->
    423             <int>0x206D</int>    <!-- ACTIVATE ARABIC FORM SHAPING -->
    424             <int>0x206E</int>    <!-- NATIONAL DIGIT SHAPES -->
    425             <int>0x206F</int>    <!-- NOMINAL DIGIT SHAPES -->
    426             <int>0x3000</int>    <!-- IDEOGRAPHIC SPACE -->
    427             <int>0x3164</int>    <!-- HANGUL FILLER -->
    428             <int>0xFEFF</int>    <!-- ZERO WIDTH NO-BREAK SPACE -->
    429             <int>0xFFA0</int>    <!-- HALFWIDTH HANGUL FILLER -->
    430             <int>0xFFF9</int>    <!-- INTERLINEAR ANNOTATION ANCHOR -->
    431             <int>0xFFFA</int>    <!-- INTERLINEAR ANNOTATION SEPARATOR -->
    432             <int>0xFFFB</int>    <!-- INTERLINEAR ANNOTATION TERMINATOR -->
    433         </blank>
    434     </config>
    435357</fontconfig>

  • trunk/Tools/gtk/jhbuild.modules

    r222028 r222128  
    247247      <dep package="libxml2"/>
    248248    </dependencies>
    249     <branch module="software/fontconfig/release/fontconfig-2.11.1.tar.gz" version="2.11.1"
     249    <branch module="software/fontconfig/release/fontconfig-2.12.4.tar.bz2" version="2.12.4"
    250250            repo="freedesktop.org"
    251             hash="sha256:b6b066c7dce3f436fdc0dfbae9d36122b38094f4f53bd8dffd45e195b0540d8d"
    252             md5sum="e75e303b4f7756c2b16203a57ac87eba">
    253       <patch file="fontconfig-fix-osx-cache.diff" strip="1"/>
    254 
    255       <!-- These will be in the next release after 2.12.1
    256            https://cgit.freedesktop.org/fontconfig/commit/?id=1ab5258f7c2abfafcd63a760ca08bf93591912da
    257            https://cgit.freedesktop.org/fontconfig/commit/?id=9878b306f6c673d3d6cd9db487f67eb426cc03df -->
    258       <patch file="fontconfig-Avoid-conflicts-with-integer-width-macros-from-TS-18661-1-2014.patch" strip="1"/>
    259       <patch file="fontconfig-Fix-the-build-issue-with-gperf-3.1.patch" strip="1"/>
    260 
    261       <!-- The previous patch modifies "configure.ac", and tarballs don't
    262            include the "autogen.sh" script, so let's re-add it here. -->
    263       <patch file="fontconfig-2.11.1-add-autogen.patch" strip="0"/>
    264     </branch>
     251            hash="sha256:668293fcc4b3c59765cdee5cee05941091c0879edcc24dfec5455ef83912e45c"/>
    265252  </autotools>
    266253
Note: See TracChangeset for help on using the changeset viewer.