Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision d4c6b05888f5795bc7a77fd325a7ac93e2f2c9e1)
+++ general/genutils/imagemagick.xml	(revision f0061d745a5e013b7e014c705dd6ae863088ce70)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY imagemagick-patch-version "2">
+  <!ENTITY imagemagick-patch-version "3">
 
   <!ENTITY imagemagick-download-http "https://www.imagemagick.org/download/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
   <!ENTITY imagemagick-download-ftp  "ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
-  <!ENTITY imagemagick-md5sum        "74dd0387b8ef4fa2d92f63d5015877d3">
+  <!ENTITY imagemagick-md5sum        "4487d01848f6afce80d8c44c1edf65f6">
   <!ENTITY imagemagick-size          "7.9 MB">
   <!ENTITY imagemagick-buildsize     "157 MB, with typical dependencies (add 31 MB for the test suite)">
Index: gnome.ent
===================================================================
--- gnome.ent	(revision d4c6b05888f5795bc7a77fd325a7ac93e2f2c9e1)
+++ gnome.ent	(revision f0061d745a5e013b7e014c705dd6ae863088ce70)
@@ -18,7 +18,7 @@
 <!ENTITY gcr-version                  "3.20.0">
 <!ENTITY gnome-keyring-version        "3.20.0">
-<!ENTITY gvfs-version                 "1.28.1">
+<!ENTITY gvfs-version                 "1.28.2">
 <!ENTITY gjs-version                  "1.45.3">
-<!ENTITY gnome-desktop-version        "3.20.1">
+<!ENTITY gnome-desktop-version        "3.20.2">
 <!ENTITY gnome-video-effects-version  "0.4.1">
 <!ENTITY libgtop-version              "2.34.0">
@@ -27,9 +27,9 @@
 <!ENTITY notification-daemon-version  "3.20.0">
 <!ENTITY totem-pl-parser-version      "3.10.6">
-<!ENTITY vte-version                  "0.44.1">
+<!ENTITY vte-version                  "0.44.2">
 
 <!-- Runtime -->
 <!ENTITY dconf-version                     "0.26.0">
-<!ENTITY dconf-editor-version              "3.20.1">
+<!ENTITY dconf-editor-version              "3.20.2">
 <!ENTITY adwaita-icon-theme-version        "3.20">
 <!ENTITY gnome-icon-theme-version          "3.12.0">
@@ -43,9 +43,9 @@
 <!ENTITY baobab-version                 "3.20.1">
 <!ENTITY brasero-version                "3.12.1">
-<!ENTITY cheese-version                 "3.20.1">
-<!ENTITY eog-version                    "3.20.1">
-<!ENTITY epiphany-version               "3.20.1">
+<!ENTITY cheese-version                 "3.20.2">
+<!ENTITY eog-version                    "3.20.2">
+<!ENTITY epiphany-version               "3.20.2">
 <!ENTITY evince-version                 "3.20.0">
-<!ENTITY file-roller-version            "3.20.1">
+<!ENTITY file-roller-version            "3.20.2">
 <!ENTITY gedit-version                  "3.20.2">
 <!ENTITY gnome-calculator-version       "3.20.1">
@@ -53,6 +53,6 @@
 <!ENTITY gnome-screenshot-version       "3.18.0">
 <!ENTITY gnome-system-monitor-version   "3.20.1">
-<!ENTITY gnome-terminal-version         "3.20.1">
-<!ENTITY gucharmap-version              "8.0.0">
+<!ENTITY gnome-terminal-version         "3.20.2">
+<!ENTITY gucharmap-version              "8.0.1">
 <!ENTITY nautilus-version               "3.20.1">
 <!ENTITY network-manager-applet-version "1.2.0">
Index: gnome/applications/cheese.xml
===================================================================
--- gnome/applications/cheese.xml	(revision d4c6b05888f5795bc7a77fd325a7ac93e2f2c9e1)
+++ gnome/applications/cheese.xml	(revision f0061d745a5e013b7e014c705dd6ae863088ce70)
@@ -7,5 +7,5 @@
   <!ENTITY cheese-download-http "&gnome-download-http;/cheese/&gnome-minor-20;/cheese-&cheese-version;.tar.xz">
   <!ENTITY cheese-download-ftp  "&gnome-download-ftp;/cheese/&gnome-minor-20;/cheese-&cheese-version;.tar.xz">
