Index: gnome.ent
===================================================================
--- gnome.ent	(revision 2ea18369a678922597322ee635b377b775f91b34)
+++ gnome.ent	(revision c870dc3f032f2f0345780c38a7149468c33ab6b5)
@@ -24,5 +24,5 @@
 <!ENTITY dconf-version                     "0.24.0">
 <!ENTITY dconf-editor-version              "3.16.1">
-<!ENTITY adwaita-icon-theme-version        "3.16.2.1">
+<!ENTITY adwaita-icon-theme-version        "3.18.0">
 <!ENTITY gnome-icon-theme-version          "3.12.0">
 <!ENTITY gnome-icon-theme-extras-version   "3.12.0">
Index: gnome/platform/adwaita-icon-theme.xml
===================================================================
--- gnome/platform/adwaita-icon-theme.xml	(revision 2ea18369a678922597322ee635b377b775f91b34)
+++ gnome/platform/adwaita-icon-theme.xml	(revision c870dc3f032f2f0345780c38a7149468c33ab6b5)
@@ -7,10 +7,10 @@
 
   <!ENTITY adwaita-icon-theme-download-http
-   "&gnome-download-http;/adwaita-icon-theme/&gnome-minor-16;/adwaita-icon-theme-&adwaita-icon-theme-version;.tar.xz">
+   "&gnome-download-http;/adwaita-icon-theme/&gnome-minor-18;/adwaita-icon-theme-&adwaita-icon-theme-version;.tar.xz">
   <!ENTITY adwaita-icon-theme-download-ftp
-   "&gnome-download-ftp;/adwaita-icon-theme/&gnome-minor-16;/adwaita-icon-theme-&adwaita-icon-theme-version;.tar.xz">
-  <!ENTITY adwaita-icon-theme-md5sum        "9ef86952c947aa27a1a888b7735d60b3">
-  <!ENTITY adwaita-icon-theme-size          "18 MB">
-  <!ENTITY adwaita-icon-theme-buildsize     "140 MB">
+   "&gnome-download-ftp;/adwaita-icon-theme/&gnome-minor-18;/adwaita-icon-theme-&adwaita-icon-theme-version;.tar.xz">
+  <!ENTITY adwaita-icon-theme-md5sum        "ec1fa3fde83ad166ae7075a97dc1ec4b">
+  <!ENTITY adwaita-icon-theme-size          "19 MB">
+  <!ENTITY adwaita-icon-theme-buildsize     "130 MB">
   <!ENTITY adwaita-icon-theme-time          "1.1 SBU">
 ]>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 2ea18369a678922597322ee635b377b775f91b34)
+++ introduction/welcome/changelog.xml	(revision c870dc3f032f2f0345780c38a7149468c33ab6b5)
@@ -49,4 +49,16 @@
       <itemizedlist>
         <listitem>
+          <para>[fernando] - Update to pango-1.38.1. Fixes
+          <ulink url="&blfs-ticket-root;7014">#7014</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to gtk+-3.18.2. Fixes
+          <ulink url="&blfs-ticket-root;7013">#7013</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to adwaita-icon-theme-3.18.0. Partially
+          fixes <ulink url="&blfs-ticket-root;6950">#6950</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to qt-5.5.1. Fixes
           <ulink url="&blfs-ticket-root;7025">#7025</ulink>.</para>
Index: multimedia/libdriv/pulseaudio.xml
===================================================================
--- multimedia/libdriv/pulseaudio.xml	(revision 2ea18369a678922597322ee635b377b775f91b34)
+++ multimedia/libdriv/pulseaudio.xml	(revision c870dc3f032f2f0345780c38a7149468c33ab6b5)
@@ -244,5 +244,5 @@
         <seg>
           esdcompat, pacat, pacmd, pactl, padsp, pamon (symlink to pacat),
-          paplay (symlink to pacat), parec (symlink to pacat), 
+          paplay (symlink to pacat), parec (symlink to pacat),
           parecord (symlink to pacat), pasuspender,
           pax11publish, pulseaudio, and
