Index: archive/ijs.xml
===================================================================
--- archive/ijs.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
+++ archive/ijs.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -0,0 +1,168 @@
+<?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 ijs-download-http "https://www.openprinting.org/download/ijs/download/ijs-&ijs-version;.tar.bz2">
+  <!ENTITY ijs-download-ftp  " ">
+  <!ENTITY ijs-md5sum        "896fdcb7a01c586ba6eb81398ea3f6e9">
+  <!ENTITY ijs-size          "252 KB">
+  <!ENTITY ijs-buildsize     "2.2 MB">
+  <!ENTITY ijs-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="ijs" xreflabel="IJS-&ijs-version;">
+  <?dbhtml filename="ijs.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>IJS-&ijs-version;</title>
+
+  <indexterm zone="ijs">
+    <primary sortas="a-IJS">IJS</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to IJS</title>
+
+    <para>
+      The <application>IJS</application> package contains a
+      library which implements a protocol for transmission
+      of raster page images.
+    </para>
+
+    &lfs84_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&ijs-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&ijs-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &ijs-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &ijs-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &ijs-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &ijs-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/ijs"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of IJS</title>
+
+    <para>
+      Install <application>IJS</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --mandir=/usr/share/man \
+            --enable-shared \
+            --disable-static &amp;&amp;
+make</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>make install</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          ijs_client_example, ijs-config and ijs_server_example
+        </seg>
+        <seg>
+          libijs.so
+        </seg>
+        <seg>
+          /usr/include/ijs
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="ijs-config">
+        <term><command>ijs-config</command></term>
+        <listitem>
+          <para>
+            is a program that is used to determine the compiler and
+            linker flags that should be used to compile and link
+            programs that use IJS.
+          </para>
+          <indexterm zone="ijs ijs-config">
+            <primary sortas="b-ijs-config">ijs-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libijs">
+        <term><filename class="libraryfile">libijs.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>IJS</application> API functions.
+          </para>
+          <indexterm zone="ijs libijs">
+            <primary sortas="c-libijs">libijs.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general.ent
===================================================================
--- general.ent	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ general.ent	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "13">                   <!-- Always 2 digits -->
+<!ENTITY day          "21">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2019">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "June 13th, &year;">
+<!ENTITY releasedate  "June 21st, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: general/genlib/enchant.xml
===================================================================
--- general/genlib/enchant.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ general/genlib/enchant.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -7,7 +7,7 @@
   <!ENTITY enchant-download-http "https://github.com/AbiWord/enchant/releases/download/v&enchant-version;/enchant-&enchant-version;.tar.gz">
   <!ENTITY enchant-download-ftp  " ">
-  <!ENTITY enchant-md5sum        "4b8abb58e00e93363591b3f5ea4f52d5">
-  <!ENTITY enchant-size          "936 KB">
-  <!ENTITY enchant-buildsize     "6.8 MB">
+  <!ENTITY enchant-md5sum        "f6b37378c640ff64e432ae99c25b6977">
+  <!ENTITY enchant-size          "932 KB">
+  <!ENTITY enchant-buildsize     "7.4 MB">
   <!ENTITY enchant-time          "0.2 SBU">
 ]>
@@ -183,5 +183,5 @@
 
       <seglistitem>
-        <seg>enchant</seg>
+        <seg>enchant and enchant-lsmod-2</seg>
         <seg>libenchant.so and various backend libraries</seg>
         <seg>/usr/{include,lib,share}/enchant</seg>
@@ -203,15 +203,15 @@
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry id="enchant-lsmod">
-        <term><command>enchant-lsmod</command></term>
+
+      <varlistentry id="enchant-lsmod-2">
+        <term><command>enchant-lsmod-2</command></term>
         <listitem>
           <para>lists available backends, languages, and dictionaries.</para>
-          <indexterm zone="enchant enchant-lsmod">
-            <primary sortas="b-enchant-lsmod">enchant-lsmod</primary>
+          <indexterm zone="enchant enchant-lsmod-2">
+            <primary sortas="b-enchant-lsmod-2">enchant-lsmod-2</primary>
           </indexterm>
         </listitem>
       </varlistentry>
--->
+
       <varlistentry id="libenchant">
         <term><filename class='libraryfile'>libenchant.so</filename></term>
Index: general/genlib/libassuan.xml
===================================================================
--- general/genlib/libassuan.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ general/genlib/libassuan.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -78,14 +78,4 @@
       </listitem>
     </itemizedlist>
-<!--
-      <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-             Optional, to fix the documentation build:
-            <ulink url="&patch-root;/libassuan-&libassuan-version;-fix_doc_build-1.patch"/>
-          </para>
-        </listitem>
-      </itemizedlist>-->
 
     <bridgehead renderas="sect3">libassuan Dependencies</bridgehead>
@@ -128,5 +118,4 @@
     </para>
 
-<!--<screen><userinput>patch -Np1 -i ../libassuan-&libassuan-version;-fix_doc_build-1.patch &amp;&amp;-->
 <screen remap="doc"><userinput>make -C doc pdf ps</userinput></screen>
 
@@ -141,11 +130,11 @@
 <screen role="root"><userinput>make install &amp;&amp;
 
