Index: packages.ent
===================================================================
--- packages.ent	(revision e4685712726ec9b28af2ec1ea71a3c3c16a59e37)
+++ packages.ent	(revision edd70f1428afd85eb0b76934ee03f2c58faf1a69)
@@ -502,4 +502,5 @@
 <!ENTITY clutter-gst-version          "3.0.18">
 <!ENTITY clutter-gtk-version          "1.8.0">
+<!ENTITY colord-gtk-version           "0.1.26">
 <!ENTITY fltk-version                 "1.3.3">
 <!ENTITY freeglut-version             "3.0.0">
@@ -513,4 +514,5 @@
 <!ENTITY gtkmm3-version               "3.20.1">
 <!ENTITY gtksourceview-version        "3.20.3">
+<!ENTITY gtk-vnc-version              "0.5.4">
 <!ENTITY imlib2-version               "1.4.9">
 <!ENTITY keybinder2-version           "0.3.0">
@@ -524,4 +526,5 @@
 <!ENTITY shared-mime-info-version     "1.6">
 <!ENTITY startup-notification-version "0.12">
+<!ENTITY webkitgtk2-version           "2.4.10">    <!-- Even minors only -->
 <!ENTITY webkitgtk-version            "2.12.2">    <!-- Even minors only -->
 
Index: x/lib/colord-gtk.xml
===================================================================
--- x/lib/colord-gtk.xml	(revision edd70f1428afd85eb0b76934ee03f2c58faf1a69)
+++ x/lib/colord-gtk.xml	(revision edd70f1428afd85eb0b76934ee03f2c58faf1a69)
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY colord-gtk-download-http "http://www.freedesktop.org/software/colord/releases/colord-gtk-&colord-gtk-version;.tar.xz">
+  <!ENTITY colord-gtk-download-ftp  " ">
+  <!ENTITY colord-gtk-md5sum        "bb9d6f3c037152ad791003375aa6c16c">
+  <!ENTITY colord-gtk-size          "276 KB">
+  <!ENTITY colord-gtk-buildsize     "4.2 MB">
+  <!ENTITY colord-gtk-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="colord-gtk" xreflabel="colord-gtk-&colord-gtk-version;" revision="systemd">
+  <?dbhtml filename="colord-gtk.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>colord-gtk-&colord-gtk-version;</title>
+
+  <indexterm zone="colord-gtk">
+    <primary sortas="a-colord-gtk">colord-gtk</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Colord GTK</title>
+
+    <para>
+      The <application>Colord GTK</application> package contains
+      <application>GTK+</application> bindings for
+      <application>Colord</application>.
+    </para>
+
+    <!-- &lfs77_checked; -->
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&colord-gtk-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&colord-gtk-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &colord-gtk-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &colord-gtk-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &colord-gtk-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &colord-gtk-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Colord GTK Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="colord"/> and
+      <xref linkend="gtk3"/>
+    </para>
+      
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="vala"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="docbook-utils"/>,
+      <xref linkend="gtk2"/> and
+      <xref linkend="gtk-doc"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/colord-gtk"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Colord GTK</title>
+
+    <warning>
+      <para>
+        If building the documentation <command>make -j1</command> must be used.
+      </para>
+    </warning>
+
+    <para>
+      Install <application>Colord GTK</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr    \
+            --enable-vala    \
+            --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <option>--enable-vala</option>: This switch enables
+      building of the Vala bindings. Remove if you don't
+      have <xref linkend="vala"/> installed.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          cd-convert
+        </seg>
+        <seg>
+          libcolord-gtk.so
+        </seg>
+        <seg>
+          /usr/include/colord-1/colord-gtk and
+          /usr/share/gtk-doc/html/colord-gtk
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="cd-convert">
+        <term><command>cd-convert</command></term>
+        <listitem>
+          <para>
+            is a Color Manager Testing Tool.
+          </para>
+          <indexterm zone="colord-gtk cd-convert">
+            <primary sortas="b-cd-convert">cd-convert</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcolord-gtk">
+        <term><filename class="libraryfile">libcolord-gtk.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Colord</application>
+            <application>GTK+</application> bindings.
+          </para>
+          <indexterm zone="colord-gtk libcolord-gtk">
+            <primary sortas="c-libcolord-gtk">libcolord-gtk.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: x/lib/gtk-engines.xml
===================================================================
--- x/lib/gtk-engines.xml	(revision e4685712726ec9b28af2ec1ea71a3c3c16a59e37)
+++ x/lib/gtk-engines.xml	(revision edd70f1428afd85eb0b76934ee03f2c58faf1a69)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="gtk-engines" xreflabel="GTK Engines-&gtk-engines-version;">
+<sect1 id="gtk-engines" xreflabel="GTK Engines-&gtk-engines-version;" revision="systemd">
   <?dbhtml filename="gtk-engines.html"?>
 