-  <!ENTITY cheese-md5sum        "03a492cee27b4dd7fc460df8b14bc5c6">
+  <!ENTITY cheese-md5sum        "4446b2942cee1d91e920bf85bfe8ab2d">
   <!ENTITY cheese-size          "1.8 MB">
   <!ENTITY cheese-buildsize     "21 MB">
@@ -36,4 +36,5 @@
 
     &lfs79_checked;
+    &gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: gnome/applications/eog.xml
===================================================================
--- gnome/applications/eog.xml	(revision d4c6b05888f5795bc7a77fd325a7ac93e2f2c9e1)
+++ gnome/applications/eog.xml	(revision f0061d745a5e013b7e014c705dd6ae863088ce70)
@@ -7,7 +7,7 @@
   <!ENTITY eog-download-http "&gnome-download-http;/eog/&gnome-minor-20;/eog-&eog-version;.tar.xz">
   <!ENTITY eog-download-ftp  "&gnome-download-ftp;/eog/&gnome-minor-20;/eog-&eog-version;.tar.xz">
-  <!ENTITY eog-md5sum        "e37f9ed5514116f034e6a949f69940c9">
-  <!ENTITY eog-size          "4.1 MB">
-  <!ENTITY eog-buildsize     "40 MB">
+  <!ENTITY eog-md5sum        "ac226a585872bb01ffc7929e4825c712">
+  <!ENTITY eog-size          "4.4 MB">
+  <!ENTITY eog-buildsize     "41 MB">
   <!ENTITY eog-time          "0.6 SBU">
 ]>
@@ -38,4 +38,5 @@
 
     &lfs79_checked;
+    &gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -111,5 +112,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>X11_CFLAGS="-Wno-error=format-nonliteral" ./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -128,4 +129,7 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para><envar>X11_CFLAGS="-Wno-error=format-nonliteral"</envar>:
+    Ignore a warning that was flagged as an error.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: gnome/applications/epiphany.xml
===================================================================
--- gnome/applications/epiphany.xml	(revision d4c6b05888f5795bc7a77fd325a7ac93e2f2c9e1)
+++ gnome/applications/epiphany.xml	(revision f0061d745a5e013b7e014c705dd6ae863088ce70)
@@ -9,5 +9,5 @@
   <!ENTITY epiphany-download-ftp
            "&gnome-download-ftp;/epiphany/&gnome-minor-20;/epiphany-&epiphany-version;.tar.xz">
-  <!ENTITY epiphany-md5sum        "58da6aa799aad55971a8d5059dd9075c">
+  <!ENTITY epiphany-md5sum        "e6b8cddf32775f1f6eb852ed49258277">
   <!ENTITY epiphany-size          "3.2 MB">
   <!ENTITY epiphany-buildsize     "58 MB (with tests)"> 
@@ -125,17 +125,9 @@
 
     <para>
-      An already active graphical session with bus address is necessary
-      to execute the test suite. Some sub-tests need a GNOME session,
-      otherwise, they fails. Other tests print error messages, which are
-      ignored and they are tagged "OK". To test the results, removing
-      the failing ones, issue:
+      An already active graphical session with a bus address is necessary
+      to execute the test suite.  To test the results, run:
     </para>
 
-<screen><userinput>sed -e '/embed\/ephy-download\/start/{N;N;d}' \
-    -i tests/ephy-download-test.c    &amp;&amp;
-sed -e '/embed\/ephy-embed-shell\/launch_handler/{N;N;d}' \
-    -i tests/ephy-embed-shell-test.c &amp;&amp;
-
-make check</userinput></screen>
+<screen><userinput>make check</userinput></screen>
 
   </sect2>