-install -v -dm755   /usr/share/doc/libassuan-1.8.4/html &amp;&amp;
+install -v -dm755   /usr/share/doc/libassuan-&libassuan-version;/html &amp;&amp;
 install -v -m644 doc/assuan.html/* \
-                    /usr/share/doc/libassuan-1.8.4/html &amp;&amp;
+                    /usr/share/doc/libassuan-&libassuan-version;/html &amp;&amp;
 install -v -m644 doc/assuan_nochunks.html \
-                    /usr/share/doc/libassuan-1.8.4      &amp;&amp;
+                    /usr/share/doc/libassuan-&libassuan-version;      &amp;&amp;
 install -v -m644 doc/assuan.{txt,texi} \
-                    /usr/share/doc/libassuan-1.8.4</userinput></screen>
+                    /usr/share/doc/libassuan-&libassuan-version;</userinput></screen>
 
     <para>
Index: general/genlib/libsigc++.xml
===================================================================
--- general/genlib/libsigc++.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ general/genlib/libsigc++.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -7,8 +7,8 @@
   <!ENTITY libsigc-download-http "&gnome-download-http;/libsigc++/2.10/libsigc++-&libsigc-version;.tar.xz">
   <!ENTITY libsigc-download-ftp  "&gnome-download-ftp;/libsigc++/2.10/libsigc++-&libsigc-version;.tar.xz">
-  <!ENTITY libsigc-md5sum        "549cffbdb72fa105b782756f2713ffc7">
-  <!ENTITY libsigc-size          "3.9 MB">
-  <!ENTITY libsigc-buildsize     "49 MB (with tests)">
-  <!ENTITY libsigc-time          "0.3 SBU (with tests)">
+  <!ENTITY libsigc-md5sum        "1b067bfae0b502e6a5127336cb09d2dd">
+  <!ENTITY libsigc-size          "3.8 MB">
+  <!ENTITY libsigc-buildsize     "65 MB (with tests)">
+  <!ENTITY libsigc-time          "0.2 SBU (with tests)">
 ]>
 
@@ -70,4 +70,12 @@
       </listitem>
     </itemizedlist>
+
+    <bridgehead renderas="sect3">libsigc++ Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/> and
+      <xref linkend="libxslt"/> (for documentation)
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: general/genlib/libsigsegv.xml
===================================================================
--- general/genlib/libsigsegv.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ general/genlib/libsigsegv.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -31,5 +31,5 @@
 
     <para>
-      This is a library for handling page faults in user mode. A page fault
+      libsigsegv is a library for handling page faults in user mode. A page fault
       occurs when a program tries to access to a region of memory that is
       currently not available. Catching and handling a page fault is a useful
@@ -110,4 +110,5 @@
       libraries are compiled.
     </para>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
Index: general/graphlib/graphlib.xml
===================================================================
--- general/graphlib/graphlib.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ general/graphlib/graphlib.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -32,5 +32,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphite2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="harfbuzz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ijs.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ijs.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jasper.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lcms.xml"/>
Index: neral/graphlib/ijs.xml
===================================================================
--- general/graphlib/ijs.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ 	(revision )
@@ -1,168 +1,0 @@
-<?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 ijs-download-http "https://www.openprinting.org/download/ijs/download/ijs-&ijs-version;.tar.bz2">
-  <!ENTITY ijs-download-ftp  " ">
-  <!ENTITY ijs-md5sum        "896fdcb7a01c586ba6eb81398ea3f6e9">
-  <!ENTITY ijs-size          "252 KB">
-  <!ENTITY ijs-buildsize     "2.2 MB">
-  <!ENTITY ijs-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="ijs" xreflabel="IJS-&ijs-version;">
-  <?dbhtml filename="ijs.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>IJS-&ijs-version;</title>
-
-  <indexterm zone="ijs">
-    <primary sortas="a-IJS">IJS</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to IJS</title>
-
-    <para>
-      The <application>IJS</application> package contains a
-      library which implements a protocol for transmission
-      of raster page images.
-    </para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ijs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ijs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ijs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ijs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ijs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ijs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/ijs"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of IJS</title>
-
-    <para>
-      Install <application>IJS</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --mandir=/usr/share/man \
-            --enable-shared \
-            --disable-static &amp;&amp;
-make</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>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          ijs_client_example, ijs-config and ijs_server_example
-        </seg>
-        <seg>
-          libijs.so
-        </seg>
-        <seg>
-          /usr/include/ijs
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ijs-config">
-        <term><command>ijs-config</command></term>
-        <listitem>
-          <para>
-            is a program that is used to determine the compiler and
-            linker flags that should be used to compile and link
-            programs that use IJS.
-          </para>
-          <indexterm zone="ijs ijs-config">
-            <primary sortas="b-ijs-config">ijs-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libijs">
-        <term><filename class="libraryfile">libijs.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>IJS</application> API functions.
-          </para>
-          <indexterm zone="ijs libijs">
-            <primary sortas="c-libijs">libijs.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/poppler.xml
===================================================================
--- general/graphlib/poppler.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ general/graphlib/poppler.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -7,8 +7,8 @@
   <!ENTITY poppler-download-http "https://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
   <!ENTITY poppler-download-ftp  " ">
-  <!ENTITY poppler-md5sum        "99f1e6ab4c96d14840e862eb027f0fc0">
+  <!ENTITY poppler-md5sum        "acde633a5533784c678f4019843c01f8">
   <!ENTITY poppler-size          "1.5 MB">
-  <!ENTITY poppler-buildsize     "64 MB (with Qt5 library and tests)">
-  <!ENTITY poppler-time          "0.8 SBU (with parallelism=4, Qt5 library, and tests)">
+  <!ENTITY poppler-buildsize     "85 MB (with Qt5 library and tests)">
+  <!ENTITY poppler-time          "0.6 SBU (with parallelism=4, Qt5 library, and tests)">
 
   <!ENTITY poppler-data-version       "0.4.9">
@@ -295,4 +295,16 @@
       <?dbhtml list-presentation="table"?>
 
+      <varlistentry id="pdfattach">
+        <term><command>pdfattach</command></term>
+        <listitem>
+          <para>
+            adds a new embedded file to an existing PDF file.
+          </para>
+          <indexterm zone="poppler pdfattach">
+            <primary sortas="b-pdfattach">pdfattach</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>  
+
       <varlistentry id="pdfdetach">
         <term><command>pdfdetach</command></term>
Index: general/prog/clisp.xml
===================================================================
--- general/prog/clisp.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ general/prog/clisp.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -10,5 +10,5 @@
   <!ENTITY clisp-size          "7.8 MB">
   <!ENTITY clisp-buildsize     "163 MB (add 8 MB for tests)">
-  <!ENTITY clisp-time          "0.9 SBU (18 SBU with tests)">
+  <!ENTITY clisp-time          "0.9 SBU (1.2 SBU with tests)">
 ]>
 
Index: general/prog/lxml.xml
===================================================================
--- general/prog/lxml.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ general/prog/lxml.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -7,8 +7,8 @@
   <!ENTITY lxml-download-http "&pymodules-dl;/l/lxml/lxml-&lxml-version;.tar.gz">
   <!ENTITY lxml-download-ftp  " ">
-  <!ENTITY lxml-md5sum        "d35e90d9de17e1370fbb7e6059bd95ed">
-  <!ENTITY lxml-size          "4.2 MB">
-  <!ENTITY lxml-buildsize     "152 MB (add 38 MB for the testsuite)">
-  <!ENTITY lxml-time          "1.8 SBU (add 1.8 SBU for the testsuite)">
+  <!ENTITY lxml-md5sum        "aec44da0457dca385261e5ceb3fe36f9">
+  <!ENTITY lxml-size          "2.4 MB">
+  <!ENTITY lxml-buildsize     "178 MB (add 44 MB for the testsuite)">
+  <!ENTITY lxml-time          "1.5 SBU (add 1.5 SBU for the testsuite)">
 ]>
 
Index: general/prog/swig.xml
===================================================================
--- general/prog/swig.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ general/prog/swig.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -164,6 +164,6 @@
       building of tests and examples for &lt;language&gt;, but all the
       languages capabilities of <application>SWIG</application> are always
-      built. We use it for <application>Clisp</application>, because the
-      SWIG implementation is very incomplete and a lot of tests fail.
+      built. <!--We use it for <application>Clisp</application>, because the
+      SWIG implementation is very incomplete and a lot of tests fail. -->
     </para>
 
Index: gnome/platform/gcr.xml
===================================================================
--- gnome/platform/gcr.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ gnome/platform/gcr.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -120,5 +120,6 @@
     <para>
       To test the results, issue: <command>make -k check</command>.
-      The tests must be run from an X Terminal or similar.
+      The tests must be run from an X Terminal or similar. One test,
+      "test-openssl 3", is known to fail.
     </para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ introduction/welcome/changelog.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -42,6 +42,106 @@
     </listitem>
     -->
+    <listitem>
+      <para>June 21st, 2019</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to GPGME-1.13.1. Fixes
+          <ulink url="&blfs-ticket-root;12154">#12154</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Update to firefox-67.0.3 (Security Fix). Fixes
+          <ulink url="&blfs-ticket-root;12185">#12185</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to WebKitGTK+-2.24.2. Three security fixes.
+          Fixes <ulink url="&blfs-ticket-root;12072">#12072</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>June 20th, 2019</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to enchant-2.2.4. Fixes
+          <ulink url="&blfs-ticket-root;12168">#12168</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to GnuPG-2.2.16. Fixes
+          <ulink url="&blfs-ticket-root;12106">#12106</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>June 19th, 2019</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to gtk+-3.24.9. Fixes
+          <ulink url="&blfs-ticket-root;12171">#12171</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Update to firefox-67.0.3 (Security Fix, and also
+          disable elf-hack which breaks the install on some machines). Fixes
+          <ulink url="&blfs-ticket-root;12172">#12172</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>June 17th, 2019</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to Qt5 and QtWebEngine 5.12.4 (Security Fixes). Fixes
+          <ulink url="&blfs-ticket-root;12160">#12160</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Update to vim-8.1.1535 (Security Fix). Fixes
+          <ulink url="&blfs-ticket-root;12161">#12161</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
 
     <listitem revision="sysv">
+      <para>June 15th, 2019</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Archived IJS.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gutenprint-5.2.15. Fixes
+          <ulink url="&blfs-ticket-root;12152">#12152</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to epiphany-3.32.3. Fixes
+          <ulink url="&blfs-ticket-root;12148">#12148</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>June 14th, 2019</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to cups-filters-1.25.0. Fixes
+          <ulink url="&blfs-ticket-root;12126">#12126</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to lxml-4.3.4 (Python Module). Fixes
+          <ulink url="&blfs-ticket-root;12146">#12146</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to poppler-0.77.0. Fixes
+          <ulink url="&blfs-ticket-root;12096">#12096</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libsigc++-2.10.2. Fixes
+          <ulink url="&blfs-ticket-root;12150">#12150</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    
+    <listitem>
       <para>June 13th, 2019</para>
       <itemizedlist>
Index: lxde/desktop/lxappearance.xml
===================================================================
--- lxde/desktop/lxappearance.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ lxde/desktop/lxappearance.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -106,5 +106,4 @@
 <screen><userinput>./configure --prefix=/usr     \
             --sysconfdir=/etc \
-            --disable-static  \
             --enable-dbus     &amp;&amp;
 make</userinput></screen>
@@ -140,7 +139,4 @@
       manual pages.
     </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ multimedia/videoutils/ffmpeg.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -401,4 +401,9 @@
 
     <para>
+      <option>--enable-libpulse</option>: Enables support for
+      <application>Pulseaudio</application> for audio output.
+    </para>
+
+    <para>
       <command>gcc tools/qt-faststart.c -o tools/qt-faststart</command>: This
       builds the <command>qt-faststart</command> program which can modify
Index: packages.ent
===================================================================
--- packages.ent	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ packages.ent	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -15,7 +15,7 @@
 <!ENTITY cryptsetup-version           "&cryptsetup-minor;.6">
 <!ENTITY cyrus-sasl-version           "2.1.27">
-<!ENTITY gnupg2-version               "2.2.15">
+<!ENTITY gnupg2-version               "2.2.16">
 <!ENTITY gnutls-version               "3.6.8">
-<!ENTITY gpgme-version                "1.13.0">
+<!ENTITY gpgme-version                "1.13.1">
 <!ENTITY haveged-version              "1.9.2">
 <!ENTITY iptables-version             "1.8.3">
@@ -95,5 +95,5 @@
 <!ENTITY clucene-version              "2.3.3.4">
 <!ENTITY dbus-glib-version            "0.110">
-<!ENTITY enchant-version              "2.2.3">
+<!ENTITY enchant-version              "2.2.4">
 <!ENTITY exempi-version               "2.5.0">
 <!ENTITY expat-version                "2.1.0">
@@ -153,5 +153,5 @@
 <!ENTITY libqmi-version               "1.22.4">
 <!ENTITY libseccomp-version           "2.4.1">
-<!ENTITY libsigc-version              "2.10.1">
+<!ENTITY libsigc-version              "2.10.2">
 <!ENTITY libsigsegv-version           "2.12">
 <!ENTITY libssh2-version              "1.8.2">
@@ -204,5 +204,5 @@
 <!ENTITY graphite2-version            "1.3.13">
 <!ENTITY harfbuzz-version             "2.5.0">
-<!ENTITY ijs-version                  "0.35">
+<!--<!ENTITY ijs-version                  "0.35">-->
 <!ENTITY jasper-version               "2.0.14">
 <!ENTITY lcms-version                 "1.19">
@@ -225,5 +225,5 @@
 <!ENTITY openjpeg2-version            "2.3.1">
 <!ENTITY pixman-version               "0.38.4">   <!-- Even minors only -->
-<!ENTITY poppler-version              "0.76.1">
+<!ENTITY poppler-version              "0.77.0">
 <!ENTITY potrace-version              "1.15">
 <!ENTITY qpdf-version                 "8.4.2">
@@ -522,5 +522,5 @@
 <!ENTITY Jinja2-version               "2.10.1">
 <!-- libxml2 for Python2 shares the version of libxml2 -->
-<!ENTITY lxml-version                 "4.3.3">
+<!ENTITY lxml-version                 "4.3.4">
 <!ENTITY mako-version                 "1.0.10">
 <!ENTITY MarkupSafe-version           "1.1.1">
@@ -692,5 +692,5 @@
 <!ENTITY goffice010-version           "0.10.44">
 <!ENTITY gtk2-version                 "2.24.32">
-<!ENTITY gtk3-version                 "3.24.8">
+<!ENTITY gtk3-version                 "3.24.9">
 <!ENTITY gtk-engines-version          "2.20.2">
 <!ENTITY gtkmm2-version               "2.24.5">
@@ -707,11 +707,11 @@
 <!ENTITY pango-version                "1.42.4">
 <!ENTITY pangomm-version              "2.42.0">
-<!ENTITY qt5-version                  "5.12.3">
-<!ENTITY qtwebengine-version          "5.12.3">
+<!ENTITY qt5-version                  "5.12.4">
+<!ENTITY qtwebengine-version          "5.12.4">
 <!ENTITY qtwebkit-version             "5.9.0">
 <!ENTITY qscintilla-version           "2.10.4">
 <!ENTITY shared-mime-info-version     "1.12">
 <!ENTITY startup-notification-version "0.12">
-<!ENTITY webkitgtk-version            "2.24.1">    <!-- Even minors only -->
+<!ENTITY webkitgtk-version            "2.24.2">    <!-- Even minors only -->
 
 <!ENTITY gtk2-libdir                  "2.0/2.10.0">
@@ -866,7 +866,7 @@
 <!-- Chapter 40 -->
 <!--<!ENTITY chromium-version             "64.0.3282.186">-->
-<!ENTITY epiphany-version             "3.32.2">
+<!ENTITY epiphany-version             "3.32.3">
 <!ENTITY falkon-version               "3.0.1">
-<!ENTITY firefox-version              "67.0.2">
+<!ENTITY firefox-version              "67.0.4">
 <!ENTITY flashplayer-version          "27.0.0.187">
 <!ENTITY qupzilla-version             "2.2.6">
@@ -997,7 +997,7 @@
 <!-- Chapter 46 -->
 <!ENTITY cups-version                 "2.2.11">
-<!ENTITY cups-filters-version         "1.23.0">
+<!ENTITY cups-filters-version         "1.25.0">
 <!ENTITY gs-version                   "9.27">
-<!ENTITY gutenprint-version           "5.2.14">
+<!ENTITY gutenprint-version           "5.2.15">
 
 <!-- Chapter 47 -->
Index: postlfs/filesystems/ntfs-3g.xml
===================================================================
--- postlfs/filesystems/ntfs-3g.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ postlfs/filesystems/ntfs-3g.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -204,5 +204,5 @@
     </para>
 
-<screen role="root"><userinput>chmod -v 777 /mnt/usb</userinput></screen>
+<screen role="nodump"><userinput>chmod -v 777 /mnt/usb</userinput></screen>
 
   </sect2>
Index: postlfs/security/gnupg2.xml
===================================================================
--- postlfs/security/gnupg2.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ postlfs/security/gnupg2.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -7,8 +7,8 @@
   <!ENTITY gnupg2-download-http "&gnupg-http;/gnupg/gnupg-&gnupg2-version;.tar.bz2">
   <!ENTITY gnupg2-download-ftp  "&gnupg-ftp;/gnupg/gnupg-&gnupg2-version;.tar.bz2">
-  <!ENTITY gnupg2-md5sum        "3ab87e377aa0af2f463649515bf66508">
+  <!ENTITY gnupg2-md5sum        "d90e186df1c06845880ea58a318f070b">
   <!ENTITY gnupg2-size          "6.4 MB">
-  <!ENTITY gnupg2-buildsize     "117 MB (with all tests; add 24 MB for docs)">
-  <!ENTITY gnupg2-time          "0.4 SBU (using parallelism=4; add 0.5 SBU for tests)">
+  <!ENTITY gnupg2-buildsize     "149 MB (with all tests; add 24 MB for docs)">
+  <!ENTITY gnupg2-time          "0.4 SBU (using parallelism=4; add 1.6 SBU for tests)">
 ]>
 
@@ -82,4 +82,5 @@
     <para role="optional">
       <xref linkend="curl"/>,
+      <xref linkend="fuse3"/>,
       <xref linkend="gnutls"/>,
       <xref linkend="imagemagick"/> (for the <command>convert</command> utility,
@@ -103,5 +104,5 @@
   <sect2 role="installation">
     <title>Installation of GnuPG</title>
-
+    <!-- It's been well over three years. I think this can be commented for now.
     <warning>
       <para>
@@ -115,4 +116,5 @@
       </para>
     </warning>
+    -->
 
     <para>By default GnuPG doesn't install the deprecated gpg-zip script.
@@ -128,4 +130,5 @@
 <screen><userinput>./configure --prefix=/usr            \
             --enable-symcryptrun     \
+            --localstatedir=/var     \
             --docdir=/usr/share/doc/gnupg-&gnupg2-version; &amp;&amp;
 make &amp;&amp;
@@ -159,16 +162,4 @@
 install -v -m644    doc/gnupg.html/* \
                     /usr/share/doc/gnupg-&gnupg2-version;/html</userinput></screen>
-<!-- Now intalls as gpg, not gpg2.  This should be no longer needed.
-    <para>The BLFS editors recommend the creation of symlinks for compatibility
-    with the first version of GnuPG, because some programs or scripts need
-    them. Issue, as <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>for f in gpg gpgv
-do
-  ln -svf ${f}2.1 /usr/share/man/man1/$f.1 &amp;&amp;
-  ln -svf ${f}2   /usr/bin/$f
-done
-unset f</userinput></screen>
--->
     <para>If you created alternate formats of the documentation, install them
     using the following command as the
@@ -217,6 +208,6 @@
         <seg>addgnupghome, applygnupgdefaults, dirmngr, dirmngr-client, g13
         (optional), gpg-agent, gpg-connect-agent, gpg, gpgconf, gpgparsemail, 
-        gpgscm, gpgsm, gpgtar, gpgv, gpg-zip, kbxutil, symcryptrun, 
-        and watchgnupg</seg>
+           gpgscm, gpgsm, gpgtar, gpgv, gpg-wks-server, gpg-zip, kbxutil, 
+        symcryptrun, and watchgnupg</seg>
         <seg>None</seg>
         <seg>/usr/share/doc/gnupg-&gnupg2-version; and
@@ -233,5 +224,5 @@
         <term><command>addgnupghome</command></term>
         <listitem>
-          <para>is used to create and populate user's
+          <para>is used to create and populate a user's
           <filename class='directory'>~/.gnupg</filename> directories</para>
           <indexterm zone="gnupg2 addgnupghome">
@@ -391,8 +382,19 @@
       </varlistentry>
 
+      <varlistentry id="gpg-wks-server">
+        <term><command>gpg-wks-server</command></term>
+        <listitem>
+          <para>provides a server for the
+          <application>Web Key Service</application> protocol.</para>
+          <indexterm zone="gnupg2 gpg-wks-server">
+            <primary sortas="b-gpg-wks-server">gpg-wks-server</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="gpg-zip">
         <term><command>gpg-zip</command></term>
         <listitem>
-          <para> encrypts or signs files into an archive.</para>
+          <para>encrypts or signs files into an archive.</para>
           <indexterm zone="gnupg2 gpg-zip">
             <primary sortas="b-gpg-zip">gpg-zip</primary>
Index: postlfs/security/gpgme.xml
===================================================================
--- postlfs/security/gpgme.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ postlfs/security/gpgme.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -8,8 +8,8 @@
   <!ENTITY gpgme-download-ftp  "&gnupg-ftp;/gpgme/gpgme-&gpgme-version;.tar.bz2">
   <!ENTITY gpgme-download-ftp  " ">
-  <!ENTITY gpgme-md5sum        "e511a0d95c507ab87e713140c82fc7d0">
+  <!ENTITY gpgme-md5sum        "198f0a908ec3cd8f0ce9a4f3a4489645">
   <!ENTITY gpgme-size          "1.7 MB">
-  <!ENTITY gpgme-buildsize     "167 MB (with all bindings)">
-  <!ENTITY gpgme-time          "0.6 SBU (with parallelism=4; with all bindings, add 0.6 SBU for tests)">
+  <!ENTITY gpgme-buildsize     "232 MB (with all bindings)">
+  <!ENTITY gpgme-time          "0.7 SBU (with parallelism=4; with all bindings, add 0.5 SBU for tests)">
 ]>
 
@@ -86,5 +86,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="doxygen"/> (for API documentation),
+      <xref linkend="doxygen"/> and 
+      <xref linkend="graphviz"/> (for API documentation),
       <xref linkend="gnupg2"/> (required if Qt or SWIG are installed; 
         used during the testsuite),
@@ -147,10 +148,13 @@
       <seglistitem>
         <seg>
-          gpgme-config and gpgme-tool
+          gpgme-config, gpgme-json, and gpgme-tool
         </seg>
         <seg>
-          libgpgme-pthread.so, libgpgme and libgpgmepp.so
+          libgpgme, libgpgmepp.so, and libqgpgme.so
         </seg>
         <seg>
+          /usr/include/{gpgme++,qgpgme,QGpgME},
+          /usr/lib/cmake/{Gpgmepp,QGpgme}.
+          /usr/lib/python{2.7,3.7}/site-packages/gpg, and
           /usr/share/common-lisp/source/gpgme
         </seg>
@@ -176,4 +180,16 @@
       </varlistentry>
 
+      <varlistentry id="gpgme-json">
+        <term><command>gpgme-json</command></term>
+        <listitem>
+          <para>
+            outputs <application>GPGME</application> commands in JSON format.
+          </para>
+          <indexterm zone="gpgme gpgme-json">
+            <primary sortas="b-gpgme-json">gpgme-json</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="gpgme-tool">
         <term><command>gpgme-tool</command></term>
@@ -188,4 +204,5 @@
       </varlistentry>
 
+      <!-- As of 1.13.1, this library isn't present anymore.
       <varlistentry id="libgpgme-pthread">
         <term><filename class="libraryfile">libgpgme-pthread.so</filename></term>
@@ -200,4 +217,5 @@
         </listitem>
       </varlistentry>
+      -->
 
       <varlistentry id="libgpgme">
@@ -225,4 +243,17 @@
       </varlistentry>
 
+      <varlistentry id="libqgpgme">
+        <term><filename class="libraryfile">libqgpgme.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for handling GPG operations in
+            <application>Qt</application> applications.
+          </para>
+          <indexterm zone="gpgme libqgpgme">
+            <primary sortas="c-libqgpgme">libqgpgme.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
Index: pst/printing/cups-filters.xml
===================================================================
--- pst/printing/cups-filters.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ pst/printing/cups-filters.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -8,8 +8,8 @@
   "https://www.openprinting.org/download/cups-filters/cups-filters-&cups-filters-version;.tar.xz">
   <!ENTITY cups-filters-download-ftp  " ">
-  <!ENTITY cups-filters-md5sum        "45a0ccc742d50e51c90e4b8ec1e8be5c">
+  <!ENTITY cups-filters-md5sum        "c3fbc78eed88f33b8d5cb10784f3efbc">
   <!ENTITY cups-filters-size          "1.4 MB">
-  <!ENTITY cups-filters-buildsize     "43 MB (with tests), 15MB installed">
-  <!ENTITY cups-filters-time          "0.4 SBU (with tests)">
+  <!ENTITY cups-filters-buildsize     "58 MB (with tests), 15MB installed">
+  <!ENTITY cups-filters-time          "0.3 SBU (with tests)">
 ]>
 
@@ -98,5 +98,5 @@
       <xref linkend="avahi"/>,
       <xref linkend="dejavu-fonts"/> (required for the tests),
-      <xref linkend="ijs"/>,
+      <!--<xref linkend="ijs"/>,-->
       <xref linkend="openldap"/>,
       <xref linkend="php"/> (use of this might be broken),
@@ -212,9 +212,10 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--enable-ijs</option>: This switch will allow the pdftoijs
+    <!--
+    <para>
+      <option>- -enable-ijs</option>: This switch will allow the pdftoijs
       filter, for sending PDFs to an HP InkJet Server, to be built.
     </para>
+    -->
 
 <!--<para>
Index: pst/printing/gutenprint.xml
===================================================================
--- pst/printing/gutenprint.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ pst/printing/gutenprint.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -7,8 +7,9 @@
   <!ENTITY gutenprint-download-http "&sourceforge-dl;/gimp-print/gutenprint-&gutenprint-version;.tar.bz2">
   <!ENTITY gutenprint-download-ftp  " ">
-  <!ENTITY gutenprint-md5sum        "4177da0cb5ce39c6115e54694687d656">
+  <!ENTITY gutenprint-md5sum        "d0769dd44be985f1135518d4a5c73a8a">
   <!ENTITY gutenprint-size          "6.8 MB">
-  <!ENTITY gutenprint-buildsize     "55 MB (without tests)">
-  <!ENTITY gutenprint-time          "0.2 SBU (Using parallelism=4; without tests)">
+  <!ENTITY gutenprint-buildsize     "91 MB (without tests)">
+  <!ENTITY gutenprint-time          "0.3 SBU (without tests)">
+  <!-- Tests add 75 SBU and 13GB to the equation - updated info in the tests below -->
 ]>
 
@@ -151,5 +152,5 @@
     <para>To test the results, issue: <command>make check</command>.  The tests
     take a very long time and use a lot of disk space.  When last tested
-    (version 5.2.13 in September 2017) this needed 91 SBU and 9.5 GB
+    (version 5.2.15 in June 2019) this needed 75 SBU and 13.5 GB
     to complete the tests (one test, rastertogutenprint failed because the CUPS
     ppds are for a previous version. Maybe genppds should be run before the
@@ -179,12 +180,4 @@
       href="../../xincludes/static-libraries.xml"/>
 
-    <!-- redundant, only applies to cups < 1.2.0 : cups-5.0 gives a version of 1.5.0
-    FIXME - delete this on next version upgrade
-    <para><option>\-\-with-translated-ppds=no</option>: When this parameter is
-    given, only US English PPD files for <application>CUPS</application>
-    will be built. Useful if the PPD files are not yet translated into your
-    native language and you want to save some space by not installing unneeded
-    translations.</para>-->
-
   </sect2>
 
@@ -226,5 +219,5 @@
         <seg>
           cups-calibrate, cups-genppd.5.2, cups-genppdupdate, escputil,
-          ijsgutenprint.5.2 (if compiled using ijs), and testpattern
+          and testpattern
         </seg>
         <seg>
@@ -293,5 +286,7 @@
         </listitem>
       </varlistentry>
-
+      <!-- With 5.2.15, even with IJS installed, this program no longer exists.
+      cups-filters-1.25.0 dropped support for IJS filters entirely. -->
+      <!--
       <varlistentry id="ijsgutenprint.5.2">
         <term><command>ijsgutenprint.5.2</command></term>
@@ -303,4 +298,5 @@
         </listitem>
       </varlistentry>
+      -->
 
      <varlistentry id="testpattern">
Index: server/major/bind.xml
===================================================================
--- server/major/bind.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ server/major/bind.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -125,5 +125,5 @@
     class="username">root</systemitem> user:</para>
 
-<screen><userinput>pip3 install ply</userinput></screen>
+<screen role="root"><userinput>pip3 install ply</userinput></screen>
 
     <para>Install <application>BIND</application> by running the
Index: x/lib/gtk+3.xml
===================================================================
--- x/lib/gtk+3.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ x/lib/gtk+3.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -7,8 +7,8 @@
   <!ENTITY gtk3-download-http "&gnome-download-http;/gtk+/&gnome-minor-24;/gtk+-&gtk3-version;.tar.xz">
   <!ENTITY gtk3-download-ftp  "&gnome-download-ftp;/gtk+/&gnome-minor-24;/gtk+-&gtk3-version;.tar.xz">
-  <!ENTITY gtk3-md5sum        "eeedde01856238114dcf4df3ebc942a5">
-  <!ENTITY gtk3-size          "21 MB">
-  <!ENTITY gtk3-buildsize     "471 MB (including tests)">
-  <!ENTITY gtk3-time          "1.8 SBU (using parallelism=4, add 0.3 SBU for tests)">
+  <!ENTITY gtk3-md5sum        "7b20f3aa3b36214150ea7a12d6bc384b">
+  <!ENTITY gtk3-size          "20 MB">
+  <!ENTITY gtk3-buildsize     "556 MB (including tests)">
+  <!ENTITY gtk3-time          "1.3 SBU (using parallelism=4, add 0.1 SBU for tests)">
 ]>
 
@@ -92,4 +92,5 @@
       <xref linkend="iso-codes"/>,
       <xref linkend="libxkbcommon"/>,
+      <xref linkend="sassc"/>,
       <xref linkend="wayland"/>, and
       <xref linkend="wayland-protocols"/>
@@ -120,17 +121,12 @@
   <sect2 role="installation">
     <title>Installation of GTK+ 3</title>
-<!--
-    <note>
-      <para>
-        <application>GTK+ 3</application> will overwrite
-        <command>gtk-update-icon-cache</command> from <xref linkend="gtk2"/> if
-        it is installed.  There is nothing wrong about that assuming that both
-        programs provide same functionality.  If you wish to keep one from
-        <application>GTK+ 2</application> you can add
-        <option>- -enable-gtk2-dependency</option> to the
-        <command>configure</command> command.
-      </para>
-    </note>
--->
+
+    <!-- This is due to the meson transition -->
+    <caution>
+      <para>If you are upgrading from a version of GTK+3 prior to 3.24.9,
+      you must run the <filename>remove-la-files.sh</filename> script from
+      <xref linkend="la-files"/> after installing GTK+.</para>
+    </caution>
+
     <para>
       Install <application>GTK+ 3</application> by running the following
@@ -138,10 +134,14 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr             \
-            --sysconfdir=/etc         \
-            --enable-broadway-backend \
-            --enable-x11-backend      \
-            --enable-wayland-backend &amp;&amp;
-make</userinput></screen>
+<!-- The build directory already exists since this package allows both Autotools
+     and Meson to be used 
+     This may have to be changed in a few versions, or when GTK4 comes out.-->
+<screen><userinput>cd build &amp;&amp;
+meson --prefix=/usr     \
+      -Dcolord=yes      \
+      -Dgtk_doc=false   \
+      -Dman=true        \
+      -Dbroadway_backend=true .. &amp;&amp;
+ninja</userinput></screen>
 
     <para>
@@ -156,9 +156,10 @@
     <para>
       To test the results you need a graphical session, then issue
-      <command>make -k check</command>. There are several tests that 
+      <command>ninja test</command>. <!--There are several tests that 
       have subtests that are known to fail: scrolledwindow, treeview,
       accessibility-dump, test-css-nodes, and gtk-reftest.
       Additionally many tests will fail if the current 
-      gtk theme (such as current XFCE themes) has deprecated elements.
+      gtk theme (such as current XFCE themes) has deprecated elements.-->
+      9 tests are known to fail in the a11y suite and gtk/object suite.
     </para>
 
@@ -167,5 +168,5 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+    <screen role="root"><userinput>ninja install</userinput></screen>
 
     <note>
@@ -188,17 +189,18 @@
 
     <para>
-      <parameter>--enable-broadway-backend</parameter>: This switch enables the
+      <parameter>-Dbroadway_backend=true</parameter>: This switch enables the
       HTML5 GTK backend.
     </para>
-
-    <para>
-      <parameter>--enable-x11-backend</parameter>: This switch enables the X11 
+    <!--
+    <para>
+      <parameter>- -enable-x11-backend</parameter>: This switch enables the X11 
       GDK backend.
     </para>
-
-    <para>
-      <parameter>--enable-wayland-backend</parameter>: This switch
+    -->
+    <!--
+    <para>
+      <parameter>- -enable-wayland-backend</parameter>: This switch
       enables the Wayland GDK backend. Replace with
-      <option>--disable-wayland-backend</option> if you do not have
+      <option>- -disable-wayland-backend</option> if you do not have
       <xref linkend="wayland"/> and <xref linkend="wayland-protocols"/>
       or you do not wish to build <application>GNOME</application> with Wayland
@@ -209,7 +211,24 @@
       installation.
     </para>
-
+    -->
+    <!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
+    -->
+    <para>
+      <parameter>-Dcolord=yes</parameter>: This switch allows color support
+      in the GTK+ printing backend.
+    </para>
+
+    <para>
+      <parameter>-Dman=true</parameter>: This switch allows generating
+      manual pages.
+    </para>
+
+    <para>
+      <parameter>-Dgtk_doc=false</parameter>: This switch disables building
+      documentation. Replace with -Dgtk_doc=true if you have
+      <xref linkend="gtk-doc"/> installed and wish to generate documentation.
+    </para>
 
   </sect2>
Index: x/lib/qt5.xml
===================================================================
--- x/lib/qt5.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ x/lib/qt5.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -10,8 +10,8 @@
   <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-src-&qt5-version;.tar.xz">
   <!ENTITY qt5-download-ftp  " ">
-  <!ENTITY qt5-md5sum        "38017e0ed88b9baba063bd723d9ca8b2">
-  <!ENTITY qt5-size          "485 MB">
-  <!ENTITY qt5-buildsize     "12 GB (260 MB installed)">
-  <!ENTITY qt5-time          "39 SBU (using parallelism=4)">
+  <!ENTITY qt5-md5sum        "dda95b0239d13c5276834177af3a8588">
+  <!ENTITY qt5-size          "484 MB">
+  <!ENTITY qt5-buildsize     "11 GB (243 MB installed)">
+  <!ENTITY qt5-time          "20 SBU (using parallelism=4)">
 ]>
 
@@ -108,4 +108,5 @@
       <xref linkend="libpng"/>,
       <xref linkend="libtiff"/>,
+      <xref linkend="libwebp"/>,
       <xref linkend="libxkbcommon"/>,
       <xref linkend="mesa"/>,
@@ -133,6 +134,8 @@
       <xref linkend="python2"/> (required for QtWebEngine),
       <xref linkend="pulseaudio"/>,
-      <xref linkend="unixodbc"/>, and
-      <ulink url="http://www.firebirdsql.org/">Firebird</ulink>
+      <xref linkend="sdl2"/>,
+      <xref linkend="unixodbc"/>,
+      <ulink url="http://www.firebirdsql.org/">Firebird</ulink>, and
+      <ulink url="https://libproxy.github.io/libproxy/">libproxy</ulink>
     </para>
 
@@ -272,4 +275,7 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+    <!-- EDITORS NOTE: This package uses INSTALL_ROOT= instead of DESTDIR= for
+         installing in a temporary directory. -->
 
     <para>
@@ -523,11 +529,11 @@
         <seg>
           assistant, canbusutil, designer, fixqt4headers.pl, lconvert, linguist,
-          lrelease, lupdate, moc, pixeltool, qdbuscpp2xml, qdbus, qdbusviewer,
-          qdbusxml2cpp, qdoc, qdistancefieldgenerator, qgltf, qhelpgenerator,
-          qlalr, qmake, gmlcachegen,
+          lrelease, lupdate, moc, pixeltool, qcollectiongenerator, qdbuscpp2xml, 
+          qdbus, qdbusviewer, qdbusxml2cpp, qdoc, qdistancefieldgenerator, qgltf, 
+          qhelpgenerator, qlalr, qmake, qmlcachegen,
           qmleasing, qmlimportscanner, qmllint, qmlmin, qmlplugindump,
-          qmlpreview, qmlprofiler, qml, qmlscene, qmltestrunner, qtdiag, qtpaths,
-          qtplugininfo, qtwaylandscanner,qvkgen, rcc, sdpscanner, syncqt.pl, uic,
-          xmlpatterns, and xmlpatternsvalidator
+          qmlpreview, qmlprofiler, qml, qmlscene, qmltestrunner, qscxmlc, qtdiag, 
+          qtpaths, qtattributionscanner, qtplugininfo, qtwaylandscanner, qvkgen, rcc, 
+          repc, sdpscanner, syncqt.pl, uic, xmlpatterns, and xmlpatternsvalidator
         </seg>
         <seg>
@@ -539,10 +545,10 @@
           libQt5Bootstrap.a, libQt53DCharts.so, libQt5Concurrent.so,
           libQt5Core.so, libQt5DataVisualization.so, libQt5DBus.so,
-          libQt5Declarative.so, libQt5DesignerComponents.so, libQt5Designer.so,
+          libQt5DesignerComponents.so, libQt5Designer.so,
           libQt5DeviceDiscoverySupport.a, libQt5EdidSupport.a,
           libQt5EglFSDeviceIntegration.so, libQt5EglFsKmsSupport.so,
           libQt5EglSupport.a, libQt5EventDispatcher.a, libQt5FbSupport.a,
           libQt5FontDatabaseSupport.a, libQt5Gamepad.so, libQt5Glx.a,
-          libQt5Gui.so,libQt5Help.so, libQt5InputSupport.a,
+          libQt5Gui.so,libQt5Help.so, libQt5InputSupport.a, libQt5KmsSupport.a,
           libQt5LinuxAccessibilitySupport.a, libQt5Location.so,
           libQt5Multimedia.so, libQt5MultimediaQuick.so,
@@ -551,16 +557,16 @@
           libQt5OpenGLExtensions.a, libQt5OpenGL.so, libQt5PacketProtocol.a,
           libQt5PlatformCompositiorSupport.a, libQt5Positioning.so,
-          libQt5PosiutioningQuick.so, libQt5PrintSupport.so,
-          libQt5Purchasing.so, libQt5QmlDebug.s, libQt5QmlDevTools.a,
-          libQt5Qml.so, libQt5QuickControls.so, libQt5QuickParticles.so,
-          libQt5Quick.so, libQt5QuickTest.so, libQt5QuickWidgets.so,
-          libQt5RemoteObjects.so, libQt5Script.so, libQt5ScriptTools.so,
-          libQt5Scxml.so, libQt5Sensors.so, libQt5SerialBus.so,
-          libQt5SerialPort.so, libQt5ServiceSupport.a, libQt5Sql.so,
+          libQt5PositioningQuick.so, libQt5PrintSupport.so,
+          libQt5Purchasing.so, libQt5QmlDebug.a, libQt5QmlDevTools.a,
+          libQt5Qml.so, libQt5QuickControls2.so, libQt5QuickParticles.so,
+          libQt5Quick.so, libQt5QuickShapes.so,  libQt5QuickTemplates2.so, 
+          libQt5QuickTest.so, libQt5QuickWidgets.so, libQt5RemoteObjects.so, 
+          libQt5Script.so, libQt5ScriptTools.so, libQt5Scxml.so, libQt5Sensors.so, 
+          libQt5SerialBus.so, libQt5SerialPort.so, libQt5ServiceSupport.a, libQt5Sql.so,
           libQt5Svg.so, libQt5Test.so, libQt5TextToSpeech.so,
           libQt5ThemeSupport.a, libQt5UiTools.a, libQt5VirtualKeyboard.so,
           libQt5WaylandClient.so, libQt5WaylandCompositor.so, libQt5WebChannel.so,
           libQt5WebSockets.so, libQt5WebView.so, libQt5Widgets.so,
-          libQt5X11Extras.so, libQt5XmlPatterns.so libQt5XcbOpa.so,
+          libQt5X11Extras.so, libQt5XmlPatterns.so,
           libQt5Xml.so, and several plugins under /opt/qt5/{plugins,qml}
         </seg>
@@ -628,5 +634,5 @@
         <listitem>
           <para>
-            is a script replace all Qt 4 style includes with Qt 5 includes.
+            is a script to replace all Qt 4 style includes with Qt 5 includes.
           </para>
           <indexterm zone="qt5 fixqt4headers.pl">
@@ -715,5 +721,17 @@
       </varlistentry>
 
-     <varlistentry id="qdbuscpp2xml-qt5">
+      <varlistentry id="qcollectiongenerator-qt5">
+        <term><command>qcollectiongenerator</command></term>
+        <listitem>
+          <para>
+            processes and converts Qt help files.
+          </para>
+          <indexterm zone="qt5 qcollectiongenerator-qt5">
+            <primary sortas="b-qcollectiongenerator-qt5">qcollectiongenerator-qt5</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qdbuscpp2xml-qt5">
         <term><command>qdbuscpp2xml</command></term>
         <listitem>
@@ -969,4 +987,28 @@
       </varlistentry>
 
+      <varlistentry id="qscxmlc-qt5">
+        <term><command>qscxml</command></term>
+        <listitem>
+          <para>
+            converts an input.scxml file to a header and cpp file.
+          </para>
+          <indexterm zone="qt5 qscxmlc-qt5">
+            <primary sortas="b-qscxmlc-qt5">qscxmlc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qtattributionsscanner-qt5">
+        <term><command>qtattributionsscanner</command></term>
+        <listitem>
+          <para>
+            processes qt_attribution.json files in Qt sources.
+          </para>
+          <indexterm zone="qt5 qtattributionsscanner-qt5">
+            <primary sortas="b-qtattributionsscanner-qt5">qtattributionsscanner</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="qtdiag-qt5">
         <term><command>qtdiag</command></term>
Index: x/lib/qtwebengine.xml
===================================================================
--- x/lib/qtwebengine.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ x/lib/qtwebengine.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -8,8 +8,8 @@
   <!ENTITY qtwebengine-download-http "https://download.qt.io/archive/qt/&qtwebengine-major;/&qtwebengine-version;/submodules/qtwebengine-everywhere-src-&qtwebengine-version;.tar.xz">
   <!ENTITY qtwebengine-download-ftp  " ">
-  <!ENTITY qtwebengine-md5sum        "9841599435095b16f12870bd48ef5342">
+  <!ENTITY qtwebengine-md5sum        "9f1f20537eba9b166cd0e59191e49f29">
   <!ENTITY qtwebengine-size          "238 MB">
-  <!ENTITY qtwebengine-buildsize     "3.3 GB (131 MB installed)">
-  <!ENTITY qtwebengine-time          "60 SBU (using 4 cores)">
+  <!ENTITY qtwebengine-buildsize     "3.3 GB (135 MB installed)">
+  <!ENTITY qtwebengine-time          "40 SBU (using 4 cores)">
 ]>
 
@@ -139,4 +139,5 @@
     <para role="optional">
       <xref linkend="libevent"/>,
+      <xref linkend="poppler"/>,
       <ulink url="https://github.com/open-source-parsers/jsoncpp/releases">jsoncpp</ulink>,
       <ulink url="https://github.com/cisco/libsrtp/releases">libsrtp</ulink>,
@@ -208,4 +209,6 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+    <!-- EDITORS NOTE: If you are updating this package, use INSTALL_ROOT=
+         instead of DESTDIR= -->
 <!--
     <para>
@@ -315,5 +318,4 @@
         </seg>
         <seg>
-          $QT5PREFIX/doc/qtwebengine,
           $QT5PREFIX/includeQtWebEngine,
           $QT5PREFIX/include/QtWebEngineCore, and
Index: x/lib/webkitgtk.xml
===================================================================
--- x/lib/webkitgtk.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ x/lib/webkitgtk.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -7,8 +7,8 @@
   <!ENTITY webkitgtk-download-http "https://webkitgtk.org/releases/webkitgtk-&webkitgtk-version;.tar.xz">
   <!ENTITY webkitgtk-download-ftp  " ">
-  <!ENTITY webkitgtk-md5sum        "ed70e2bf2476a58b17df3d051f42ce6a">
+  <!ENTITY webkitgtk-md5sum        "83012998e1b9f71abb37d8baf6f9c7e6">
   <!ENTITY webkitgtk-size          "17 MB">
-  <!ENTITY webkitgtk-buildsize     "781 MB (128 MB installed)">
-  <!ENTITY webkitgtk-time          "22 SBU (using parallelism=4, 71 SBUs using one core)">
+  <!ENTITY webkitgtk-buildsize     "845 MB (158 MB installed)">
+  <!ENTITY webkitgtk-time          "22 SBU (using parallelism=4, 75 SBUs using one core)">
 ]>
 
Index: xsoft/graphweb/epiphany.xml
===================================================================
--- xsoft/graphweb/epiphany.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ xsoft/graphweb/epiphany.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -9,5 +9,5 @@
   <!ENTITY epiphany-download-ftp
            "&gnome-download-ftp;/epiphany/&gnome-minor-32;/epiphany-&epiphany-version;.tar.xz">
-  <!ENTITY epiphany-md5sum        "2a6672b22a0fdb869e5f0a415ac2da34">
+  <!ENTITY epiphany-md5sum        "c4976507bf3de69f27a050ad09531f5a">
   <!ENTITY epiphany-size          "5.2 MB">
   <!ENTITY epiphany-buildsize     "76 MB"> 
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision 2d67b6b613cdd059ea194ef79370ebacb74df1d9)
+++ xsoft/graphweb/firefox.xml	(revision a20b398b9f8384c3701bb371eff818ea89958c06)
@@ -7,9 +7,9 @@
   <!ENTITY firefox-download-http "&mozilla-http;/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.xz">
   <!ENTITY firefox-download-ftp  " ">
-  <!ENTITY firefox-md5sum        "44ddd660e0d195be793a0f5d79946709">
-  <!ENTITY firefox-size          "270 MB">
+  <!ENTITY firefox-md5sum        "6631ff5d6cf74bc881d68c375e628ebd">
+  <!ENTITY firefox-size          "273 MB">
   <!-- NB with stylo, much of the build uses rust, and therefore cargo files.
     But the extra cached cargo files, if any, seem to be minimal -->
-  <!ENTITY firefox-buildsize     "3.8 GB (154 MB installed) without tests">
+  <!ENTITY firefox-buildsize     "3.9 GB (160 MB installed) without tests">
   <!-- editors: with ff63 and rust-1.29, ./mach build -j4 is probably the
    most practical way to get a timing on a machine with more cores, if taking
@@ -285,4 +285,9 @@
 ac_add_options --enable-application=browser
 
+# The elf-hack is reported to cause failed installs (after successful builds)
+# on some machines. It is supposed to improve startup time and it shrinks
+# libxul.so by a few MB - comment this if you know your machine is not affected.
+ac_add_options --disable-elf-hack
+
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