Index: x/lib/gtk-vnc.xml
===================================================================
--- x/lib/gtk-vnc.xml	(revision edd70f1428afd85eb0b76934ee03f2c58faf1a69)
+++ x/lib/gtk-vnc.xml	(revision edd70f1428afd85eb0b76934ee03f2c58faf1a69)
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY gtk-vnc-download-http "&gnome-download-http;/gtk-vnc/0.5/gtk-vnc-&gtk-vnc-version;.tar.xz">
+  <!ENTITY gtk-vnc-download-ftp  "&gnome-download-ftp;/gtk-vnc/0.5/gtk-vnc-&gtk-vnc-version;.tar.xz">
+  <!ENTITY gtk-vnc-md5sum        "bc7b79c4b8124294dacf91b8128a158c">
+  <!ENTITY gtk-vnc-size          "412 KB">
+  <!ENTITY gtk-vnc-buildsize     "11 MB">
+  <!ENTITY gtk-vnc-time          "0.2 SBU">
+]>
+
+<sect1 id="gtk-vnc" xreflabel="gtk-vnc-&gtk-vnc-version;" revision="systemd">
+  <?dbhtml filename="gtk-vnc.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>gtk-vnc-&gtk-vnc-version;</title>
+
+  <indexterm zone="gtk-vnc">
+    <primary sortas="a-gtk-vnc">gtk-vnc</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Gtk VNC</title>
+
+    <para>
+      The <application>Gtk VNC</application> package contains a VNC viewer widget
+      for <application>GTK+</application>. It is built using coroutines allowing
+      it to be completely asynchronous while remaining single threaded.
+    </para>
+
+    <!-- &lfs77_checked; -->
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gtk-vnc-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gtk-vnc-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gtk-vnc-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gtk-vnc-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gtk-vnc-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gtk-vnc-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Gtk VNC Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gnutls"/>,
+      <xref linkend="gtk3"/> and
+      <xref linkend="libgcrypt"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="vala"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="cyrus-sasl"/>,
+      <xref linkend="pulseaudio"/> and
+      <ulink url="http://view.sourceforge.net/">libview</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/gtk-vnc"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Gtk VNC</title>
+
+    <para>
+      Install <application>Gtk VNC</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr  \
+            --with-gtk=3.0 \
+            --enable-vala  \
+            --without-sasl &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a testsuite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--with-gtk=3.0</parameter>: This switch enables
+      building of the <application>GTK+ 3</application> library
+      instead of the <application>GTK+ 2</application> one.
+    </para>
+
+    <para>
+      <parameter>--enable-vala</parameter>: This switch enables
+      building of the Vala bindings. Remove if you don't have
+      <xref linkend="vala"/> installed.
+    </para>
+
+    <para>
+      <parameter>--without-sasl</parameter>: This switch disables the
+      use of <application>Cyrus SASL</application> for authentication.
+      Remove it if you have installed
+      <application>Cyrus SASL</application> and wish to enable it for
+      authentication.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          gvnccapture
+        </seg>
+        <seg>
+          libgtk-vnc-2.0.so, libgvnc-1.0.so and libgvncpulse-1.0.so
+        </seg>
+        <seg>
+          /usr/include/gtk-vnc-2.0,
+          /usr/include/gvnc-1.0 and
+          /usr/include/gvncpulse-1.0
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gvnccapture">
+        <term><command>gvnccapture</command></term>
+        <listitem>
+          <para>
+            is used to capture image from VNC server.
+          </para>
+          <indexterm zone="gtk-vnc gvnccapture">
+            <primary sortas="b-gvnccapture">gvnccapture</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgtk-vnc-2">
+        <term><filename class="libraryfile">libgtk-vnc-2.0.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>GTK+ 3</application> bindings for
+            <application>Gtk VNC</application>.
+          </para>
+          <indexterm zone="gtk-vnc libgtk-vnc-2">
+            <primary sortas="c-libgtk-vnc-2.0">libgtk-vnc-2.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgvnc-1a">
+        <term><filename class="libraryfile">libgvnc-1.0.so</filename></term>
+        <listitem>
+          <para>
+            contains the GObject bindings for <application>Gtk VNC</application>.
+          </para>
+          <indexterm zone="gtk-vnc libgvnc-1a">
+            <primary sortas="c-libgvnc-1.0">libgvnc-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgvncpulse-1">
+        <term><filename class="libraryfile">libgvncpulse-1.0.so</filename></term>
+        <listitem>
+          <para>
+            is the <application>PulseAudio</application> bridge for
+            <application>Gtk VNC</application>.
+          </para>
+          <indexterm zone="gtk-vnc libgvncpulse-1">
+            <primary sortas="c-libgvncpulse-1.0">libgvncpulse-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision e4685712726ec9b28af2ec1ea71a3c3c16a59e37)
+++ x/lib/lib.xml	(revision edd70f1428afd85eb0b76934ee03f2c58faf1a69)
@@ -35,4 +35,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter-gst.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter-gtk.xml"/>
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="colord-gtk.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fltk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="freeglut.xml"/>
@@ -42,7 +46,14 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk+2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk+3.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-engines.xml"/> -->
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-engines.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkmm2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkmm3.xml"/>
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-vnc.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtksourceview.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imlib2.xml"/>
@@ -59,5 +70,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtwebkit5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2.xml"/> -->
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk.xml"/>
 
