Index: general.ent
===================================================================
--- general.ent	(revision 4d390d2c6072177622287f7323314ea42ba1a00b)
+++ general.ent	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "24">                   <!-- Always 2 digits -->
+<!ENTITY day          "30">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2019">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "May 24th, &year;">
+<!ENTITY releasedate  "May 30th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: general/genlib/gmime3.xml
===================================================================
--- general/genlib/gmime3.xml	(revision 4d390d2c6072177622287f7323314ea42ba1a00b)
+++ general/genlib/gmime3.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -8,5 +8,5 @@
   <!ENTITY gmime3-download-ftp  "&gnome-download-ftp;/gmime/3.2/gmime-&gmime3-version;.tar.xz">
   <!ENTITY gmime3-md5sum        "69ae21a0b1df966a7d39a9431856ac81">
-  <!ENTITY gmime3-size          "1.` MB">
+  <!ENTITY gmime3-size          "2.1 MB">
   <!ENTITY gmime3-buildsize     "25 MB (with tests)">
   <!ENTITY gmime3-time          "0.3 SBU (with tests)">
Index: general/genlib/libidn2.xml
===================================================================
--- general/genlib/libidn2.xml	(revision 4d390d2c6072177622287f7323314ea42ba1a00b)
+++ general/genlib/libidn2.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -7,7 +7,7 @@
   <!ENTITY libidn2-download-http "&gnu-http;/libidn/libidn2-&libidn2-version;.tar.gz">
   <!ENTITY libidn2-download-ftp  "&gnu-ftp;/libidn/libidn2-&libidn2-version;.tar.gz">
-  <!ENTITY libidn2-md5sum        "3d33249c75bef1a25c04063ad7f5f983">
+  <!ENTITY libidn2-md5sum        "b846d4d20e22b99d6f7387bb66e00a1f">
   <!ENTITY libidn2-size          "2.0 MB">
-  <!ENTITY libidn2-buildsize     "22 MB (with tests)">
+  <!ENTITY libidn2-buildsize     "20 MB (with tests)">
   <!ENTITY libidn2-time          "0.2 SBU (with tests)">
 ]>
Index: general/graphlib/harfbuzz.xml
===================================================================
--- general/graphlib/harfbuzz.xml	(revision 4d390d2c6072177622287f7323314ea42ba1a00b)
+++ general/graphlib/harfbuzz.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -8,7 +8,7 @@
            "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-&harfbuzz-version;.tar.bz2">
   <!ENTITY harfbuzz-download-ftp  " ">
-  <!ENTITY harfbuzz-md5sum        "49f111f9b52ae3d9b31c1a3631a320bd">
-  <!ENTITY harfbuzz-size          "17 MB">
-  <!ENTITY harfbuzz-buildsize     "176 MB (with tests)">
+  <!ENTITY harfbuzz-md5sum        "0736300b8ae88d663b15741180aaf305">
+  <!ENTITY harfbuzz-size          "5.4 MB">
+  <!ENTITY harfbuzz-buildsize     "48.3 MB (with tests)">
   <!ENTITY harfbuzz-time          "0.6 SBU (Using parallelism=4; with tests)">
 ]>
Index: general/prog/pycairo.xml
===================================================================
--- general/prog/pycairo.xml	(revision 4d390d2c6072177622287f7323314ea42ba1a00b)
+++ general/prog/pycairo.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -110,6 +110,10 @@
       </para>
 
-<screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
-python3 setup.py install --optimize=1</userinput></screen>
+<screen role="root"><userinput>python2 setup.py install --optimize=1   &amp;&amp;
+python2 setup.py install_pycairo_header &amp;&amp;
+python2 setup.py install_pkgconfig      &amp;&amp;
+python3 setup.py install --optimize=1   &amp;&amp;
+python3 setup.py install_pycairo_header &amp;&amp;
+python3 setup.py install_pkgconfig</userinput></screen>
 <!-- Seems that install does the following too
 python2 setup.py install_pycairo_header &amp;&amp;
Index: gnome/platform/libsecret.xml
===================================================================
--- gnome/platform/libsecret.xml	(revision 4d390d2c6072177622287f7323314ea42ba1a00b)
+++ gnome/platform/libsecret.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -97,5 +97,7 @@
       <xref linkend="dbus-python"/>,
       <xref linkend="gjs"/>, and
