Changeset af73a280 for general


Ignore:
Timestamp:
06/05/2013 09:28:44 AM (11 years ago)
Author:
Krejzi <krejzi@…>
Branches:
systemd-11177
Children:
5b00a2a
Parents:
13e0a61
Message:

Merge trunk and systemd branch.

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

Location:
general
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • general/genlib/icu.xml

    r13e0a61 raf73a280  
    88           "http://download.icu-project.org/files/icu4c/&icu-version;/icu4c-&icu-dl-version;-src.tgz">
    99  <!ENTITY icu-download-ftp  " ">
    10   <!ENTITY icu-md5sum        "6eef33b229d0239d654983028c9c7053">
     10  <!ENTITY icu-md5sum        "072e501b87065f3a0ca888f1b5165709">
    1111  <!ENTITY icu-size          "21 MB">
    12   <!ENTITY icu-buildsize     "285 MB">
    13   <!ENTITY icu-time          "1.5 SBU">
     12  <!ENTITY icu-buildsize     "288 MB">
     13  <!ENTITY icu-time          "1.0 SBU">
    1414]>
    1515

  • general/genlib/libdbusmenuqt.xml

    r13e0a61 raf73a280  
    7070    <bridgehead renderas="sect4">Required</bridgehead>
    7171    <para role="required">
    72     <xref linkend="qt"/>
     72    <xref linkend="qt4"/>
    7373    </para>
    7474
    … …  
    9292<screen><userinput>mkdir build &amp;&amp;
    9393cd build &amp;&amp;
    94 cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
     94cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
    9595      -DWITH_DOC=OFF .. &amp;&amp;
    9696make</userinput></screen>
    … …  
    126126        <seg>None</seg>
    127127        <seg>libdbusmenu-qt.so</seg>
    128         <seg>&qt-dir;/include/dbusmenu-qt</seg>
     128        <seg>&qt4-dir;/include/dbusmenu-qt</seg>
    129129      </seglistitem>
    130130    </segmentedlist>

  • general/genlib/pcre.xml

    r13e0a61 raf73a280  
    77  <!ENTITY pcre-download-http "&sourceforge-repo;/pcre/pcre-&pcre-version;.tar.bz2">
    88  <!ENTITY pcre-download-ftp  "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-&pcre-version;.tar.bz2">
    9   <!ENTITY pcre-md5sum        "62f02a76bb57a40bc66681760ed511d5">
    10   <!ENTITY pcre-size          "1.3 MB">
    11   <!ENTITY pcre-buildsize     "16 MB">
    12   <!ENTITY pcre-time          "0.3 SBU">
     9  <!ENTITY pcre-md5sum        "21514018448ac10062ece7a668fca949">
     10  <!ENTITY pcre-size          "1.4 MB">
     11  <!ENTITY pcre-buildsize     "18 MB">
     12  <!ENTITY pcre-time          "0.2 SBU">
    1313]>
    1414
    … …  
    7979    <para role="optional">
    8080      <ulink url="http://valgrind.org/">Valgrind</ulink>
     81<!-- -&#45;enable-pcretest-libedit (redundant as long as LFS installs libreadline
     82      and <ulink url="http://www.thrysoee.dk/editline/">libedit</ulink>
     83-->
    8184    </para>
    8285
    … …  
    100103            --enable-pcregrep-libz            \
    101104            --enable-pcregrep-libbz2          \
     105            --enable-pcretest-libreadline     \
    102106            --disable-static                 &amp;&amp;
    103107make</userinput></screen>
    … …  
    113117<screen role="root"><userinput>make install                     &amp;&amp;
    114118mv -v /usr/lib/libpcre.so.* /lib &amp;&amp;
    115 ln -sfv ../../lib/libpcre.so.1.2.0 /usr/lib/libpcre.so</userinput></screen>
     119ln -sfv ../../lib/libpcre.so.1.2.1 /usr/lib/libpcre.so</userinput></screen>
    116120
    117121  </sect2>
    … …  
    142146      support to <command>pcregrep</command> to read
    143147      <filename class="extension">.bz2</filename> compressed files.
     148    </para>
     149
     150    <para>
     151      <option>--enable-pcretest-libreadline</option>: This switch adds line
     152      editing and history features to <command>pcretest</command> program.
    144153    </para>
    145154

  • general/genlib/qca.xml

    r13e0a61 raf73a280  
    7272    <bridgehead renderas="sect4">Required</bridgehead>
    7373    <para role="required">
    74     <xref linkend="qt"/> and
     74    <xref linkend="qt4"/> and
    7575    <xref linkend="which"/>
    7676    </para>
    … …  
    8888
    8989<screen><userinput>sed -i '217s@set@this->set@' src/botantools/botan/botan/secmem.h &amp;&amp;
    90 ./configure --prefix=&qt-dir; \
     90./configure --prefix=&qt4-dir; \
    9191            --certstore-path=/etc/ssl/ca-bundle.crt &amp;&amp;
    9292make</userinput></screen>
    … …  
    124124        <seg>qcatool2 and qcatool2.debug</seg>
    125125        <seg>libqca.so and libqca.so.&qca-version;.debug</seg>
    126         <seg>&qt-dir;/include/QtCrypto and &qt-dir;/share/qca</seg>
     126        <seg>&qt4-dir;/include/QtCrypto and &qt4-dir;/share/qca</seg>
    127127      </seglistitem>
    128128    </segmentedlist>

  • general/genlib/qjson.xml

    r13e0a61 raf73a280  
    7575    <bridgehead renderas="sect4">Required</bridgehead>
    7676    <para role="required">
    77       <xref linkend="qt"/> and
     77      <xref linkend="qt4"/> and
    7878      <xref linkend="cmake"/>
    7979    </para>   
    … …  
    9494<screen><userinput>mkdir build &amp;&amp;
    9595cd build &amp;&amp;
    96 cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
     96cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
    9797      -DCMAKE_BUILD_TYPE=Release \
    9898      .. &amp;&amp;
    … …  
    126126        </seg>
    127127        <seg>
    128           &qt-dir;/include/json and &qt-dir;/lib/cmake/qjson
     128          &qt4-dir;/include/json and &qt4-dir;/lib/cmake/qjson
    129129        </seg>
    130130      </seglistitem>

  • general/genutils/graphviz.xml

    r13e0a61 raf73a280  
    101101      <xref linkend="gs"/>,
    102102      <xref linkend="gtk2"/> and
    103       <xref linkend="qt"/>
     103      <xref linkend="qt4"/>
    104104    </para>
    105105

  • general/genutils/pinentry.xml

    r13e0a61 raf73a280  
    7272      <xref linkend="gtk2"/>,
    7373      <xref linkend="libcap2"/> and
    74       <xref linkend="qt"/>
     74      <xref linkend="qt4"/>
    7575    </para>
    7676

  • general/graphlib/harfbuzz.xml

    r13e0a61 raf73a280  
    88           "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-&harfbuzz-version;.tar.bz2">
    99  <!ENTITY harfbuzz-download-ftp  " ">
    10   <!ENTITY harfbuzz-md5sum        "90855e670c790c1fec4592908be3c0b8">
    11   <!ENTITY harfbuzz-size          "884 KB">
    12   <!ENTITY harfbuzz-buildsize     "32 MB">
    13   <!ENTITY harfbuzz-time          "0.3 SBU">
     10  <!ENTITY harfbuzz-md5sum        "0bff05fafef4894031b2b64a65ac1899">
     11  <!ENTITY harfbuzz-size          "882 KB">
     12  <!ENTITY harfbuzz-buildsize     "24 MB">
     13  <!ENTITY harfbuzz-time          "0.2 SBU">
    1414]>
    1515
    … …  
    137137        </seg>
    138138        <seg>
    139           libharfbuzz.so
     139          libharfbuzz.so and libharfbuzz-icu.so
    140140        </seg>
    141141        <seg>

  • general/graphlib/libjpeg-turbo.xml

    r13e0a61 raf73a280  
    77  <!ENTITY libjpeg-download-http "&sourceforge-repo;/libjpeg-turbo/libjpeg-turbo-&libjpeg-turbo-version;.tar.gz">
    88  <!ENTITY libjpeg-download-ftp  " ">
    9   <!ENTITY libjpeg-md5sum        "f61e60ff01381ece4d2fe65eeb52669e">
    10   <!ENTITY libjpeg-size          "1.7 MB">
    11   <!ENTITY libjpeg-buildsize     "15 MB">
    12   <!ENTITY libjpeg-time          "0.4 SBU">
     9  <!ENTITY libjpeg-md5sum        "e1e65cc711a1ade1322c06ad4a647741">
     10  <!ENTITY libjpeg-size          "1.3 MB">
     11  <!ENTITY libjpeg-buildsize     "13 MB">
     12  <!ENTITY libjpeg-time          "0.3 SBU">
    1313]>
    1414

  • general/graphlib/poppler.xml

    r13e0a61 raf73a280  
    132132      <xref linkend="libxml2"/>,
    133133      <xref linkend="openjpeg"/> and
    134       <xref linkend="qt"/> (the <filename>libpoppler-qt4.so</filename> library
     134      <xref linkend="qt4"/> (the <filename>libpoppler-qt4.so</filename> library
    135135      is needed for PDF support in <application>Okular</application>).
    136136    </para>

  • general/prog/cmake.xml

    r13e0a61 raf73a280  
    8787    <para role="optional">
    8888      <xref linkend="subversion"/> (for testing) and
    89       <xref linkend="qt"/> (for the Qt-based GUI)
     89      <xref linkend="qt4"/> (for the Qt-based GUI)
    9090    </para>
    9191

  • general/prog/doxygen.xml

    r13e0a61 raf73a280  
    9494      <xref linkend="gs"/>,
    9595      <xref linkend="python2"/>,
    96       <xref linkend="qt"/> (for doxywizard) and
     96      <xref linkend="qt4"/> (for doxywizard) and
    9797      <xref linkend="texlive"/>
    9898    </para>

  • general/prog/git.xml

    r13e0a61 raf73a280  
    77  <!ENTITY git-download-http "http://git-core.googlecode.com/files/git-&git-version;.tar.gz">
    88  <!ENTITY git-download-ftp  " ">
    9   <!ENTITY git-md5sum        "03ebfd403a8cf355da0e3f15e53b8925">
     9  <!ENTITY git-md5sum        "d91b6099fb6763cf92c696977a247060">
    1010  <!ENTITY git-size          "4.3 MB">
    11   <!ENTITY git-buildsize     "225 MB">
    12   <!ENTITY git-time          "5.0 SBU (including tests)">
     11  <!ENTITY git-buildsize     "217 MB">
     12  <!ENTITY git-time          "0.6 SBU (additional 2.9 SBU for tests)">
    1313]>
    1414

  • general/prog/mercurial.xml

    r13e0a61 raf73a280  
    77  <!ENTITY mercurial-download-http "http://mercurial.selenic.com/release/mercurial-&mercurial-version;.tar.gz">
    88  <!ENTITY mercurial-download-ftp  " ">
    9   <!ENTITY mercurial-md5sum        "6b467f41a262e2537cf927ed42d0fdda">
    10   <!ENTITY mercurial-size          "3.7 MB">
    11   <!ENTITY mercurial-buildsize     "40 MB">
    12   <!ENTITY mercurial-time          "0.1 SBU (additional 8.5 SBU for tests)">
     9  <!ENTITY mercurial-md5sum        "55f6ea5982cf87836113376174826e8c">
     10  <!ENTITY mercurial-size          "3.6 MB">
     11  <!ENTITY mercurial-buildsize     "43 MB">
     12  <!ENTITY mercurial-time          "0.1 SBU (additional 12 SBU for tests)">
    1313]>
    1414
    … …  
    3131
    3232    <para><application>Mercurial</application> is a distributed source control
    33     management tool similar to <application>CVS</application>,
    34     <application>Subversion</application> and <application>Git</application>.
    35     <application>Mercurial</application> is written in
    36     <application>Python</application> and is used by projects such as Mozilla,
    37     Vim and Audacious.</para>
     33    management tool similar to <application>Git</application> and
     34    <application>Bazaar</application>. <application>Mercurial</application> is
     35    written in <application>Python</application> and is used by projects such as
     36    Mozilla and Vim.</para>
    3837
    3938    &lfs73_checked;
    … …  
    8281    <ulink url="http://docutils.sourceforge.net/">Docutils</ulink> (required to build the documentation),
    8382    <xref linkend="git"/>,
    84     <xref linkend="gpg2"/> (with Python bindings),
     83    <xref linkend="gnupg2"/> (<command>gpg2</command> with Python bindings),
    8584    <xref linkend="subversion"/> (with Python bindings),
    8685    <xref linkend="bazaar"/>,

  • general/prog/ruby.xml

    r13e0a61 raf73a280  
    66
    77  <!ENTITY ruby-download-http " ">
    8   <!ENTITY ruby-download-ftp  "ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-&ruby-version;.tar.bz2">
    9   <!ENTITY ruby-md5sum        "c2b2de5ef15ea9b1aaa3152f9112af1b">
    10   <!ENTITY ruby-size          "9.6 MB">
    11   <!ENTITY ruby-buildsize     "890 MB">
    12   <!ENTITY ruby-time          "4.0 SBU">
     8  <!ENTITY ruby-download-ftp  "ftp://ftp.ruby-lang.org/pub/ruby/2.0/ruby-&ruby-version;-p&ruby-patch-version;.tar.bz2">
     9  <!ENTITY ruby-md5sum        "2f54faea6ee1ca500632ec3c0cb59cb6">
     10  <!ENTITY ruby-size          "11 MB">
     11  <!ENTITY ruby-buildsize     "515 MB">
     12  <!ENTITY ruby-time          "3.6 SBU">
    1313]>
    1414
    … …  
    9797    </para>
    9898
    99 <screen><userinput>./configure --prefix=/usr --enable-shared &amp;&amp;
     99<screen><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/ruby-&ruby-version; --enable-shared &amp;&amp;
    100100make</userinput></screen>
    101101
    … …  
    139139        </seg>
    140140        <seg>
    141           /usr/include/ruby-1.9.1,
     141          /usr/include/ruby-&ruby-version;,
    142142          /usr/lib/ruby,
    143           /usr/share/doc/ruby and
     143          /usr/share/doc/ruby-&ruby-version; and
    144144          /usr/share/ri
    145145        </seg>

  • general/prog/subversion.xml

    r13e0a61 raf73a280  
    88  "http://archive.apache.org/dist/subversion/subversion-&subversion-version;.tar.bz2">
    99  <!ENTITY subversion-download-ftp  " ">
    10   <!ENTITY subversion-md5sum        "454b9f398415c3504435bf8c3f6ed127">
    11   <!ENTITY subversion-size          "5.8 MB">
    12   <!ENTITY subversion-buildsize     "115 MB (additional 585 MB for tests)">
    13   <!ENTITY subversion-time          "0.9 SBU (additional 19 SBU for tests)">
     10  <!ENTITY subversion-md5sum        "4088a77e14232876c9b4ff1541e6e200">
     11  <!ENTITY subversion-size          "5.7 MB">
     12  <!ENTITY subversion-buildsize     "127 MB (additional 586 MB for tests)">
     13  <!ENTITY subversion-time          "0.8 SBU (additional 20 SBU for tests)">
    1414]>
    1515
    … …  
    9090    <bridgehead renderas="sect4">Required</bridgehead>
    9191    <para role="required">
    92       <xref linkend="sqlite"/>,
    93       <xref linkend="apr-util"/> and
     92      <xref linkend="apr-util"/>,
    9493      <xref linkend="neon"/> or
    95       <ulink url="http://code.google.com/p/serf/">serf</ulink>
    96     </para>
    97 
    98     <para>
    99       If you require the <application>Berkeley DB</application> back-end hooks
    100       in <application>Subversion</application> to build or support BDB based
    101       repositories, you must have <application>APR-util</application> linked to
    102       the <application>Berkeley DB</application> library.
    103     </para>
     94      <ulink url="http://code.google.com/p/serf/">serf</ulink>, and
     95      <xref linkend="sqlite"/>
     96    </para>
     97
     98    <note>
     99      <para>
     100        If you require the <application>Berkeley DB</application> back-end hooks
     101        in <application>Subversion</application> to build or support BDB based
     102        repositories, you must have <application>APR-util</application> linked to
     103        the <application>Berkeley DB</application> library.
     104      </para>
     105    </note>
    104106
    105107    <bridgehead renderas="sect4">Optional</bridgehead>
    106108    <para role="optional">
    107       <xref linkend="python2"/> (required to run the test suite),
     109      <xref linkend="apache"/>
    108110      <xref linkend="db"/>,
    109111      <xref linkend="cyrus-sasl"/>,
    110       <xref linkend="openssl"/>,
    111112      <xref linkend="dbus-glib"/>,
    112113      <xref linkend="gnome-keyring"/>,
    113       <xref linkend="kdelibs"/> (for <ulink url="http://utils.kde.org/projects/kwalletmanager/">KWallet</ulink> support) and
    114       <xref linkend="apache"/>
     114      <xref linkend="kdelibs"/> (for <ulink url="http://utils.kde.org/projects/kwalletmanager/">KWallet</ulink> support),
     115      <xref linkend="openssl"/>,
     116      <xref linkend="python2"/> (required to run the test suite) and
     117      <xref linkend="ruby"/> (version 1.8.x)
    115118    </para>
    116119
    … …  
    118121    <para role="optional">
    119122      One of <xref linkend="openjdk"/>,
    120       <ulink url="http://www.inet.no/dante/">Dante</ulink>, or
     123      <ulink url="http://www.inet.no/dante/">Dante</ulink> or
    121124      <ulink url="http://oss.software.ibm.com/developerworks/opensource/jikes/">Jikes</ulink>,
    122125      and <xref linkend="junit"/> (to test the Java bindings)
    … …  
    125128    <bridgehead renderas="sect4">Optional (for the SWIG Bindings)</bridgehead>
    126129    <para role="optional">
    127       <ulink url="http://www.swig.org">SWIG</ulink> and
    128       <xref linkend="python2"/>
     130      <ulink url="http://www.swig.org">SWIG</ulink>
    129131    </para>
    130132
    … …  
    157159
    158160<screen><userinput>make javahl</userinput></screen>
    159 
    160     <para>
    161       <application>Perl</application> and/or <application>Python</application>
    162       <!-- ruby is currently b0rken <application>Ruby</application> -->
    163     </para>
    164161
    165162    <para>
    … …  
    174171
    175172    <para>
    176       To compile the <application>Perl</application> and/or
    177       <application>Python</application> bindings issue any or all of the
    178       following commands:
     173      To compile the <application>Perl</application>,
     174      <application>Python</application> or <application>Ruby</application>
     175      bindings issue any of the following commands:
    179176    </para>
    180177<screen><userinput>make swig-pl &amp;&amp;
    181 make swig-py</userinput></screen>
    182 
    183 <!-- &amp;&amp;
    184 make swig-rb -->
     178make swig-py &amp;&amp;
     179make swig-rb</userinput></screen>
    185180
    186181    <para>
    … …  
    195190
    196191    <para>
    197       To test the results of any or all of the <application>SWIG</application>
    198       bindings, you can use the following commands:
     192      To test the results of any of the <application>SWIG</application>
     193      bindings, you can use any of the following commands:
    199194    </para>
    200195
    201196<screen><userinput>make check-swig-pl &amp;&amp;
    202 make check-swig-py</userinput></screen>
    203 
    204 <!-- &amp;&amp;
    205 make check-swig-rb -->
     197make check-swig-py &amp;&amp;
     198make check-swig-rb </userinput></screen>
    206199
    207200    <para>
    … …  
    223216    <para>
    224217      If you built any of the <application>SWIG</application> bindings, issue
    225       any or all of the following commands as the
     218      any of the following commands as the
    226219      <systemitem class="username">root</systemitem> user to install them:
    227220    </para>
    228221
    229222<screen role="root"><userinput>make install-swig-pl &amp;&amp;
    230 make install-swig-py</userinput></screen>
    231 
    232 <!-- &amp;&amp;
    233 make install-swig-rb -->
     223make install-swig-py &amp;&amp;
     224make install-swig-rb</userinput></screen>
    234225
    235226    <para>
    … …  
    308299      <seglistitem>
    309300        <seg>
    310           svn, svnadmin, svndumpfilter, svnlook, svnserve, svnsync and
     301          svn, svnadmin, svndumpfilter, svnlook, svnrdump, svnserve, svnsync and
    311302          svnversion
    312303        </seg>
    313304        <seg>
    314           libsvn*.so and optionally, a Java library, the mod_dav_svn.so, and
     305          libsvn_*-1.so and optionally, a Java library, the mod_dav_svn.so and
    315306          and mod_authz_svn.so <application>Apache HTTP</application> DSO
    316307          modules and various <application>Perl</application> and
    … …  
    439430      </varlistentry>
    440431
    441       <varlistentry id="libsvn_star">
    442         <term><filename class="libraryfile">libsvn_*.so</filename></term>
     432      <varlistentry id="libsvn_star-1">
     433        <term><filename class="libraryfile">libsvn_*-1.so</filename></term>
    443434        <listitem>
    444435          <para>
    … …  
    446437            <application>Subversion</application> programs.
    447438          </para>
    448           <indexterm zone="subversion libsvn_star">
    449             <primary sortas="c-libsvn_star">libsvn_*.so</primary>
     439          <indexterm zone="subversion libsvn_star-1">
     440            <primary sortas="c-libsvn_star-1">libsvn_*-1.so</primary>
    450441          </indexterm>
    451442        </listitem>

  • general/sysutils/strigi.xml

    r13e0a61 raf73a280  
    6666    <bridgehead renderas="sect4">Recommended</bridgehead>
    6767    <para role="recommended">
    68     <xref linkend="qt"/> and
     68    <xref linkend="qt4"/> and
    6969    <xref linkend="dbus"/>
    7070    </para>
Note: See TracChangeset for help on using the changeset viewer.