Index: gnome/applications/file-roller.xml
===================================================================
--- gnome/applications/file-roller.xml	(revision d4c6b05888f5795bc7a77fd325a7ac93e2f2c9e1)
+++ gnome/applications/file-roller.xml	(revision f0061d745a5e013b7e014c705dd6ae863088ce70)
@@ -9,7 +9,7 @@
   <!ENTITY file-roller-download-ftp
            "&gnome-download-ftp;/file-roller/&gnome-minor-20;/file-roller-&file-roller-version;.tar.xz">
-  <!ENTITY file-roller-md5sum        "9e23aa5feaa1b50c92dcef0b81db1e4f">
+  <!ENTITY file-roller-md5sum        "f0601c889e692f64594517c93dacdcde">
   <!ENTITY file-roller-size          "1.4 MB">
-  <!ENTITY file-roller-buildsize     "28 MB">
+  <!ENTITY file-roller-buildsize     "29 MB">
   <!ENTITY file-roller-time          "0.3 SBU">
 ]>
@@ -39,4 +39,5 @@
 
     &lfs79_checked;
+    &gcc6_checked;
 
     <note>
Index: gnome/applications/gnome-terminal.xml
===================================================================
--- gnome/applications/gnome-terminal.xml	(revision d4c6b05888f5795bc7a77fd325a7ac93e2f2c9e1)
+++ gnome/applications/gnome-terminal.xml	(revision f0061d745a5e013b7e014c705dd6ae863088ce70)
@@ -9,5 +9,5 @@
   <!ENTITY gnome-terminal-download-ftp
            "&gnome-download-ftp;/gnome-terminal/&gnome-minor-20;/gnome-terminal-&gnome-terminal-version;.tar.xz">
-  <!ENTITY gnome-terminal-md5sum        "93eb95f48937eba09cb0171190fc2921">
+  <!ENTITY gnome-terminal-md5sum        "8a450458cb833741cf52267d4a208f9a">
   <!ENTITY gnome-terminal-size          "1.8 MB">
   <!ENTITY gnome-terminal-buildsize     "37 MB">
@@ -38,4 +38,5 @@
 
     &lfs79_checked;
+    &gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: gnome/applications/gucharmap.xml
===================================================================
--- gnome/applications/gucharmap.xml	(revision d4c6b05888f5795bc7a77fd325a7ac93e2f2c9e1)
+++ gnome/applications/gucharmap.xml	(revision f0061d745a5e013b7e014c705dd6ae863088ce70)
@@ -9,5 +9,5 @@
   <!ENTITY gucharmap-download-ftp
        "&gnome-download-ftp;/gucharmap/8.0/gucharmap-&gucharmap-version;.tar.xz">
-  <!ENTITY gucharmap-md5sum        "664c2cdb0b80f0968776a46fb75e2ed5">
+  <!ENTITY gucharmap-md5sum        "8368d1053f16ea05fe1dd6818146bc8e">
   <!ENTITY gucharmap-size          "980 KB">
   <!ENTITY gucharmap-buildsize     "43 MB">
@@ -41,4 +41,5 @@
 
     &lfs79_checked;
+    &gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: gnome/platform/dconf.xml
===================================================================
--- gnome/platform/dconf.xml	(revision d4c6b05888f5795bc7a77fd325a7ac93e2f2c9e1)
+++ gnome/platform/dconf.xml	(revision f0061d745a5e013b7e014c705dd6ae863088ce70)
@@ -16,7 +16,7 @@
   <!ENTITY dconf-editor-download-http "&gnome-download-http;/dconf-editor/&gnome-minor-20;/dconf-editor-&dconf-editor-version;.tar.xz">
   <!ENTITY dconf-editor-download-ftp  "&gnome-download-ftp;/dconf-editor/&gnome-minor-20;/dconf-editor-&dconf-editor-version;.tar.xz">
-  <!ENTITY dconf-editor-md5sum        "00e205f1ba87a1d1a99b7cdbc2bd518b">
+  <!ENTITY dconf-editor-md5sum        "06e7d951f6890a78b9cbb29e670ed6a1">
   <!ENTITY dconf-editor-size          "332 KB">
