Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision f761a212edb57061226adab82df0df4618d1dc3d)
+++ general/genlib/genlib.xml	(revision fbfb9981862ccef8066bcbe7c5f4a6b394f98681)
@@ -134,4 +134,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxslt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwacom.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwpe.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libyaml.xml"/>
 
@@ -158,4 +159,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wayland.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wayland-protocols.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wpebackend-fdo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xapian.xml"/>
Index: general/genlib/libwpe.xml
===================================================================
--- general/genlib/libwpe.xml	(revision fbfb9981862ccef8066bcbe7c5f4a6b394f98681)
+++ general/genlib/libwpe.xml	(revision fbfb9981862ccef8066bcbe7c5f4a6b394f98681)
@@ -0,0 +1,157 @@
+<?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 libwpe-download-http "http://wpewebkit.org/releases/libwpe-&libwpe-version;.tar.xz">
+  <!ENTITY libwpe-download-ftp  " ">
+  <!ENTITY libwpe-md5sum        "269ecb60d4ef80a0877d25a5828c8b82">
+  <!ENTITY libwpe-size          "52 KB">
+  <!ENTITY libwpe-buildsize     "2.0 MB">
+  <!ENTITY libwpe-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="libwpe" xreflabel="libwpe-&libwpe-version;">
+  <?dbhtml filename="libwpe.html"?>
+
+  <sect1info>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libwpe-&libwpe-version;</title>
+
+  <indexterm zone="libwpe">
+    <primary sortas="a-libwpe">libwpe</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libwpe</title>
+
+    <para>
+      The <application>libwpe</application> package contains a general purpose
+      library for WPE WebKit and the WPE Renderer.
+    </para>
+
+    &lfs101_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libwpe-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libwpe-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libwpe-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libwpe-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libwpe-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libwpe-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libwpe Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libxkbcommon"/> and
+      <xref linkend="mesa"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <ulink url="https://pypi.org/project/hotdoc/">hotdoc</ulink>
+      <!-- FIXME - meson_options.txt mentions using hotdoc if you pass a switch
+           to generate documentation. -->
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libwpe"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libwpe</title>
+
+    <para>
+      Install <application>libwpe</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr .. &amp;&amp;
+ninja</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>ninja install</userinput></screen>
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libwpe-1.0.so
+        </seg>
+        <seg>
+          /usr/include/wpe-1.0
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libwpe-1.0">
+        <term><filename class="libraryfile">libwpe-1.0.so</filename></term>
+        <listitem>
+          <para>
+            contains functions that provide a general purpose library for 
+            WPEWebKit and the WPE Renderer
+          </para>
+          <indexterm zone="libwpe libwpe-1.0">
+            <primary sortas="c-libwpe-1.0">libwpe-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+</sect1>
Index: general/genlib/wpebackend-fdo.xml
===================================================================
--- general/genlib/wpebackend-fdo.xml	(revision fbfb9981862ccef8066bcbe7c5f4a6b394f98681)
+++ general/genlib/wpebackend-fdo.xml	(revision fbfb9981862ccef8066bcbe7c5f4a6b394f98681)
@@ -0,0 +1,147 @@
+<?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 wpebackend-fdo-download-http "https://wpewebkit.org/releases/wpebackend-fdo-&wpebackend-fdo-version;.tar.xz">
+  <!ENTITY wpebackend-fdo-download-ftp  " ">
+  <!ENTITY wpebackend-fdo-md5sum        "9f4c98cba7805cd594f74f4991920ee7">
+  <!ENTITY wpebackend-fdo-size          "44 KB">
+  <!ENTITY wpebackend-fdo-buildsize     "6.4 MB">
+  <!ENTITY wpebackend-fdo-time          "0.1 SBU">
+]>
+
+<sect1 id="wpebackend-fdo" xreflabel="wpebackend-fdo-&wpebackend-fdo-version;">
+  <?dbhtml filename="wpebackend-fdo.html"?>
+
+  <sect1info>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>wpebackend-fdo-&wpebackend-fdo-version;</title>
+
+  <indexterm zone="wpebackend-fdo">
+    <primary sortas="a-wpebackend-fdo">wpebackend-fdo</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to wpebackend-fdo</title>
+
+    <para>
+      The <application>wpebackend-fdo</application> package contains the
+      Freedesktop.org backend for WPE WebKit and the WPE renderer.
+    </para>
+
+    &lfs101_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&wpebackend-fdo-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&wpebackend-fdo-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &wpebackend-fdo-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &wpebackend-fdo-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &wpebackend-fdo-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &wpebackend-fdo-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">wpebackend-fdo Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libepoxy"/>,
+      <xref linkend="libwpe"/>, and
+      <xref linkend="wayland-protocols"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/wpebackend-fdo"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of wpebackend-fdo</title>
+
+    <para>
+      Install <application>wpebackend-fdo</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr ..
+ninja</userinput></screen>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>ninja install</userinput></screen>
+  </sect2>
+  
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libWPEBackend-fdo-1.0.so
+        </seg>
+        <seg>
+          /usr/include/wpe-fdo-1.0
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libWPEBackend-fdo">
+        <term><filename class="libraryfile">libWPEBackend-fdo-1.0.so</filename></term>
+        <listitem>
+          <para>
+            contains functions that provide the freedesktop.org backend for WPE
+            WebKit and the WPE renderer
+          </para>
+          <indexterm zone="wpebackend-fdo libWPEBackend-fdo">
+            <primary sortas="c-libWPEBackend-fdo">libWPEBackend-fdo-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+</sect1>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f761a212edb57061226adab82df0df4618d1dc3d)
+++ introduction/welcome/changelog.xml	(revision fbfb9981862ccef8066bcbe7c5f4a6b394f98681)
@@ -43,4 +43,22 @@
     -->
     <listitem>
