Ignore:
Timestamp:
01/26/2016 06:29:53 AM (8 years ago)
Author:
DJ Lucas <dj@…>
Branches:
systemd-13485
Children:
fd21cdf
Parents:
a6a9fc5
Message:

Merge Chapter 10 changes from trunk, fix boost sed (from trunk).

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@16844 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:
1 edited

Legend:

Unmodified
Added
Removed
  • general/graphlib/freetype2.xml

    ra6a9fc5 r94b4def9  
    66
    77  <!ENTITY freetype2-download-http "&sourceforge-repo;/freetype/freetype-&freetype2-version;.tar.bz2">
    8   <!ENTITY freetype2-download-ftp  " ">
    9   <!ENTITY freetype2-md5sum        "35cb8f4d9e5906847901bb39324c2f80">
     8  <!ENTITY freetype2-download-ftp  "&gentoo-ftp-repo;/freetype-&freetype2-version;.tar.bz2">
     9  <!ENTITY freetype2-md5sum        "86109d0c998787d81ac582bad9adf82e">
    1010  <!ENTITY freetype2-size          "1.7 MB">
    11   <!ENTITY freetype2-buildsize     "33 MB">
    12   <!ENTITY freetype2-time          "0.2 SBU">
    13 
    14   <!ENTITY freetype2-doc-version       "2.6">
     11  <!ENTITY freetype2-buildsize     "34 MB (includes installing additional documentation)">
     12  <!ENTITY freetype2-time          "0.2 SBU (includes installing additional documentation)">
     13
     14  <!ENTITY freetype2-doc-version   "2.6.2">
    1515  <!ENTITY freetype2-doc-download-http "&sourceforge-repo;/freetype/freetype-doc-&freetype2-doc-version;.tar.bz2">
    16   <!ENTITY freetype2-doc-download-ftp  " ">
    17   <!ENTITY freetype2-doc-md5sum        "9a6f668a2bef1ac3f65c619af22a17bc">
     16  <!ENTITY freetype2-doc-download-ftp  "&gentoo-ftp-repo;/freetype-doc-&freetype2-doc-version;.tar.bz2">
     17  <!ENTITY freetype2-doc-md5sum        "22bd94ab15fc4b434e20161b866d7c3e">
    1818  <!ENTITY freetype2-doc-size          "468 KB">
    1919]>
     
    5151        </para>
    5252      </listitem>
    53       <listitem>
     53<!--      <listitem>
    5454        <para>
    5555          Download (FTP): <ulink url="&freetype2-download-ftp;"/>
    5656        </para>
    57       </listitem>
     57      </listitem> -->
    5858      <listitem>
    5959        <para>
     
    8686        </para>
    8787      </listitem>
    88       <listitem>
     88<!--      <listitem>
    8989        <para>
    9090          Download (FTP): <ulink url="&freetype2-doc-download-ftp;"/>
    9191        </para>
    92       </listitem>
     92      </listitem> -->
    9393      <listitem>
    9494        <para>
     
    104104
    105105    <bridgehead renderas="sect3">FreeType2 Dependencies</bridgehead>
    106  
     106
    107107    <bridgehead renderas="sect4">Recommended</bridgehead>
    108108    <para role="recommended">
     
    134134    </para>
    135135
    136 <screen><userinput>sed -i  -e "/AUX.*.gxvalid/s@^# @@" \
    137         -e "/AUX.*.otvalid/s@^# @@" \
    138         modules.cfg                        &amp;&amp;
    139 
    140 sed -ri -e 's:.*(#.*SUBPIXEL.*) .*:\1:' \
    141         include/freetype/config/ftoption.h          &amp;&amp;
     136<screen><userinput>sed -e "/AUX.*.gxvalid/s@^# @@" \
     137    -e "/AUX.*.otvalid/s@^# @@" \
     138    -i modules.cfg              &amp;&amp;
     139
     140sed -e 's:.*\(#.*SUBPIXEL.*\) .*:\1:' \
     141    -i include/freetype/config/ftoption.h  &amp;&amp;
    142142
    143143./configure --prefix=/usr --disable-static &amp;&amp;
     
    165165      table validation and second command enables Subpixel Rendering and
    166166      Subpixel Hinting in order to improve font rendering. Note that Subpixel
    167       Rendering may have patent issues. Be sure to read the <literal>'Other
     167      Rendering may have patent issues.  Be sure to read the <literal>'Other
    168168      patent issues'</literal> part of
    169169      <ulink url="http://www.freetype.org/patents.html"/>
Note: See TracChangeset for help on using the changeset viewer.