-  <!ENTITY dconf-editor-buildsize     "7.3 MB">
+  <!ENTITY dconf-editor-buildsize     "7.4 MB">
   <!ENTITY dconf-editor-time          "less than 0.1 SBU">
 ]>
Index: gnome/platform/gnome-desktop.xml
===================================================================
--- gnome/platform/gnome-desktop.xml	(revision d4c6b05888f5795bc7a77fd325a7ac93e2f2c9e1)
+++ gnome/platform/gnome-desktop.xml	(revision f0061d745a5e013b7e014c705dd6ae863088ce70)
@@ -9,7 +9,7 @@
   <!ENTITY gnome-desktop-download-ftp
            "&gnome-download-ftp;/gnome-desktop/&gnome-minor-20;/gnome-desktop-&gnome-desktop-version;.tar.xz">
-  <!ENTITY gnome-desktop-md5sum        "ed6fce7d1cc535a84a6b692a61cc7264">
+  <!ENTITY gnome-desktop-md5sum        "8354ed38624f5eb6b5d34267b658a9c9">
   <!ENTITY gnome-desktop-size          "1.0 MB">
-  <!ENTITY gnome-desktop-buildsize     "18 MB">
+  <!ENTITY gnome-desktop-buildsize     "19 MB">
   <!ENTITY gnome-desktop-time          "0.3 SBU">
 ]>
@@ -39,4 +39,5 @@
 
     &lfs79_checked;
+    &gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: gnome/platform/gvfs.xml
===================================================================
--- gnome/platform/gvfs.xml	(revision d4c6b05888f5795bc7a77fd325a7ac93e2f2c9e1)
+++ gnome/platform/gvfs.xml	(revision f0061d745a5e013b7e014c705dd6ae863088ce70)
@@ -7,8 +7,8 @@
   <!ENTITY gvfs-download-http "&gnome-download-http;/gvfs/1.28/gvfs-&gvfs-version;.tar.xz">
   <!ENTITY gvfs-download-ftp  "&gnome-download-ftp;/gvfs/1.28/gvfs-&gvfs-version;.tar.xz">
-  <!ENTITY gvfs-md5sum        "1d71cb80c72dfdc06c3e78f778905689">
+  <!ENTITY gvfs-md5sum        "930c2e8a7bbf1460967b59aa8a33414c">
   <!ENTITY gvfs-size          "1.6 MB">
-  <!ENTITY gvfs-buildsize     "58 MB">
-  <!ENTITY gvfs-time          "0.8 SBU">
+  <!ENTITY gvfs-buildsize     "61 MB">
+  <!ENTITY gvfs-time          "0.7 SBU">
 ]>
 
@@ -37,4 +37,5 @@
 
     &lfs79_checked;
+    &gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: gnome/platform/vte.xml
===================================================================
--- gnome/platform/vte.xml	(revision d4c6b05888f5795bc7a77fd325a7ac93e2f2c9e1)
+++ gnome/platform/vte.xml	(revision f0061d745a5e013b7e014c705dd6ae863088ce70)
@@ -7,8 +7,8 @@
   <!ENTITY vte-download-http "&gnome-download-http;/vte/0.44/vte-&vte-version;.tar.xz">
   <!ENTITY vte-download-ftp  "&gnome-download-ftp;/vte/0.44/vte-&vte-version;.tar.xz">
-  <!ENTITY vte-md5sum        "20916d97a5902657e54307cc2757beee">
-  <!ENTITY vte-size          "960 KB">
+  <!ENTITY vte-md5sum        "eca8f8a9d9f9bb8e9d592d0acfeec015">
+  <!ENTITY vte-size          "952 KB">
   <!ENTITY vte-buildsize     "21 MB (with tests)">
-  <!ENTITY vte-time          "0.4 SBU (with tests)">
+  <!ENTITY vte-time          "0.5 SBU (with tests)">
 
   <!-- For "Contents" and "Short Descriptions" sections -->
@@ -39,4 +39,5 @@
 
     &lfs79_checked;
