Changeset 4f1a8e5


Ignore:
Timestamp:
03/27/2012 05:36:31 PM (12 years ago)
Author:
Andrew Benton <andy@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
9b39d50
Parents:
f628f3a
Message:

removed the unneeded --with-gtk=3.0 from the webkitgtk page

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9789 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:
1 edited

Legend:

Unmodified
Added
Removed

  • x/lib/webkitgtk.xml

    rf628f3a r4f1a8e5  
    55  %general-entities;
    66
    7   <!ENTITY webkitgtk-download-http "http://webkitgtk.org/webkit-&webkitgtk-version;.tar.gz">
     7  <!ENTITY webkitgtk-download-http
     8    "http://webkitgtk.org/webkit-&webkitgtk-version;.tar.gz">
    89  <!ENTITY webkitgtk-download-ftp  " ">
    910  <!ENTITY webkitgtk-md5sum        "c11743694b1b71dad287b2e7a9e73b05">
    … …  
    3031    <title>Introduction to WebKitGTK+</title>
    3132
    32     <para>The <application>WebKitGTK+</application> package is the port of the
    33     portable web rendering engine <application>WebKit</application> to the
    34     <application>GTK+</application> platform.</para>
     33    <para>
     34      The <application>WebKitGTK+</application> package is the port of the
     35      portable web rendering engine <application>WebKit</application> to the
     36      <application>GTK+</application> platform.
     37    </para>
    3538
    3639    &lfs71_checked;
    … …  
    3942    <itemizedlist spacing="compact">
    4043      <listitem>
    41         <para>Download (HTTP): <ulink url="&webkitgtk-download-http;"/></para>
    42       </listitem>
    43       <listitem>
    44         <para>Download (FTP): <ulink url="&webkitgtk-download-ftp;"/></para>
    45       </listitem>
    46       <listitem>
    47         <para>Download MD5 sum: &webkitgtk-md5sum;</para>
    48       </listitem>
    49       <listitem>
    50         <para>Download size: &webkitgtk-size;</para>
    51       </listitem>
    52       <listitem>
    53         <para>Estimated disk space required: &webkitgtk-buildsize;</para>
    54       </listitem>
    55       <listitem>
    56         <para>Estimated build time: &webkitgtk-time;</para>
     44        <para>
     45          Download (HTTP): <ulink url="&webkitgtk-download-http;"/>
     46        </para>
     47      </listitem>
     48      <listitem>
     49        <para>
     50          Download (FTP): <ulink url="&webkitgtk-download-ftp;"/>
     51        </para>
     52      </listitem>
     53      <listitem>
     54        <para>
     55          Download MD5 sum: &webkitgtk-md5sum;
     56        </para>
     57      </listitem>
     58      <listitem>
     59        <para>
     60          Download size: &webkitgtk-size;
     61        </para>
     62      </listitem>
     63      <listitem>
     64        <para>
     65          Estimated disk space required: &webkitgtk-buildsize;
     66        </para>
     67      </listitem>
     68      <listitem>
     69        <para>
     70          Estimated build time: &webkitgtk-time;
     71        </para>
    5772      </listitem>
    5873    </itemizedlist>
    … …  
    7186
    7287    <bridgehead renderas="sect4">Required</bridgehead>
    73     <para role="required"><xref linkend="gperf"/>, <xref linkend="libjpeg"/>,
    74     <xref linkend="libpng"/>, <xref linkend="icu"/>, <xref linkend="libxslt"/>,
    75     <xref linkend="gtk2"/> or <xref linkend="gtk3"/> (if both are installed
    76     configure defaults to using gtk+-3), <xref linkend="libsoup"/>,
    77     <xref linkend="gst-plugins-base"/>, <xref linkend="which"/>
    78     and <xref linkend="sqlite"/></para>
     88    <para role="required">
     89      <xref linkend="gperf"/>,
     90      <xref linkend="libjpeg"/>,
     91      <xref linkend="libpng"/>,
     92      <xref linkend="icu"/>,
     93      <xref linkend="libxslt"/>,
     94      <xref linkend="gtk2"/> or <xref linkend="gtk3"/> (configure defaults to
     95      using gtk+-3),
     96      <xref linkend="libsoup"/>,
     97      <xref linkend="gst-plugins-base"/>,
     98      <xref linkend="which"/> and
     99      <xref linkend="sqlite"/>.
     100    </para>
    79101
    80102    <bridgehead renderas="sect4">Optional</bridgehead>
    81     <para role="optional"><xref linkend="curl"/>, <xref linkend="enchant"/>,
    82     <ulink
    83     url="http://www.freedesktop.org/wiki/Software/GeoClue">GeoClue</ulink>,
    84     <xref linkend="gobject-introspection"/> (required if building
    85     <application>epiphany</application>), <xref linkend="gtk-doc"/> and
    86     <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>.</para>
    87 
    88     <para condition="html" role="usernotes">User Notes:
    89     <ulink url="&blfs-wiki;/webkitgtk"/></para>
    90 
     103    <para role="optional">
     104      <xref linkend="curl"/>,
     105      <xref linkend="enchant"/>,
     106      <ulink url="http://www.freedesktop.org/wiki/Software/GeoClue">GeoClue</ulink>,
     107      <xref linkend="gobject-introspection"/> (required if building
     108      <application>epiphany</application>),
     109      <xref linkend="gtk-doc"/> and
     110      <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>.
     111    </para>
     112
     113    <para condition="html" role="usernotes">
     114      User Notes: <ulink url="&blfs-wiki;/webkitgtk"/>
     115    </para>
    91116  </sect2>
    92117
    … …  
    94119    <title>Installation of WebKitGTK+</title>
    95120
    96     <para>These instructions assume you are installing
    97     <application>WebKitGTK+</application> to support a
    98     <application>GNOME</application> desktop - if not, please review the
    99     explanations for the various optional parameters.</para>
    100 
    101     <para>Install <application>WebKitGTK+</application> by running the
    102     following commands:</para>
     121    <para>
     122      These instructions assume you are installing
     123      <application>WebKitGTK+</application> to support a
     124      <application>GNOME</application> desktop - if not, please review the
     125      explanations for the various optional parameters.
     126    </para>
     127
     128    <para>
     129      Install <application>WebKitGTK+</application> by running the following
     130      commands:
     131    </para>
    103132
    104133<screen><userinput>patch -p1 &lt; ../webkitgtk-&webkitgtk-version;_gcc-4.7-1.patch &amp;&amp;
    105 ./configure --prefix=/usr --with-gtk=3.0 \
    106             --enable-introspection &amp;&amp;
     134./configure --prefix=/usr --enable-introspection &amp;&amp;
    107135make</userinput></screen>
    108136
    109     <para>To test the results, issue: <command>make check</command> (you must be
    110     in an xterm or similar to do this, because it launches some windows).</para>
    111 
    112     <para>Now, as the <systemitem class="username">root</systemitem>
    113     user:</para>
     137    <para>
     138      To test the results, issue: <command>make check</command> (you must be in
     139      an xterm or similar to do this, because it launches some windows).
     140    </para>
     141
     142    <para>
     143      Now, as the <systemitem class="username">root</systemitem> user:
     144    </para>
    114145
    115146<screen role="root"><userinput>make install</userinput></screen>
    116 
    117147  </sect2>
    118148
    … …  
    120150    <title>Command Explanations</title>
    121151
    122     <para><parameter>--with-gtk=3.0</parameter>: This switch forces
    123     <application>Webkit</application> to compile against
    124     <application>Gtk+-3</application> and is required for a
    125     <application>GNOME</application> desktop.</para>
    126 
    127     <para><option>--with-gtk=2.0</option>: This option forces
    128     <application>Webkit</application> to compile against
    129     <application>Gtk+-2</application>, even if
    130     <application>Gtk+-3</application> is also installed. With
    131     <application>Gtk+-2</application>, everything
    132     <application>Webkit</application> installs is suffixed with 1.0. When it is
    133     compiled against <application>Gtk+-3</application> everything it installs
    134     is suffixed with 3.0. Both versions can be installed alongside one another
    135     with no namespace conflicts.</para>
    136 
    137     <para><option>--enable-introspection</option>: This option enables support
    138     for gobject-introspection and is required for a
    139     <application>GNOME</application> desktop.</para>
     152    <para>
     153      <option>--with-gtk=2.0</option>: This option forces
     154      <application>Webkit</application> to compile against
     155      <application>Gtk+-2</application>, even if
     156      <application>Gtk+-3</application> is also installed. With
     157      <application>Gtk+-2</application>, everything
     158      <application>Webkit</application> installs is suffixed with 1.0. When it
     159      is compiled against <application>Gtk+-3</application> everything it
     160      installs is suffixed with 3.0. Both versions can be installed alongside
     161      one another with no namespace conflicts.
     162    </para>
     163
     164    <para>
     165      <option>--enable-introspection</option>: This option enables support for
     166      gobject-introspection and is required for a
     167      <application>GNOME</application> desktop.
     168    </para>
    140169
    141170    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    142171    href="../../xincludes/gtk-doc-rebuild.xml"/>
    143 
    144172  </sect2>
    145173
    … …  
    153181
    154182      <seglistitem>
    155         <seg>jsc-1 or jsc-3 (depending on whether you installed the gtk+-2 or
    156         gtk+-3 version of webkit)</seg>
    157         <seg>libwebkit-1.0.so and libjavascriptcoregtk-1.0.so or
    158         libwebkit-3.0.so and libjavascriptcoregtk-3.0.so (depending on whether
    159         you installed the gtk+-2 or gtk+-3 version of webkit)</seg>
    160         <seg>/usr/include/webkit-1.0 and /usr/share/webkit-1.0 or
    161         /usr/include/webkit-3.0 and /usr/share/webkit-3.0 (depending on whether
    162         you installed the gtk+-2 or gtk+-3 version of webkit)</seg>
     183        <seg>
     184          jsc-1 or jsc-3 (depending on whether you installed the gtk+-2 or
     185          gtk+-3 version of webkit)
     186        </seg>
     187        <seg>
     188          libwebkit-1.0.so and libjavascriptcoregtk-1.0.so or libwebkit-3.0.so
     189          and libjavascriptcoregtk-3.0.so (depending on whether you installed
     190          the gtk+-2 or gtk+-3 version of webkit)
     191        </seg>
     192        <seg>
     193          /usr/include/webkit-1.0 and /usr/share/webkit-1.0 or
     194          /usr/include/webkit-3.0 and /usr/share/webkit-3.0 (depending on
     195          whether you installed the gtk+-2 or gtk+-3 version of webkit)
     196        </seg>
    163197      </seglistitem>
    164198    </segmentedlist>
    … …  
    172206        <term><command>jsc-1</command> or <command>jsc-3</command></term>
    173207        <listitem>
    174           <para>is a command-line utility that allows you to run JavaScript
    175           programs outside of the context of a web browser.</para>
     208          <para>
     209            is a command-line utility that allows you to run JavaScript programs
     210            outside of the context of a web browser.
     211          </para>
    176212          <indexterm zone="webkitgtk jsc">
    177213            <primary sortas="b-jsc">jsc</primary>
    … …  
    183219        <term><filename class="libraryfile">libwebkit-1.0.so</filename></term>
    184220        <listitem>
    185           <para>contains the <application>WebKitGTK+</application> API
    186           functions for <application>gtk+-2</application>.</para>
     221          <para>
     222            contains the <application>WebKitGTK+</application> API functions for
     223            <application>gtk+-2</application>.
     224          </para>
    187225          <indexterm zone="webkitgtk libwebkit-1.0">
    188226            <primary sortas="c-libwebkit-1.0">libwebkit-1.0.so</primary>
    … …  
    194232        <term><filename class="libraryfile">libwebkit-3.0.so</filename></term>
    195233        <listitem>
    196           <para>contains the <application>WebKitGTK+</application> API
    197           functions for <application>gtk+-3</application>.</para>
     234          <para>
     235            contains the <application>WebKitGTK+</application> API functions for
     236            <application>gtk+-3</application>.
     237          </para>
    198238          <indexterm zone="webkitgtk libwebkit-3.0">
    199239            <primary sortas="c-libwebkit-3.0">libwebkit-3.0.so</primary>
    … …  
    206246        class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term>
    207247        <listitem>
    208           <para>contains functions that are used by
    209           <command>jsc-1</command></para>
     248          <para>
     249            contains functions that are used by <command>jsc-1</command>.
     250          </para>
    210251          <indexterm zone="webkitgtk libjavascriptcoregtk-1.0">
    211252            <primary
    … …  
    219260        class="libraryfile">libjavascriptcoregtk-3.0.so</filename></term>
    220261        <listitem>
    221           <para>contains functions that are used by
    222           <command>jsc-3</command></para>
     262          <para>
     263            contains functions that are used by <command>jsc-3</command>.
     264          </para>
    223265          <indexterm zone="webkitgtk libjavascriptcoregtk-3.0">
    224266            <primary
    … …  
    228270      </varlistentry>
    229271    </variablelist>
    230 
    231   </sect2>
    232 
     272  </sect2>
    233273</sect1>
Note: See TracChangeset for help on using the changeset viewer.