@@ -256,5 +256,5 @@
           libpulse-mainloop-glib.so,
           libpulse-simple.so, and
-          libpulsecore-&pulseaudio-major-version;.so 
+          libpulsecore-&pulseaudio-major-version;.so
         </seg>
         <seg>
@@ -263,5 +263,5 @@
           /usr/lib/{pulseaudio,pulse-7.0},
           /usr/lib/cmake/PulseAudio,
-          /usr/libexec/pulse, an 
+          /usr/libexec/pulse, and
           /usr/share/pulseaudio
         </seg>
Index: packages.ent
===================================================================
--- packages.ent	(revision 2ea18369a678922597322ee635b377b775f91b34)
+++ packages.ent	(revision c870dc3f032f2f0345780c38a7149468c33ab6b5)
@@ -473,5 +473,5 @@
 <!ENTITY goffice010-version           "0.10.23">
 <!ENTITY gtk2-version                 "2.24.28">
-<!ENTITY gtk3-version                 "3.18.1">
+<!ENTITY gtk3-version                 "3.18.2">
 <!ENTITY gtk-engines-version          "2.20.2">
 <!ENTITY gtkmm2-version               "2.24.4">
@@ -482,5 +482,5 @@
 <!ENTITY libnotify-version            "0.7.6">
 <!ENTITY libxklavier-version          "5.4">
-<!ENTITY pango-version                "1.38.0">
+<!ENTITY pango-version                "1.38.1">
 <!ENTITY pangomm-version              "2.38.1">
 <!ENTITY qt4-version                  "4.8.7">
Index: pst/printing/cups.xml
===================================================================
--- pst/printing/cups.xml	(revision 2ea18369a678922597322ee635b377b775f91b34)
+++ pst/printing/cups.xml	(revision c870dc3f032f2f0345780c38a7149468c33ab6b5)
@@ -218,6 +218,6 @@
 sed -i '/MAN.EXT/s:.gz::g' configure config-scripts/cups-manpages.m4          &amp;&amp;
 sed -i '/LIBGCRYPTCONFIG/d' config-scripts/cups-ssl.m4                        &amp;&amp;
-sed -i 's@else /\* HAVE_AVAHI \*/@elif defined(HAVE_AVAHI)@' test/ippserver.c &amp;&amp;
-
+<!--sed -i 's@else /\* HAVE_AVAHI \*/@elif defined(HAVE_AVAHI)@' test/ippserver.c &amp;&amp;
+-->
 aclocal  -I config-scripts &amp;&amp;
 autoconf -I config-scripts &amp;&amp;
@@ -295,9 +295,9 @@
       package.
     </para>
-
+<!--
     <para>
       <command>sed ... test/ippserver.c</command>: This sed fixes a bug,
       which shows up when <application>avahi</application> is not present.
-    </para>
+    </para>-->
 
     <para>
Index: x/lib/gtk+3.xml
===================================================================
--- x/lib/gtk+3.xml	(revision 2ea18369a678922597322ee635b377b775f91b34)
+++ x/lib/gtk+3.xml	(revision c870dc3f032f2f0345780c38a7149468c33ab6b5)
@@ -7,8 +7,8 @@
   <!ENTITY gtk3-download-http "&gnome-download-http;/gtk+/&gnome-minor-18;/gtk+-&gtk3-version;.tar.xz">
   <!ENTITY gtk3-download-ftp  "&gnome-download-ftp;/gtk+/&gnome-minor-18;/gtk+-&gtk3-version;.tar.xz">
-  <!ENTITY gtk3-md5sum        "b4d4d30d90f4831855b410fb6a1fae63">
-  <!ENTITY gtk3-size          "18 MB">
-  <!ENTITY gtk3-buildsize     "503 MB (add 10 MB for tests)">
-  <!ENTITY gtk3-time          "11 SBU (add 0.8 SBU for tests)">
+  <!ENTITY gtk3-md5sum        "230fd78e42419d35ff790784b457e5f2">
+  <!ENTITY gtk3-size          "19 MB">
+  <!ENTITY gtk3-buildsize     "512 MB (with tests)">
+  <!ENTITY gtk3-time          "7.3 SBU (with tests)">
 ]>
 