-      <xref linkend="pygobject2"/>
+      <xref linkend="pygobject3"/> (Python 3 module)
+      <!-- Historically libsecret used to require Python2, but it has been
+      fully ported to Python3. -->
     </para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 4d390d2c6072177622287f7323314ea42ba1a00b)
+++ introduction/welcome/changelog.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -76,4 +76,41 @@
     </listitem>
     -->
+    <listitem>
+      <para>May 30th, 2019</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to harfbuzz-2.5.0.  Fixes
+          <ulink url="&blfs-ticket-root;12095">#12095</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update mesa-19.0.4-add_xdemos-2.patch (meson).</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>May 29th, 2019</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to libidn2-2.2.0.  Fixes
+          <ulink url="&blfs-ticket-root;12093">#12093</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to xterm-346.  Fixes
+          <ulink url="&blfs-ticket-root;12104">#12104</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>May 26th, 2019</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Perform some minor tweaks and cleanup to the
+          GStreamer pages.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>May 24th, 2019</para>
Index: multimedia/libdriv/gst10-libav.xml
===================================================================
--- multimedia/libdriv/gst10-libav.xml	(revision 4d390d2c6072177622287f7323314ea42ba1a00b)
+++ multimedia/libdriv/gst10-libav.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -11,5 +11,4 @@
   <!ENTITY gst10-libav-buildsize     "87 MB">
   <!ENTITY gst10-libav-time          "less than 0.1 SBU (Using parallelism=4)">
-  <!-- A majority of the time spent compiling is ASM files. -->
 ]>
 
@@ -78,4 +77,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <xref linkend="ffmpeg"/> and
       <xref linkend="gst10-plugins-base"/>
     </para>
@@ -83,5 +83,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="ffmpeg"/> and
+      <!-- With 1.14.x and before, an internal copy of FFMPEG was used.
+      This is no longer the case, so it is now required. -->
       <xref linkend="yasm"/>
     </para>
@@ -101,4 +102,7 @@
     <title>Installation of GStreamer Libav</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gst10-objc-error.xml"/>
+    
     <para>
       Install <application>GStreamer Libav</application> by running the following
@@ -127,13 +131,15 @@
   </sect2>
 
+  <!-- No longer included with Meson change
   <sect2 role="commands">
     <title>Command Explanations</title>
 
     <para>
-      <option>--with-libav-extra-configure="--disable-yasm"</option>: Use this
+      <option>- -with-libav-extra-configure="- -disable-yasm"</option>: Use this
       switch if you don't have <application>yasm</application> installed.
     </para>
 
   </sect2>
+  -->
 
   <sect2 role="content">
Index: multimedia/libdriv/gst10-plugins-bad.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-bad.xml	(revision 4d390d2c6072177622287f7323314ea42ba1a00b)
+++ multimedia/libdriv/gst10-plugins-bad.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -153,7 +153,9 @@
     <title>Installation of GStreamer Bad Plug-ins</title>
 
-    <note><para>If you need a plugin for a given dependency, that dependency
-      needs to be installed before this application.
-    </para></note>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gst10-objc-error.xml"/>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gst10-plugins.xml"/>
 
     <para>
Index: multimedia/libdriv/gst10-plugins-base.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-base.xml	(revision 4d390d2c6072177622287f7323314ea42ba1a00b)
+++ multimedia/libdriv/gst10-plugins-base.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -95,7 +95,5 @@
       <xref linkend="libtheora"/>,
       <xref linkend="libvorbis"/>, and
-      <xref linkend="xorg7-lib"/> <!-- build time requirements only...
-      That's not true: if X libraries are not installed, some plugins
-      are note built!-->
+      <xref linkend="xorg7-lib"/>
    </para>
 
@@ -121,12 +119,9 @@
     <title>Installation of GStreamer Base Plug-ins</title>
 
-    <note><para>If you need a plugin for a given dependency, that dependency
-      needs to be installed before this application.
-    </para></note>
-
-    <note><para>If you do not have a Objective-C compiler installed, the build
-      system for this package will throw a warning about a failed sanity check.
-      This is harmless, and it is safe to continue.
-    </para></note>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gst10-objc-error.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gst10-plugins.xml"/>
 
     <para>
Index: multimedia/libdriv/gst10-plugins-good.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-good.xml	(revision 4d390d2c6072177622287f7323314ea42ba1a00b)
+++ multimedia/libdriv/gst10-plugins-good.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -136,8 +136,11 @@
     <title>Installation of GStreamer Good Plug-ins</title>
 
