Changeset 101c03ec


Ignore:
Timestamp:
08/23/2014 10:19:29 PM (10 years ago)
Author:
Krejzi <krejzi@…>
Branches:
7.6-blfs, 7.6-systemd, kde5-14269, kde5-14686, systemd-13485
Children:
19afaf7
Parents:
40e890c
Message:

Experiment with single webkitgtk source once again.

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

Location:
x/lib
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • x/lib/webkitgtk.xml

    r40e890c r101c03ec  
    209209    </segmentedlist>
    210210
    211     <variablelist>
     211<!--    <variablelist>
    212212      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
    213213      <?dbfo list-presentation="list"?>
    … …  
    254254      </varlistentry>
    255255
    256     </variablelist>
     256    </variablelist> -->
    257257
    258258  </sect2>

  • x/lib/webkitgtk2-systemd.xml

    r40e890c r101c03ec  
    7777    <para role="required">
    7878      <xref linkend="gst10-plugins-base"/>,
    79       <xref linkend="gtk3"/>,
     79      <xref linkend="gtk3"/> or
     80      <xref linkend="gtk2"/> or both,
    8081      <xref linkend="icu"/>,
    8182      <xref linkend="libsecret"/>,
    … …  
    8990    </para>
    9091
     92    <note>
     93      <para>
     94        Note that WebKit2 links against <application>GTK+ 2</application>
     95        (even if <application>GTK+ 3</application> is being used) in order
     96        to be able to use NPAPI plugins such as Adobe Flash.
     97      </para>
     98    </note>
     99
    91100    <bridgehead renderas="sect4">Recommended</bridgehead>
    92101    <para role="recommended">
    … …  
    94103      <xref linkend="geoclue2"/> or
    95104      <xref linkend="geoclue"/>,
    96       <xref linkend="gobject-introspection"/>,
    97       <xref linkend="gtk2"/> and
     105      <xref linkend="gobject-introspection"/> and
    98106      <xref linkend="hicolor-icon-theme"/>
    99107    </para>
    … …  
    102110    <para role="optional">
    103111      <xref linkend="gtk-doc"/>,
    104       <xref linkend="llvm"/>, and
     112      <xref linkend="llvm"/> and
    105113      <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>
    106114    </para>
    … …  
    122130
    123131    <para>
    124       Install <application>WebKitGTK+</application> by running the
    125       following commands:
    126     </para>
    127 
    128 <screen><userinput>./configure --prefix=/usr          \
    129             --enable-introspection &amp;&amp;
     132      To build <application>WebKitGTK+</application> against
     133      <application>GTK+ 3</application>, run the following
     134      commands:
     135    </para>
     136
     137<screen><userinput>./configure --prefix=/usr --enable-introspection &amp;&amp;
     138make</userinput></screen>
     139
     140    <para>
     141      To build <application>WebKitGTK+</application> against
     142      <application>GTK+ 2</application>, run the following
     143      commands:
     144    </para>
     145
     146<screen><userinput>./configure --prefix=/usr --with-gtk=2.0 --disable-webkit2 &amp;&amp;
    130147make</userinput></screen>
    131148
    … …  
    138155    </para>
    139156
    140     <note><para>
    141       When installing, the Makefile does some additional compiling and linking.
    142       If you do not have Xorg in /usr, the LIBRARY_PATH and PKG_CONFIG_PATH
    143       variables need to be defined for the root user.  If using sudo to assume
    144       root, use the -E option to pass your current environment variables for the
    145       install process.
    146     </para></note>
    147 
    148157    <para>
    149158      Now, as the <systemitem class="username">root</systemitem> user:
    150159    </para>
    151160
    152 <screen role="root"><userinput>make install                                    &amp;&amp;
    153 rm -rf /usr/share/gtk-doc/html/webkitgtk-2.0    &amp;&amp;
    154 mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0}</userinput></screen>
     161<screen role="root"><userinput>make install</userinput></screen>
     162
     163    <para>
     164      If you have built the package against <application>GTK+ 3</application>,
     165      rename the following directory to avoid conflicts with the package
     166      built against <application>GTK+ 2</application> by running the
     167      following commands as the <systemitem
     168      class="username">root</systemitem> user:
     169    </para>
     170
     171<screen role="root"><userinput>rm -rf /usr/share/gtk-doc/html/webkitgtk-3.0 &amp;&amp;
     172mv -v /usr/share/gtk-doc/html/webkitgtk{,-3.0}</userinput></screen>
     173
     174    <para>
     175      If you have built the package against <application>GTK+ 2</application>,
     176      rename the following directory to avoid conflicts with the package
     177      built against <application>GTK+ 3</application> by running the
     178      following commands as the <systemitem
     179      class="username">root</systemitem> user:
     180    </para>
     181
     182<screen role="root"><userinput>rm -rf /usr/share/gtk-doc/html/webkitgtk-1.0 &amp;&amp;
     183mv -v /usr/share/gtk-doc/html/webkitgtk{,-1.0}</userinput></screen>
     184
    155185  </sect2>
    156186
    … …  
    159189
    160190    <para>
    161       <command>mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0}</command>:
    162       There is a conflict with the directory installed with same name by
    163       <xref linkend="webkitgtk"/>.
    164     </para>
    165 
    166     <para>
    167       <option>--enable-introspection</option>: This switch enables support for
    168       <application>Gobject Introspection</application> and is required for a
    169       <application>GNOME</application> Desktop. Remove if you don't have
    170       <application>Gobject Introspection</application> installed or you don't
    171       want to install <application>GNOME</application>.
    172     </para>
    173 
    174     <para>
    175       <option>--disable-geolocation</option>: Use this option if you did not
    176       install <xref linkend="geoclue"/> or <command>configure</command> will
    177       fail.
     191      <parameter>--enable-introspection</parameter>: This switch enables
     192      <application>Gobject Introspection</application> bindings and is
     193      required if building <application>GNOME</application> Desktop.
     194      Remove if you don't have <application>Gobject
     195      Introspection</application> installed or you don't want to install
     196      <application>GNOME</application>. It is not needed if building
     197      against <application>GTK+ 2</application>, although it can be used
     198      if desired.
     199    </para>
     200
     201    <para>
     202      <parameter>--with-gtk=2.0 --disable-webkit2</parameter>: These switches
     203      force <application>WebKitGTK+</application> to compile against
     204      <application>GTK+ 2</application>, even if
     205      <application>GTK+ 3</application> is also installed.
     206    </para>
     207
     208    <para>
     209      <option>--disable-geolocation</option>: Use this switch if you don't
     210      want to install <xref linkend="geoclue"/> or
     211      <xref linkend="geoclue2"/>.
    178212    </para>
    179213
    180214    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    181215      href="../../xincludes/gtk-doc-rebuild.xml"/>
    182 
    183     <para><option>--libexecdir=/usr/lib/webkitgtk3</option>: This option
    184     puts the package's private programs into
    185     <filename class="directory">/usr/lib/webkitgtk3</filename> instead of
    186     <filename class="directory">/usr/libexec</filename> in accordance with
    187     the old version of the FHS used before LFS-7.5.</para>
    188216
    189217  </sect2>
    … …  
    199227      <seglistitem>
    200228        <seg>
    201           jsc-3
     229          jsc-3 <emph>or</emph> jsc-1
    202230        </seg>
    203231        <seg>
    204232          libjavascriptcoregtk-3.0.so,
    205           libwebkit2gtk-3.0.so,
    206           libwebkitgtk-3.0.so and
    207           /usr/lib/webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so
     233          libwebkit2gtk-3.0.so and
     234          libwebkitgtk-3.0.so <emph>or</emph>
     235          libjavascriptcoregtk-1.0.so and
     236          libwebkitgtk-1.0.so
    208237        </seg>
    209238        <seg>
    210239          /usr/include/webkitgtk-3.0,
    211240          /usr/lib/webkit2gtk-3.0,
    212           /usr/share/gtk-doc/html/webkitgtk-2.0,
     241          /usr/share/gtk-doc/html/webkitgtk-3.0,
    213242          /usr/share/gtk-doc/html/webkitdomgtk,
    214           /usr/share/gtk-doc/html/webkit2gtk, and
    215           /usr/share/webkitgtk-3.0
     243          /usr/share/gtk-doc/html/webkit2gtk and
     244          /usr/share/webkitgtk-3.0 <emph>or</emph>
     245          /usr/include/webkit-1.0,
     246          /usr/share/gtk-doc/html/webkitgtk-1.0 and
     247          /usr/share/webkit-1.0
    216248        </seg>
    217249      </seglistitem>
    … …  
    228260          <para>
    229261            is a command-line utility that allows you to run JavaScript programs
    230             outside of the context of a web browser.
     262            outside of the context of a web browser linked against
     263            <filename class="libraryfile">libjavascriptcoregtk-3.0.so</filename>.
    231264          </para>
    232265          <indexterm zone="webkitgtk2 jsc-3">
    … …  
    236269      </varlistentry>
    237270
    238       <varlistentry id="libjavascriptcoregtk-3">
     271      <varlistentry id="jsc-1">
     272        <term><command>jsc-1</command></term>
     273        <listitem>
     274          <para>
     275            is a command-line utility that allows you to run JavaScript programs
     276            outside of the context of a web browser linked against
     277            <filename class="libraryfile">libjavascriptcoregtk-1.0.so</filename>.
     278          </para>
     279          <indexterm zone="webkitgtk2 jsc-1">
     280            <primary sortas="b-jsc-1">jsc-1</primary>
     281          </indexterm>
     282        </listitem>
     283      </varlistentry>
     284
     285      <varlistentry id="libjavascriptcoregtk-3.0">
    239286        <term><filename
    240287        class="libraryfile">libjavascriptcoregtk-3.0.so</filename></term>
    … …  
    244291            and <filename class="libraryfile">libwebkitgtk-3.0.so</filename>.
    245292          </para>
    246           <indexterm zone="webkitgtk libjavascriptcoregtk-3">
    247             <primary sortas="c-libjavascriptcoregtk-3">libjavascriptcoregtk-3.0.so</primary>
    248           </indexterm>
    249         </listitem>
    250       </varlistentry>
    251 <!--
    252       <varlistentry id="libwebkit2gtkinjectedbundle">
    253         <term><filename class="libraryfile">libwebkit2gtkinjectedbundle.so</filename></term>
    254         <listitem>
    255           <para>
    256             contains the <application>WebKitGTK+</application> API functions for
    257             the Injected Bundle support.
    258           </para>
    259           <indexterm zone="webkitgtk libwebkit2gtkinjectedbundle">
    260             <primary sortas="c-libwebkit2gtkinjectedbundle">libwebkit2gtkinjectedbundle.so</primary>
    261           </indexterm>
    262         </listitem>
    263       </varlistentry>
    264 -->
    265 
    266       <varlistentry id="libwebkitgtk-3">
     293          <indexterm zone="webkitgtk2 libjavascriptcoregtk-3.0">
     294            <primary sortas="c-libjavascriptcoregtk-3.0">libjavascriptcoregtk-3.0.so</primary>
     295          </indexterm>
     296        </listitem>
     297      </varlistentry>
     298
     299      <varlistentry id="libwebkitgtk-3.0">
    267300        <term><filename class="libraryfile">libwebkitgtk-3.0.so</filename></term>
    268301        <listitem>
    … …  
    271304            <application>GTK+ 3</application>.
    272305          </para>
    273           <indexterm zone="webkitgtk libwebkitgtk-3">
    274             <primary sortas="c-libwebkitgtk-3">libwebkitgtk-3.0.so</primary>
    275           </indexterm>
    276         </listitem>
    277       </varlistentry>
    278 
    279       <varlistentry id="libwebkit2gtk-3">
     306          <indexterm zone="webkitgtk2 libwebkitgtk-3.0">
     307            <primary sortas="c-libwebkitgtk-3.0">libwebkitgtk-3.0.so</primary>
     308          </indexterm>
     309        </listitem>
     310      </varlistentry>
     311
     312      <varlistentry id="libwebkit2gtk-3.0">
    280313        <term><filename class="libraryfile">libwebkit2gtk-3.0.so</filename></term>
    281314        <listitem>
    … …  
    283316            contains the <application>WebKit2</application> API functions.
    284317          </para>
    285           <indexterm zone="webkitgtk libwebkit2gtk-3">
    286             <primary sortas="c-libwebkit2gtk-3">libwebkit2gtk-3.0.so</primary>
     318          <indexterm zone="webkitgtk2 libwebkit2gtk-3.0">
     319            <primary sortas="c-libwebkit2gtk-3.0">libwebkit2gtk-3.0.so</primary>
     320          </indexterm>
     321        </listitem>
     322      </varlistentry>
     323
     324      <varlistentry id="libjavascriptcoregtk-1.0">
     325        <term><filename
     326        class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term>
     327        <listitem>
     328          <para>
     329            contains core JavaScript API functions used by <command>jsc-1</command>
     330            and <filename class="libraryfile">libwebkitgtk-1.0.so</filename>.
     331          </para>
     332          <indexterm zone="webkitgtk2 libjavascriptcoregtk-1.0">
     333            <primary sortas="c-libjavascriptcoregtk-1.0">libjavascriptcoregtk-1.0.so</primary>
     334          </indexterm>
     335        </listitem>
     336      </varlistentry>
     337
     338      <varlistentry id="libwebkitgtk-1.0">
     339        <term><filename class="libraryfile">libwebkitgtk-1.0.so</filename></term>
     340        <listitem>
     341          <para>
     342            contains the <application>WebKitGTK+</application> API functions for
     343            <application>GTK+ 2</application>.
     344          </para>
     345          <indexterm zone="webkitgtk2 libwebkitgtk-1.0">
     346            <primary sortas="c-libwebkitgtk-1.0">libwebkitgtk-1.0.so</primary>
    287347          </indexterm>
    288348        </listitem>
Note: See TracChangeset for help on using the changeset viewer.