@@ -258,11 +258,12 @@
       <seglistitem>
         <seg>
-          broadwayd, 
-          gtk3-demo, 
-          gtk3-demo-application, 
-          gtk3-icon-browser, 
-          gtk3-widget-factory, 
-          gtk-encode-symbolic-svg, 
-          gtk-launch, 
+          broadwayd,
+          gtk3-demo,
+          gtk3-demo-application,
+          gtk3-icon-browser,
+          gtk3-widget-factory,
+          gtk-builder-tool,
+          gtk-encode-symbolic-svg,
+          gtk-launch,
           gtk-query-immodules-3.0, and
           gtk-update-icon-cache
@@ -275,5 +276,5 @@
           /etc/gtk-3.0,
           /usr/include/{gail,gtk}-3.0,
-          /usr/{lib,share}/gtk-3.0, 
+          /usr/{lib,share}/gtk-3.0,
           /usr/share/gtk-doc/html/{gail-libgail-util3,gdk3,gtk3}, and
           /usr/share/themes/{Default,Emacs}/gtk-3.0
@@ -301,4 +302,67 @@
       </varlistentry>
 
+      <varlistentry id="gtk3-demo">
+        <term><command>gtk3-demo</command></term>
+        <listitem>
+          <para>
+            is a simple program that demonstrates some of the things that can be
+            done with <application>GTK+ 3</application>
+          </para>
+          <indexterm zone="gtk3 gtk3-demo">
+            <primary sortas="b-gtk3-demo">gtk3-demo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gtk3-demo-application">
+        <term><command>gtk3-demo-application</command></term>
+        <listitem>
+          <para>
+            is a simple <application>GTK+ 3</application> application.
+          </para>
+          <indexterm zone="gtk3 gtk3-demo-application">
+            <primary sortas="b-gtk3-demo-application">gtk3-demo-application</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gtk3-icon-browser">
+        <term><command>gtk3-icon-browser</command></term>
+        <listitem>
+          <para>
+            is a utility to explore the icons in the current icon theme. It
+            shows icons in various sizes, their symbolic variants where
+            available, as well as a description of the icon and its context.
+          </para>
+          <indexterm zone="gtk3 gtk3-icon-browser">
+            <primary sortas="b-gtk3-icon-browser">gtk3-icon-browser</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gtk3-widget-factory">
+        <term><command>gtk3-widget-factory</command></term>
+        <listitem>
+          <para>
+            is a program to view <application>GTK+ 3</application> themes and widgets.
+          </para>
+          <indexterm zone="gtk3 gtk3-widget-factory">
+            <primary sortas="b-gtk3-widget-factory">gtk3-widget-factory</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gtk-builder-tool">
+        <term><command>gtk-builder-tool</command></term>
+        <listitem>
+          <para>
+            can perform various operations on GtkBuilder .ui files.
+          </para>
+          <indexterm zone="gtk3 gtk-builder-tool">
+            <primary sortas="b-gtk-builder-tool">gtk-builder-tool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="gtk-encode-symbolic-svg">
         <term><command>gtk-encode-symbolic-svg</command></term>
@@ -357,55 +421,4 @@
       </varlistentry>
 
-      <varlistentry id="gtk3-demo">
-        <term><command>gtk3-demo</command></term>
-        <listitem>
-          <para>
-            is a simple program that demonstrates some of the things that can be
-            done with <application>GTK+ 3</application>
-          </para>
-          <indexterm zone="gtk3 gtk3-demo">
-            <primary sortas="b-gtk3-demo">gtk3-demo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk3-demo-application">
-        <term><command>gtk3-demo-application</command></term>
-        <listitem>
-          <para>
-            is a simple <application>GTK+ 3</application> application.
-          </para>
-          <indexterm zone="gtk3 gtk3-demo-application">
-            <primary sortas="b-gtk3-demo-application">gtk3-demo-application</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk3-icon-browser">
-        <term><command>gtk3-icon-browser</command></term>
-        <listitem>
-          <para>
-            is a utility to explore the icons in the current icon theme. It
-            shows icons in various sizes, their symbolic variants where
-            available, as well as a description of the icon and its context.
-          </para>
-          <indexterm zone="gtk3 gtk3-icon-browser">
-            <primary sortas="b-gtk3-icon-browser">gtk3-icon-browser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk3-widget-factory">
-        <term><command>gtk3-widget-factory</command></term>
-        <listitem>
-          <para>
-            is a program to view <application>GTK+ 3</application> themes and widgets.
-          </para>
-          <indexterm zone="gtk3 gtk3-widget-factory">
-            <primary sortas="b-gtk3-widget-factory">gtk3-widget-factory</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libgailutil-3">
         <term><filename class="libraryfile">libgailutil-3.so</filename></term>