-    <note><para>If you need a plugin for a given dependency, that dependency
-      needs to be installed before this application.
-    </para></note>
-
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gst10-objc-error.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gst10-plugins.xml"/>
+
+    <!-- No longer true since Meson/Ninja doesn't use libtool
     <caution><para>
       If you have Qt5 installed, the build may fail if you have Wayland support
@@ -145,4 +148,5 @@
       script that is in <xref linkend="la-files"/>.
     </para></caution>
+    -->
 
     <para>
Index: multimedia/libdriv/gst10-plugins-ugly.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-ugly.xml	(revision 4d390d2c6072177622287f7323314ea42ba1a00b)
+++ multimedia/libdriv/gst10-plugins-ugly.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -113,7 +113,9 @@
     <title>Installation of GStreamer Ugly Plug-ins</title>
 
-    <note><para>If you need a plugin for a given dependency, that dependency
-      needs to be installed before this application.
-    </para></note>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gst10-objc-error.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gst10-plugins.xml"/>
 
     <para>
Index: multimedia/libdriv/gstreamer10-vaapi.xml
===================================================================
--- multimedia/libdriv/gstreamer10-vaapi.xml	(revision 4d390d2c6072177622287f7323314ea42ba1a00b)
+++ multimedia/libdriv/gstreamer10-vaapi.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -91,4 +91,7 @@
     <title>Installation of gstreamer-vaapi</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gst10-objc-error.xml"/>
+
     <para>
       Install <application>gstreamer-vaapi</application> by running the following
Index: multimedia/libdriv/gstreamer10.xml
===================================================================
--- multimedia/libdriv/gstreamer10.xml	(revision 4d390d2c6072177622287f7323314ea42ba1a00b)
+++ multimedia/libdriv/gstreamer10.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -106,4 +106,7 @@
   <sect2 role="installation">
     <title>Installation of gstreamer</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gst10-objc-error.xml"/>
 
     <para>
Index: multimedia/libdriv/soundtouch.xml
===================================================================
--- multimedia/libdriv/soundtouch.xml	(revision 4d390d2c6072177622287f7323314ea42ba1a00b)
+++ multimedia/libdriv/soundtouch.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -72,11 +72,4 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">SoundTouch Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="http://www.openmp.org/">OpenMP</ulink>
-    </para>
-
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/soundtouch"/>
@@ -122,6 +115,6 @@
     <para>
       <option>--enable-openmp</option>: This switch adds support for running
-      the algorithms in parallel across several systems using the external 
-      OpenMP libraries.
+      the algorithms in parallel across several processor cores using OpenMP
+      implementation provided by GCC.
     </para>
 
Index: packages.ent
===================================================================
--- packages.ent	(revision 4d390d2c6072177622287f7323314ea42ba1a00b)
+++ packages.ent	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -144,5 +144,5 @@
 <!ENTITY libical-version              "3.0.5">
 <!ENTITY libidn-version               "1.35">
-<!ENTITY libidn2-version              "2.1.1">
+<!ENTITY libidn2-version              "2.2.0">
 <!ENTITY libiodbc-version             "3.52.12">
 <!ENTITY libksba-version              "1.3.5">
@@ -203,5 +203,5 @@
 <!ENTITY glm-version                  "0.9.9.5">
 <!ENTITY graphite2-version            "1.3.13">
-<!ENTITY harfbuzz-version             "2.4.0">
+<!ENTITY harfbuzz-version             "2.5.0">
 <!ENTITY ijs-version                  "0.35">
 <!ENTITY jasper-version               "2.0.14">
@@ -663,5 +663,5 @@
 <!ENTITY xorg-server-version          "1.20.4">
 <!ENTITY twm-version                  "1.0.10">
-<!ENTITY xterm-version                "345">
+<!ENTITY xterm-version                "346">
 <!ENTITY xclock-version               "1.0.8">
 <!ENTITY xinit-version                "1.4.1">
Index: postlfs/security/libcap.xml
===================================================================
--- postlfs/security/libcap.xml	(revision 4d390d2c6072177622287f7323314ea42ba1a00b)
+++ postlfs/security/libcap.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -102,5 +102,5 @@
 auth      optional    pam_cap.so
 EOF