Index: x/lib/webkitgtk2.xml
===================================================================
--- x/lib/webkitgtk2.xml	(revision edd70f1428afd85eb0b76934ee03f2c58faf1a69)
+++ x/lib/webkitgtk2.xml	(revision edd70f1428afd85eb0b76934ee03f2c58faf1a69)
@@ -0,0 +1,380 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY webkitgtk2-download-http "http://webkitgtk.org/releases/webkitgtk-&webkitgtk2-version;.tar.xz">
+  <!ENTITY webkitgtk2-download-ftp  " ">
+  <!ENTITY webkitgtk2-md5sum        "1b3f18d4087dfc648e8060c14e16e202">
+  <!ENTITY webkitgtk2-size          "9.4 MB">
+  <!ENTITY webkitgtk2-buildsize     "1.5 GB (both built)">
+  <!ENTITY webkitgtk2-time          "50 SBU (using parallelism=4, both built, webkitgtk-3.0 takes a little longer than webkitgtk-1.0)">
+]>
+
+<sect1 id="webkitgtk2" xreflabel="WebKitGTK+-&webkitgtk2-version;" revision="systemd">
+  <?dbhtml filename="webkitgtk2.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>WebKitGTK+-&webkitgtk2-version;</title>
+
+  <indexterm zone="webkitgtk2">
+    <primary sortas="a-WebKitGTK+">WebKitGTK+</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to WebKitGTK+</title>
+
+    <para>
+      The <application>WebKitGTK+</application> is the port of the portable
+      web rendering engine <application>WebKit</application> to the
+      <application>GTK+ 3</application> and <application>GTK+ 2</application>
+      platforms.
+    </para>
+
+    <!-- &lfs77_checked; -->
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&webkitgtk2-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&webkitgtk2-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &webkitgtk2-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &webkitgtk2-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &webkitgtk2-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &webkitgtk2-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gst10-plugins-base"/>,
+      <xref linkend="gtk3"/> or
+      <xref linkend="gtk2"/> or both,
+      <xref linkend="icu"/>,
+      <xref linkend="libgudev"/>,
+      <xref linkend="libsecret"/>,
+      <xref linkend="libsoup"/>,
+      <xref linkend="libwebp"/>,
+      <xref linkend="mesa"/>,
+      <xref linkend="ruby"/>,
+      <xref linkend="sqlite"/> and
+      <xref linkend="which"/>
+    </para>
+
+    <note>
+      <para>
+        Note that WebKit2 links against <application>GTK+ 2</application>
+        (even if <application>GTK+ 3</application> is being used) in order
+        to be able to use NPAPI plugins such as Adobe Flash.
+      </para>
+    </note>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="enchant"/>,
+      <xref linkend="geoclue2"/> or
+      <xref linkend="geoclue"/>,
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="hicolor-icon-theme"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="llvm"/> and
+      <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/webkitgtk"/>
+    </para>
+
+    <caution>
+      <para>
+        The BLFS systemd development team is looking into archiving this
+        package due to ease of maintenance and incompatibility with GCC6.
+      </para>
+    </caution>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of WebKitGTK+</title>
+
+    <para>
+      If you have not installed <xref linkend="gtk-doc"/>, fix a bug that will
+      cause <command>make install</command> to fail:
+    </para>
+
+<screen><userinput>sed -i '/generate-gtkdoc --rebase/s:^:# :' GNUmakefile.in</userinput></screen>
+
+    <note>
+      <para>
+        Unless noted otherwise, the packages depending on this package
+        expect it to be built against <application>GTK+ 3</application>.
+      </para>
+    </note>
+
+    <para>
+      To build <application>WebKitGTK+</application> against
+      <application>GTK+ 3</application>, run the following
+      commands:
+    </para>
+
+<screen><userinput>mkdir build3 &amp;&amp;
+pushd build3 &amp;&amp;
+../configure --prefix=/usr --enable-introspection &amp;&amp;
+make &amp;&amp;
+popd</userinput></screen>
+
+    <para>
+      To build <application>WebKitGTK+</application> against
+      <application>GTK+ 2</application>, run the following
+      commands:
+    </para>
+
+<screen><userinput>mkdir build2 &amp;&amp;
+pushd build2 &amp;&amp;
+../configure --prefix=/usr --with-gtk=2.0 --disable-webkit2 &amp;&amp;
+make &amp;&amp;
+popd</userinput></screen>
+
+    <para>
+      This package does not have a working testsuite. However, there are two
+      useable basic graphical web browsers in the build directory,
+      <application>Programs/GtkLauncher</application> and
+      <application>Programs/MiniBrowser</application>. If launching any one
+      fails, there is a problem with the build.
+    </para>
+
+    <para>
+      If you have built the package against <application>GTK+ 3</application>,
+      install it by running the following commands as the <systemitem
+      class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make -C build3 install                             &amp;&amp;
+rm -rf /usr/share/gtk-doc/html/webkit{,dom}gtk-3.0 &amp;&amp;
+if [ -e /usr/share/gtk-doc/html/webkitdomgtk ]; then
+  mv -v /usr/share/gtk-doc/html/webkitdomgtk{,-3.0}
+fi
+if [ -e /usr/share/gtk-doc/html/webkitgtk ]; then
+  mv -v /usr/share/gtk-doc/html/webkitgtk{,-3.0}
+fi</userinput></screen>
+
+    <para>
+      If you have built the package against <application>GTK+ 2</application>,
+      install it by running the following commands as the <systemitem
+      class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make -C build2 install                             &amp;&amp;
+rm -rf /usr/share/gtk-doc/html/webkit{,dom}gtk-1.0 &amp;&amp;
+if [ -e /usr/share/gtk-doc/html/webkitdomgtk ]; then
+  mv -v /usr/share/gtk-doc/html/webkitdomgtk{,-1.0}
+fi
+if [ -e /usr/share/gtk-doc/html/webkitgtk ]; then
+  mv -v /usr/share/gtk-doc/html/webkitgtk{,-1.0}
+fi</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--enable-introspection</parameter>: This switch enables
+      <application>Gobject Introspection</application> bindings and is
+      required if building <application>GNOME</application> Desktop.
+      Remove if you don't have <application>Gobject
+      Introspection</application> installed or you don't want to install
+      <application>GNOME</application>. It is not needed if building
+      against <application>GTK+ 2</application>, although it can be used
+      if desired.
+    </para>
+
+    <para>
+      <parameter>--with-gtk=2.0 --disable-webkit2</parameter>: These switches
+      force <application>WebKitGTK+</application> to compile against
+      <application>GTK+ 2</application>, even if
+      <application>GTK+ 3</application> is also installed.
+    </para>
+
+    <para>
+      <option>--disable-geolocation</option>: Use this switch if you don't
+      want to install <xref linkend="geoclue"/> or
+      <xref linkend="geoclue2"/>.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          jsc-3 <emphasis>or</emphasis> jsc-1
+        </seg>
+        <seg>
+          libjavascriptcoregtk-3.0.so,
+          libwebkit2gtk-3.0.so and
+          libwebkitgtk-3.0.so <emphasis>or</emphasis>
+          libjavascriptcoregtk-1.0.so and
+          libwebkitgtk-1.0.so
+        </seg>
+        <seg>
+          /usr/include/webkitgtk-3.0,
+          /usr/lib/webkit2gtk-3.0,
+          /usr/share/gtk-doc/html/webkitgtk-3.0,
+          /usr/share/gtk-doc/html/webkitdomgtk-3.0,
+          /usr/share/gtk-doc/html/webkit2gtk and
+          /usr/share/webkitgtk-3.0 <emphasis>or</emphasis>
+          /usr/include/webkit-1.0,
+          /usr/share/gtk-doc/html/webkitgtk-1.0,
+          /usr/share/gtk-doc/html/webkitdomgtk-1.0 and
+          /usr/share/webkit-1.0
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="jsc-3">
+        <term><command>jsc-3</command></term>
+        <listitem>
+          <para>
+            is a command-line utility that allows you to run JavaScript programs
+            outside of the context of a web browser linked against
+            <filename class="libraryfile">libjavascriptcoregtk-3.0.so</filename>.
+          </para>
+          <indexterm zone="webkitgtk2 jsc-3">
+            <primary sortas="b-jsc-3">jsc-3</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jsc-1">
+        <term><command>jsc-1</command></term>
+        <listitem>
+          <para>
+            is a command-line utility that allows you to run JavaScript programs
+            outside of the context of a web browser linked against
+            <filename class="libraryfile">libjavascriptcoregtk-1.0.so</filename>.
+          </para>
+          <indexterm zone="webkitgtk2 jsc-1">
+            <primary sortas="b-jsc-1">jsc-1</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libjavascriptcoregtk-3.0">
+        <term><filename
+        class="libraryfile">libjavascriptcoregtk-3.0.so</filename></term>
+        <listitem>
+          <para>
+            contains core JavaScript API functions used by <command>jsc-3</command>
+            and <filename class="libraryfile">libwebkitgtk-3.0.so</filename>.
+          </para>
+          <indexterm zone="webkitgtk2 libjavascriptcoregtk-3.0">
+            <primary sortas="c-libjavascriptcoregtk-3.0">libjavascriptcoregtk-3.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libwebkitgtk-3.0">
+        <term><filename class="libraryfile">libwebkitgtk-3.0.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>WebKitGTK+</application> API functions for
+            <application>GTK+ 3</application>.
+          </para>
+          <indexterm zone="webkitgtk2 libwebkitgtk-3.0">
+            <primary sortas="c-libwebkitgtk-3.0">libwebkitgtk-3.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libwebkit2gtk-3.0">
+        <term><filename class="libraryfile">libwebkit2gtk-3.0.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>WebKit2</application> API functions.
+          </para>
+          <indexterm zone="webkitgtk2 libwebkit2gtk-3.0">
+            <primary sortas="c-libwebkit2gtk-3.0">libwebkit2gtk-3.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libjavascriptcoregtk-1.0">
+        <term><filename
+        class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term>
+        <listitem>
+          <para>
+            contains core JavaScript API functions used by <command>jsc-1</command>
+            and <filename class="libraryfile">libwebkitgtk-1.0.so</filename>.
+          </para>
+          <indexterm zone="webkitgtk2 libjavascriptcoregtk-1.0">
+            <primary sortas="c-libjavascriptcoregtk-1.0">libjavascriptcoregtk-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libwebkitgtk-1.0">
+        <term><filename class="libraryfile">libwebkitgtk-1.0.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>WebKitGTK+</application> API functions for
+            <application>GTK+ 2</application>.
+          </para>
+          <indexterm zone="webkitgtk2 libwebkitgtk-1.0">
+            <primary sortas="c-libwebkitgtk-1.0">libwebkitgtk-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