Index: x/lib/pango.xml
===================================================================
--- x/lib/pango.xml	(revision 2ea18369a678922597322ee635b377b775f91b34)
+++ x/lib/pango.xml	(revision c870dc3f032f2f0345780c38a7149468c33ab6b5)
@@ -7,8 +7,8 @@
   <!ENTITY pango-download-http "&gnome-download-http;/pango/1.38/pango-&pango-version;.tar.xz">
   <!ENTITY pango-download-ftp  "&gnome-download-ftp;/pango/1.38/pango-&pango-version;.tar.xz">
-  <!ENTITY pango-md5sum        "5a358e5afbb6b2e82cf2cb02ca9cce86">
+  <!ENTITY pango-md5sum        "7fde35d4a127b55ce8bbcefe109bc80d">
   <!ENTITY pango-size          "1 MB">
-  <!ENTITY pango-buildsize     "24 MB (additional 2 MB to rebuild and install the API documentation)">
-  <!ENTITY pango-time          "0.5 SBU (additional 0.1 SBU to rebuild and install the API documentation)">
+  <!ENTITY pango-buildsize     "27 MB (additional 2 MB to rebuild and install the API documentation)">
+  <!ENTITY pango-time          "0.4 SBU (additional 0.1 SBU to rebuild and install the API documentation)">
 
 ]>
@@ -79,5 +79,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="fontconfig"/> (must be built with 
+      <xref linkend="fontconfig"/> (must be built with
        <xref linkend="freetype2"/> using <xref linkend="harfbuzz"/>) and
       <xref linkend="glib2"/>
@@ -117,6 +117,5 @@
 
     <para>
-      To test the results, issue: <command>make -k check</command>. One test
-      fails for unknown reasons.
+      To test the results, issue: <command>make check</command>.
     </para>
 
@@ -126,5 +125,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-
+<!--
     <note>
       <para>
@@ -135,6 +134,6 @@
       </para>
 
-<screen role="root"><userinput>pango-querymodules --update-cache</userinput></screen>
-    </note>
+<screen role="root"><userinput>pango-querymodules -\-update-cache</userinput></screen>
+    </note>-->
 
   </sect2>
@@ -168,5 +167,5 @@
       </indexterm>
     </sect3>
-
+<!--
     <sect3>
       <title>Configuration Information</title>
@@ -179,5 +178,5 @@
       </para>
 
-    </sect3>
+    </sect3>-->
 
   </sect2>
@@ -193,5 +192,5 @@
       <seglistitem>
         <seg>
-          pango-querymodules and pango-view
+          pango-view
         </seg>
         <seg>
@@ -200,7 +199,5 @@
         </seg>
         <seg>
-          /etc/pango,
-          /usr/include/pango-1.0,
-          /usr/lib/pango, and
+          /usr/include/pango-1.0 and
           /usr/share/gtk-doc/html/pango
         </seg>
@@ -212,17 +209,4 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pango-querymodules">
-        <term><command>pango-querymodules</command></term>
-        <listitem>
-          <para>
-            is a module registration utility that collects information about
-            <application>Pango</application> loadable modules.
-          </para>
-          <indexterm zone="pango pango-querymodules">
-            <primary sortas="b-pango-querymodules">pango-querymodules</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
 
       <varlistentry id="pango-view">