+      <para>May 27th, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to WebKitGTK+-2.32.1. Fixes
+          <ulink url="&blfs-ticket-root;15019">#15019</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Add wpebackend-fdo to the book. Finishes
+          <ulink url="&blfs-ticket-root;14913">#14913</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Add libwpe to the book. Part of
+          <ulink url="&blfs-ticket-root;14913">#14913</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 26th, 2021</para>
       <itemizedlist>
Index: packages.ent
===================================================================
--- packages.ent	(revision f761a212edb57061226adab82df0df4618d1dc3d)
+++ packages.ent	(revision fbfb9981862ccef8066bcbe7c5f4a6b394f98681)
@@ -177,4 +177,5 @@
 <!ENTITY libxslt-version              "1.1.34">
 <!ENTITY libwacom-version             "1.10">
+<!ENTITY libwpe-version               "1.10.0">
 <!ENTITY lzo-version                  "2.10">
 <!ENTITY mtdev-version                "1.1.6">
@@ -197,4 +198,5 @@
 <!ENTITY wayland-version              "1.19.0">
 <!ENTITY wayland-protocols-version    "1.21">
+<!ENTITY wpebackend-fdo-version       "1.8.4">
 <!ENTITY wv-version                   "1.2.9">
 <!ENTITY xapian-version               "1.4.18">
@@ -768,5 +770,5 @@
 <!ENTITY startup-notification-version "0.12">
 <!ENTITY tepl-version                 "6.00.0">
-<!ENTITY webkitgtk-version            "2.32.0">    <!-- Even minors only -->
+<!ENTITY webkitgtk-version            "2.32.1">    <!-- Even minors only -->
 
 <!ENTITY gtk2-libdir                  "2.0/2.10.0">
Index: x/lib/webkitgtk.xml
===================================================================
--- x/lib/webkitgtk.xml	(revision f761a212edb57061226adab82df0df4618d1dc3d)
+++ x/lib/webkitgtk.xml	(revision fbfb9981862ccef8066bcbe7c5f4a6b394f98681)
@@ -7,8 +7,8 @@
   <!ENTITY webkitgtk-download-http "https://webkitgtk.org/releases/webkitgtk-&webkitgtk-version;.tar.xz">
   <!ENTITY webkitgtk-download-ftp  " ">