+    &gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision d4c6b05888f5795bc7a77fd325a7ac93e2f2c9e1)
+++ introduction/welcome/changelog.xml	(revision f0061d745a5e013b7e014c705dd6ae863088ce70)
@@ -45,4 +45,39 @@
 -->
     <listitem>
+      <para>May 13th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to gnome apps 3.30.2 -- gnome-desktop,
+          dconf-editor, cheese, eog, epiphany, file-roller, and 
+          gnome-terminal.  Finishes fixes for
+          <ulink url="&blfs-ticket-root;7827">#7827</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to vte=0.44.2.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gvfs-1.28.2.  Partially fixes
+          <ulink url="&blfs-ticket-root;7827">#7827</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Add extra-cmake-modules as a 
+          required dependency of phonon.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to ImageMagick-7.0.1-3.  Fixes
+          <ulink url="&blfs-ticket-root;7829">#7829</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gucharmap-8.0.1. Fixes
+          <ulink url="&blfs-ticket-root;7828">#7828</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gtk+-3.20.4. Fixes
+          <ulink url="&blfs-ticket-root;7826">#7825</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 12th, 2016</para>
       <itemizedlist>
Index: kde/introduction.xml
===================================================================
--- kde/introduction.xml	(revision d4c6b05888f5795bc7a77fd325a7ac93e2f2c9e1)
+++ kde/introduction.xml	(revision f0061d745a5e013b7e014c705dd6ae863088ce70)
@@ -17,4 +17,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-intro.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="extra-cmake-modules.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="phonon.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="phonon-backend-gstreamer.xml"/>
@@ -22,5 +23,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-qt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdbusmenuqt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="extra-cmake-modules.xml"/>
 
 </chapter>
Index: kde/phonon.xml
===================================================================
--- kde/phonon.xml	(revision d4c6b05888f5795bc7a77fd325a7ac93e2f2c9e1)
+++ kde/phonon.xml	(revision f0061d745a5e013b7e014c705dd6ae863088ce70)
@@ -63,4 +63,5 @@
     <para role="required">
       <xref linkend="cmake"/>,
+      <xref linkend="extra-cmake-modules"/>,
       <xref linkend="glib2"/>, and
       <xref linkend="qt5"/>
Index: packages.ent
===================================================================
--- packages.ent	(revision d4c6b05888f5795bc7a77fd325a7ac93e2f2c9e1)
+++ packages.ent	(revision f0061d745a5e013b7e014c705dd6ae863088ce70)
@@ -490,5 +490,5 @@
 <!ENTITY goffice010-version           "0.10.29">
 <!ENTITY gtk2-version                 "2.24.30">
-<!ENTITY gtk3-version                 "3.20.3">
+<!ENTITY gtk3-version                 "3.20.4">
 <!ENTITY gtk-engines-version          "2.20.2">
 <!ENTITY gtkmm2-version               "2.24.4">
Index: x/lib/gtk+3.xml
===================================================================
--- x/lib/gtk+3.xml	(revision d4c6b05888f5795bc7a77fd325a7ac93e2f2c9e1)
+++ x/lib/gtk+3.xml	(revision f0061d745a5e013b7e014c705dd6ae863088ce70)
@@ -7,7 +7,7 @@
   <!ENTITY gtk3-download-http "&gnome-download-http;/gtk+/&gnome-minor-20;/gtk+-&gtk3-version;.tar.xz">
   <!ENTITY gtk3-download-ftp  "&gnome-download-ftp;/gtk+/&gnome-minor-20;/gtk+-&gtk3-version;.tar.xz">
-  <!ENTITY gtk3-md5sum        "c4e4799cbf3aaea3fce5eb2fae77ad2c">
+  <!ENTITY gtk3-md5sum        "0cceee599f2910c25bf4b9dde4ab2fb6">
   <!ENTITY gtk3-size          "16.4 MB">
-  <!ENTITY gtk3-buildsize     "406 MB (plus 8 MB for tests)">
+  <!ENTITY gtk3-buildsize     "422 MB (plus 9 MB for tests)">
   <!ENTITY gtk3-time          "6.3 SBU (plus 0.5 SBU for tests)">
 ]>