-tail -n +3 /etc/pam.d/system-auth.bak &lt;&lt; /etc/pam.d/system-auth</userinput></screen>
+tail -n +3 /etc/pam.d/system-auth.bak &gt;&gt; /etc/pam.d/system-auth</userinput></screen>
 
     <para>Additonally, you'll need to modify the
Index: pst/xml/docbook-xsl.xml
===================================================================
--- pst/xml/docbook-xsl.xml	(revision 4d390d2c6072177622287f7323314ea42ba1a00b)
+++ pst/xml/docbook-xsl.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -184,5 +184,5 @@
         class="username">root</systemitem> user:</para>
 
-<screen><userinput>sed -i '/rewrite/d' /etc/xml/catalog</userinput></screen>
+<screen role="nodump"><userinput>sed -i '/rewrite/d' /etc/xml/catalog</userinput></screen>
       </note>
 
Index: x/installing/mesa.xml
===================================================================
--- x/installing/mesa.xml	(revision 4d390d2c6072177622287f7323314ea42ba1a00b)
+++ x/installing/mesa.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -84,5 +84,5 @@
           Recommended patch:
           <ulink
-            url="&patch-root;/mesa-&mesa-version;-add_xdemos-1.patch"/>
+            url="&patch-root;/mesa-&mesa-version;-add_xdemos-2.patch"/>
           (installs 2 demo programs for testing Mesa - not needed if you
           install the <ulink url="ftp://ftp.freedesktop.org/pub/mesa/demos/">
@@ -160,5 +160,5 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../mesa-&mesa-version;-add_xdemos-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../mesa-&mesa-version;-add_xdemos-2.patch</userinput></screen>
 
    <!-- Note that freedreno, vc4, and virgl all need special support from
@@ -239,11 +239,4 @@
 
     <para>
-      If you have applied the xdemos patch, build the demo programs by
-      running the following command:
-    </para>
-
-<screen><userinput>make -C ../xdemos DEMOS_PREFIX=$XORG_PREFIX LIBRARY_PATH=$PWD/src/glx</userinput></screen>
-
-    <para>
       If you built the tests (see 'Command Explanations'), to run them issue:
       <command>ninja test</command>.
@@ -255,12 +248,4 @@
 
 <screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      If you have built the demo programs, install them by running the
-      following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C ../xdemos DEMOS_PREFIX=$XORG_PREFIX install</userinput></screen>
 
     <para>
Index: x/installing/xterm.xml
===================================================================
--- x/installing/xterm.xml	(revision 4d390d2c6072177622287f7323314ea42ba1a00b)
+++ x/installing/xterm.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -8,7 +8,7 @@
   <!--<!ENTITY xterm-download-ftp  "ftp://invisible-island.net/xterm/xterm-&xterm-version;.tgz">-->
   <!ENTITY xterm-download-ftp  " ">
-  <!ENTITY xterm-md5sum        "7bbc1059db91aec9ca584368d91db312">
+  <!ENTITY xterm-md5sum        "cc618dcd3654d5cfc29f5475e39c7aee">
   <!ENTITY xterm-size          "1.3 MB">
-  <!ENTITY xterm-buildsize     "13 MB">
+  <!ENTITY xterm-buildsize     "15 MB">
   <!ENTITY xterm-time          "0.2 SBU">
 ]>
Index: xincludes/gst10-objc-error.xml
===================================================================
--- xincludes/gst10-objc-error.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
+++ xincludes/gst10-objc-error.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
+
+    <!-- $LastChangedBy$
+         $Date$ -->
+
+    <!-- As part of their move to Meson, the GStreamer developers included a
+         check for an ObjC compiler, since their primary user other than Linux
+         is macOS. -->
+    <note><para>If you do not have an Objective-C compiler installed, the
+    build system for this package will emit a warning about a failed sanity
+    check. This is harmless, and it is safe to continue.</para></note>
Index: xincludes/gst10-plugins.xml
===================================================================
--- xincludes/gst10-plugins.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
+++ xincludes/gst10-plugins.xml	(revision cbf7be5fe44d3f8ef71f973267e24c40f06f1e4c)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
+
+    <!-- $LastChangedBy$
+         $Date$ -->
+
+    <!-- Since this is referenced in every GStreamer Plugins page, simplify
+    the pages by adding an XInclude. -->
+
+    <note><para>If you need a plugin for a given dependency, that dependency
+    needs to be installed before this package.</para></note>