-  <!ENTITY webkitgtk-md5sum        "a24a9441ad01617be9ac95097cd31e08">
+  <!ENTITY webkitgtk-md5sum        "b12790ae1209e1d5848aeb4fb70994db">
   <!ENTITY webkitgtk-size          "22 MB">
-  <!ENTITY webkitgtk-buildsize     "899 MB (127 MB installed)">
-  <!ENTITY webkitgtk-time          "29 SBU (using parallelism=4, estimated 96 SBU using one core)">
+  <!ENTITY webkitgtk-buildsize     "897 MB (127 MB installed)">
+  <!ENTITY webkitgtk-time          "29 SBU (using parallelism=4, estimated 97 SBU using one core)">
 ]>
 
@@ -72,4 +72,5 @@
     </itemizedlist>
 
+    <!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -81,4 +82,5 @@
       </listitem>
     </itemizedlist>
+    -->
 
     <bridgehead renderas="sect3">WebKitGTK Dependencies</bridgehead>
@@ -100,6 +102,7 @@
       <xref linkend="openjpeg2"/>,
       <xref linkend="ruby"/>,
-      <xref linkend="sqlite"/>, and
-      <xref linkend="which"/>
+      <xref linkend="sqlite"/>,
+      <xref linkend="which"/>, and
+      <xref linkend="wpebackend-fdo"/>
     </para>
 
@@ -124,7 +127,5 @@
       <ulink url="https://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
       <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>, 
-      <ulink url="https://gnome.pages.gitlab.gnome.org/libmanette/">libmanette</ulink>,
-      <ulink url="https://github.com/WebPlatformForEmbedded/libwpe">libwpe</ulink>,
-      <ulink url="https://github.com/Igalia/WPEBackend-fdo">WPEBackend-fdo</ulink>, and
+      <ulink url="https://gnome.pages.gitlab.gnome.org/libmanette/">libmanette</ulink>, and
       <ulink url="https://github.com/flatpak/xdg-dbus-proxy">xdg-dbus-proxy</ulink>
     </para>
@@ -140,17 +141,4 @@
     <bridgehead renderas="sect3">Installation of
     <application>WebKitGTK</application></bridgehead>
-
-<!--
-    <para>First, ensure backward compatibility with the latest version of icu:</para>
-
-<screen><userinput>echo 'add_compile_definitions("U_DEFINE_FALSE_AND_TRUE=1")' &gt;&gt; Source/WTF/wtf/CMakeLists.txt</userinput></screen>
--->
-
-    <!-- Needed for ICU-69.1 -->
-    <para>
-      First, fix building with ICU-69.1:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../webkitgtk-&webkitgtk-version;-icu_69-1.patch</userinput></screen>
 
     <para>
@@ -171,5 +159,5 @@
       -DENABLE_MINIBROWSER=ON     \
       -DUSE_WOFF2=OFF             \
-      -DUSE_WPE_RENDERER=OFF      \
+      -DUSE_WPE_RENDERER=ON       \
       -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
       -Wno-dev -G Ninja ..        &amp;&amp;
@@ -188,5 +176,5 @@
       -DENABLE_MINIBROWSER=ON     \
       -DUSE_WOFF2=OFF             \
-      -DUSE_WPE_RENDERER=OFF      \
+      -DUSE_WPE_RENDERER=ON       \
       -DUSE_SYSTEMD=OFF           \
       -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
@@ -252,7 +240,6 @@
 
     <para>
-      <parameter>-DUSE_WPE_RENDERER=OFF</parameter>: Remove this switch if the optional 
-      packages <ulink url="https://github.com/WebPlatformForEmbedded/libwpe">libwpe</ulink> and
-      <ulink url="https://github.com/Igalia/WPEBackend-fdo">WPEBackend-fdo</ulink> are installed.
+      <parameter>-DUSE_WPE_RENDERER=ON</parameter>: This switch uses the WPE
+      renderer, which is recommended by upstream.
     </para>
 
