Changeset 5b00a2a for x/lib


Ignore:
Timestamp:
06/10/2013 09:05:15 PM (11 years ago)
Author:
Krejzi <krejzi@…>
Branches:
systemd-11177
Children:
b6bb5377
Parents:
af73a280
Message:

Merge latest changes from trunk.

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

Location:
x/lib
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • x/lib/cairo.xml

    raf73a280 r5b00a2a  
    105105      <xref linkend="gtk-doc"/>,
    106106      <xref linkend="libdrm"/>,
     107      <xref linkend="LZO"/>,
    107108      <xref linkend="mesalib"/>,
    108109      <xref linkend="qt4"/>,

  • x/lib/lib.xml

    raf73a280 r5b00a2a  
    5757  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>
    5858  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk.xml"/>
     59  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2.xml"/>
    5960  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xulrunner.xml"/>
    6061

  • x/lib/webkitgtk.xml

    raf73a280 r5b00a2a  
    99  <!ENTITY webkitgtk-md5sum        "7b1a652af1eb11bee5bf7209e9ff67e6">
    1010  <!ENTITY webkitgtk-size          "8.3 MB">
    11   <!ENTITY webkitgtk-buildsize     "800 MB (650 MB for GTK+2 version)">
     11  <!ENTITY webkitgtk-buildsize     "650 MB">
    1212  <!ENTITY webkitgtk-time          "55 SBU">
    1313]>
    … …  
    3131
    3232    <para>
    33       The <application>WebKitGTK+</application> package is the port of the
    34       portable web rendering engine <application>WebKit</application> to the
    35       <application>GTK+</application> platform.
     33      The <application>WebKitGTK+</application> is the port of the portable
     34      web rendering engine <application>WebKit</application> to the
     35      <application>GTK+ 2</application> platform.
    3636    </para>
    3737
    … …  
    8484    <bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
    8585
    86     <!-- webkitgtk 2.0.2 requires libwebp -->
    8786    <bridgehead renderas="sect4">Required</bridgehead>
    8887    <para role="required">
    8988      <xref linkend="gperf"/>,
    90       <xref linkend="gst10-plugins-base"/> or
    9189      <xref linkend="gst-plugins-base"/>,
    92       <xref linkend="gtk3"/> or
    9390      <xref linkend="gtk2"/>,
    9491      <xref linkend="icu"/>,
    95       <xref linkend="libxslt"/>,
    9692      <xref linkend="libsoup"/>,
    9793      <xref linkend="mesalib"/>,
    … …  
    10399    <bridgehead renderas="sect4">Recommended</bridgehead>
    104100    <para role="recommended">
    105       <xref linkend="geoclue"/> and
    106       <xref linkend="gobject-introspection"/>
     101      <xref linkend="enchant"/> and
     102      <xref linkend="geoclue"/>
    107103    </para>
    108104
    … …  
    110106    <para role="optional">
    111107      <xref linkend="curl"/>,
    112       <xref linkend="enchant"/>,
     108      <xref linkend="gobject-introspection"/>,
    113109      <xref linkend="gtk-doc"/> and
    114110      <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>
    … …  
    148144<screen><userinput>patch -Np1 -i ../webkitgtk-&webkitgtk-version;-fix_librt_linking-1.patch &amp;&amp;
    149145./configure --prefix=/usr \
    150             --libexecdir=/usr/lib/WebKitGTK \
    151             --with-gstreamer=1.0 \
    152             --enable-introspection &amp;&amp;
     146            --libexecdir=/usr/lib/webkitgtk2 \
     147            --with-gtk=2.0 \
     148            --disable-webkit2 &amp;&amp;
    153149make</userinput></screen>
    154150
    … …  
    168164
    169165    <para>
    170       <option>--enable-introspection</option>: This switch enables support for
    171       <application>Gobject Introspection</application> and is required for a
    172       <application>GNOME</application> Desktop. Remove if you don't have
    173       <application>Gobject Introspection</application> installed or you don't
    174       want to install <application>GNOME</application>.
    175     </para>
    176 
    177     <para>
    178       <parameter>--with-gstreamer=1.0</parameter>: This switch forces use of
    179       <application>GStreamer</application> 1.0 series which
    180       <application>GNOME</application> 3.6 uses. Remove if you don't want
    181       to install <application>GStreamer</application> 1.0 or you don't
    182       want to install <application>GNOME</application>.
     166      <parameter>--with-gtk=2.0 --disable-webkit2</parameter>: These parameters
     167      force <application>WebKitGTK+</application> to compile against
     168      <application>GTK+ 2</application>, even if
     169      <application>GTK+ 3</application> is also installed.
    183170    </para>
    184171
    … …  
    189176    </para>
    190177
    191     <para>
    192       <parameter>--with-gtk=2.0 --disable-webkit2</parameter>: These parameters
    193       force <application>WebKitGTK+</application> to compile against
    194       <application>GTK+ 2</application>, even if
    195       <application>GTK+ 3</application> is also installed. With
    196       <application>GTK+ 2</application>, everything
    197       <application>WebKitGTK+</application> installs is suffixed with 1.0. When it
    198       is compiled against <application>GTK+ 3</application> everything it
    199       installs is suffixed with 3.0. Both versions can be installed alongside
    200       one another with no namespace conflicts.
    201     </para>
    202 
    203178    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    204179      href="../../xincludes/gtk-doc-rebuild.xml"/>
    … …  
    211186    <segmentedlist>
    212187      <segtitle>Installed Program</segtitle>
    213       <segtitle>Installed Library</segtitle>
     188      <segtitle>Installed Libraries</segtitle>
    214189      <segtitle>Installed Directories</segtitle>
    215190
    216191      <seglistitem>
    217192        <seg>
    218           jsc-1 or jsc-3
     193          jsc-1
    219194        </seg>
    220195        <seg>
    221           libjavascriptcoregtk-1.0.so and libwebkit-1.0.so or
    222           libjavascriptcoregtk-3.0.so, libwebkit2gtk-3.0.so and
    223           libwebkit-3.0.so
     196          libjavascriptcoregtk-1.0.so and libwebkit-1.0.so
    224197        </seg>
    225198        <seg>
    226           /usr/include/webkit-1.0 and /usr/share/webkit-1.0 or
    227           /usr/include/webkit-3.0, /usr/lib/WebKit and
    228           /usr/share/webkit-3.0
     199          /usr/include/webkit-1.0, /usr/share/webkit-1.0 and
     200          /usr/lib/webkitgtk2
    229201        </seg>
    230202      </seglistitem>
    … …  
    236208      <?dbhtml list-presentation="table"?>
    237209
    238       <varlistentry id="jsc">
    239         <term><command>jsc-1</command> or <command>jsc-3</command></term>
     210      <varlistentry id="jsc-1">
     211        <term><command>jsc-1</command></term>
    240212        <listitem>
    241213          <para>
    … …  
    243215            outside of the context of a web browser.
    244216          </para>
    245           <indexterm zone="webkitgtk jsc">
    246             <primary sortas="b-jsc">jsc</primary>
     217          <indexterm zone="webkitgtk jsc-1">
     218            <primary sortas="b-jsc-1">jsc-1</primary>
    247219          </indexterm>
    248220        </listitem>
    … …  
    276248      </varlistentry>
    277249
    278       <varlistentry id="libjavascriptcoregtk-3">
    279         <term><filename
    280         class="libraryfile">libjavascriptcoregtk-3.0.so</filename></term>
    281         <listitem>
    282           <para>
    283             contains core JavaScript API functions used by <command>jsc-3</command>
    284             and <filename class="libraryfile">libwebkitgtk-3.0.so</filename>.
    285           </para>
    286           <indexterm zone="webkitgtk libjavascriptcoregtk-3">
    287             <primary sortas="c-libjavascriptcoregtk-3">libjavascriptcoregtk-3.0.so</primary>
    288           </indexterm>
    289         </listitem>
    290       </varlistentry>
    291 
    292       <varlistentry id="libwebkitgtk-3">
    293         <term><filename class="libraryfile">libwebkitgtk-3.0.so</filename></term>
    294         <listitem>
    295           <para>
    296             contains the <application>WebKitGTK+</application> API functions for
    297             <application>GTK+ 3</application>.
    298           </para>
    299           <indexterm zone="webkitgtk libwebkitgtk-3">
    300             <primary sortas="c-libwebkitgtk-3">libwebkitgtk-3.0.so</primary>
    301           </indexterm>
    302         </listitem>
    303       </varlistentry>
    304 
    305       <varlistentry id="libwebkit2gtk-3">
    306         <term><filename class="libraryfile">libwebkit2gtk-3.0.so</filename></term>
    307         <listitem>
    308           <para>
    309             contains the <application>WebKit2</application> API functions.
    310           </para>
    311           <indexterm zone="webkitgtk libwebkit2gtk-3">
    312             <primary sortas="c-libwebkit2gtk-3">libwebkit2gtk-3.0.so</primary>
    313           </indexterm>
    314         </listitem>
    315       </varlistentry>
    316 
    317250    </variablelist>
    318251
Note: See TracChangeset for help on using the changeset viewer.