Index: archive/qjson.xml
===================================================================
--- archive/qjson.xml	(revision 69b234977b72412082794e5b3a1cf67a2f4e369d)
+++ archive/qjson.xml	(revision 69b234977b72412082794e5b3a1cf67a2f4e369d)
@@ -0,0 +1,164 @@
+<?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 qjson-download-http "http://downloads.sourceforge.net/qjson/qjson-&qjson-version;.tar.bz2">
+  <!ENTITY qjson-download-ftp  " ">
+  <!ENTITY qjson-md5sum        "323fbac54a5a20c0b8fe45c1ced03e2d">
+  <!ENTITY qjson-size          "64 KB">
+  <!ENTITY qjson-buildsize     "1.4 MB">
+  <!ENTITY qjson-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="qjson" xreflabel="QJson-&qjson-version;">
+  <?dbhtml filename="qjson.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>QJson-&qjson-version;</title>
+
+  <indexterm zone="qjson">
+    <primary sortas="a-QJson">QJson</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to QJson</title>
+
+    <para>
+      <application>QJson</application> is a Qt-based library that maps JSON
+      data to QVariant objects and vice versa.
+    </para>
+
+    &lfs79_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&qjson-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&qjson-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &qjson-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &qjson-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &qjson-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &qjson-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">QJson Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="qt4"/> and
+      <xref linkend="cmake"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/qjson"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of QJson</title>
+
+    <para>
+      Install <application>QJson</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      .. &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not contain 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>
+
+    <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to
+    build without debugging symbols and apply a higher level of compiler
+    optimizations.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          none
+        </seg>
+        <seg>
+          libqjson.so
+        </seg>
+        <seg>
+          &qt4-dir;/include/json and &qt4-dir;/lib/cmake/qjson
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libqjson">
+        <term><filename class="libraryfile">libqjson.so</filename></term>
+        <listitem>
+          <para>
+            contains <application>QJson</application> API functions.
+          </para>
+          <indexterm zone="qjson libqjson">
+            <primary sortas="c-libqjson">libqjson.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 1552ac8aeb77f187eba7d11bba7cbbe71512be97)
+++ general/genlib/genlib.xml	(revision 69b234977b72412082794e5b3a1cf67a2f4e369d)
@@ -124,5 +124,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ptlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qca.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qjson.xml"/>
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qjson.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="talloc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wayland.xml"/>
Index: neral/genlib/qjson.xml
===================================================================
--- general/genlib/qjson.xml	(revision 1552ac8aeb77f187eba7d11bba7cbbe71512be97)
+++ 	(revision )
@@ -1,164 +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 qjson-download-http "http://downloads.sourceforge.net/qjson/qjson-&qjson-version;.tar.bz2">
-  <!ENTITY qjson-download-ftp  " ">
-  <!ENTITY qjson-md5sum        "323fbac54a5a20c0b8fe45c1ced03e2d">
-  <!ENTITY qjson-size          "64 KB">
-  <!ENTITY qjson-buildsize     "1.4 MB">
-  <!ENTITY qjson-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="qjson" xreflabel="QJson-&qjson-version;">
-  <?dbhtml filename="qjson.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>QJson-&qjson-version;</title>
-
-  <indexterm zone="qjson">
-    <primary sortas="a-QJson">QJson</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to QJson</title>
-
-    <para>
-      <application>QJson</application> is a Qt-based library that maps JSON
-      data to QVariant objects and vice versa.
-    </para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qjson-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qjson-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qjson-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qjson-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qjson-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qjson-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">QJson Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="qt4"/> and
-      <xref linkend="cmake"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/qjson"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of QJson</title>
-
-    <para>
-      Install <application>QJson</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not contain 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>
-
-    <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to
-    build without debugging symbols and apply a higher level of compiler
-    optimizations.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          none
-        </seg>
-        <seg>
-          libqjson.so
-        </seg>
-        <seg>
-          &qt4-dir;/include/json and &qt4-dir;/lib/cmake/qjson
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libqjson">
-        <term><filename class="libraryfile">libqjson.so</filename></term>
-        <listitem>
-          <para>
-            contains <application>QJson</application> API functions.
-          </para>
-          <indexterm zone="qjson libqjson">
-            <primary sortas="c-libqjson">libqjson.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/graphviz.xml
===================================================================
--- general/genutils/graphviz.xml	(revision 1552ac8aeb77f187eba7d11bba7cbbe71512be97)
+++ general/genutils/graphviz.xml	(revision 69b234977b72412082794e5b3a1cf67a2f4e369d)
@@ -40,5 +40,5 @@
     </para>
 
-    &lfs79_checked;
+    &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -76,4 +76,14 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/graphviz-&graphviz-version;-consolidated_fixes-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Graphviz Dependencies</bridgehead>
 
@@ -93,13 +103,13 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="libglade"/>,
+      <xref linkend="gs"/>,
+      <xref linkend="gtk2"/>,
+      <xref linkend="qt5"/>,
       <ulink url="http://openil.sourceforge.net/projects.php">DevIL</ulink>,
       <ulink url="http://linux.softpedia.com/get/Programming/Debuggers/Electric-Fence-3305.shtml/">Electric Fence</ulink>,
-      <xref linkend="libglade"/>,
       <ulink url="http://sourceforge.net/projects/lasi/">libLASi</ulink>,
-      <ulink url="http://www.libgd.org/">GD Library</ulink>,
-      <ulink url="http://www.freedesktop.org/wiki/Software/glitz">glitz</ulink>,
-      <xref linkend="gs"/>,
-      <xref linkend="gtk2"/> and
-      <xref linkend="qt4"/>
+      <ulink url="http://www.libgd.org/">GD Library</ulink>, and
+      <ulink url="http://www.freedesktop.org/wiki/Software/glitz">glitz</ulink>
     </para>
 
@@ -110,14 +120,14 @@
       <xref linkend="guile"/>,
       <xref linkend="openjdk"/>,
-      <ulink url="http://iolanguage.org/">Io</ulink>,
       <xref linkend="lua"/>,
-      <ulink url="http://www.mono-project.com/Main_Page">Mono</ulink>,
-      <ulink url="http://ocaml.org/">OCaml</ulink>,
       <xref linkend="php"/>,
       <xref linkend="python2"/>,
-      <ulink url="http://www.r-project.org/">R</ulink>,
       <xref linkend="ruby"/>,
-      <xref linkend="tcl"/> and
-      <xref linkend="tk"/>
+      <xref linkend="tcl"/>,
+      <xref linkend="tk"/>,
+      <ulink url="http://iolanguage.org/">Io</ulink>,
+      <ulink url="http://www.mono-project.com/Main_Page">Mono</ulink>,
+      <ulink url="http://ocaml.org/">OCaml</ulink>, and
+      <ulink url="http://www.r-project.org/">R</ulink>
     </para>
 
@@ -135,8 +145,7 @@
     </para>
 
-<screen><userinput>sed -i 's/ruby-1.9/ruby-2.2/g' configure                  &amp;&amp;
-sed -i 's/ e_/ gs_error_/'     plugin/gs/gvloadimage_gs.c &amp;&amp;
-
-./configure --prefix=/usr         &amp;&amp;
+<screen><userinput>patch -Np1 -i ../graphviz-&graphviz-version;-consolidated_fixes-1.patch &amp;&amp;
+autoreconf                               &amp;&amp;
+./configure --prefix=/usr --disable-php  &amp;&amp;
 make</userinput></screen>
 
@@ -169,15 +178,6 @@
 
     <para>
-      <command>sed -e "s:ruby-1.9:ruby-2.2:g" -i configure</command>:
-      Use this command, if ruby-2.2.0 is installed and you wish
-      <application>Graphviz</application> built with support for it.
-    </para>
-
-    <para>
-      <command>sed -e 's/ e_/ gs_error_/' ...</command>: Use this
-      command, if ghostscript-9.18 or later is installed and you wish
-      <application>Graphviz</application> built with support for it, or
-      else the build fails because some identifiers have been renamed in
-      ghostscript-9.18's headers.
+      <option>--disable-php</option>: Theis version of graphviz
+      does not supoprt php version 7.
     </para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 1552ac8aeb77f187eba7d11bba7cbbe71512be97)
+++ introduction/welcome/changelog.xml	(revision 69b234977b72412082794e5b3a1cf67a2f4e369d)
@@ -47,4 +47,7 @@
       <para>June 7th, 2016</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update graphviz to build with Qt5.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Remove reference to qt4 in avahi
Index: kde/libdbusmenuqt.xml
===================================================================
--- kde/libdbusmenuqt.xml	(revision 1552ac8aeb77f187eba7d11bba7cbbe71512be97)
+++ kde/libdbusmenuqt.xml	(revision 69b234977b72412082794e5b3a1cf67a2f4e369d)
@@ -61,11 +61,10 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <!--<xref linkend="qt4"/> or --><xref linkend="qt5"/>
+      <xref linkend="qt5"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend="qjson"/> (for building the test suite) and
-    <xref linkend="doxygen"/> (for building the API documentation)
+      <xref linkend="doxygen"/> (for building the API documentation)
     </para>
 
@@ -77,35 +76,8 @@
   <sect2 role="installation">
     <title>Installation of libdbusmenu-qt</title>
-<!--
-    <para>Install the qt4 based version of
-    <application>libdbusmenu-qt</application> by running the following
-    commands:</para>
 
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
+    <para>Install <application>libdbusmenu-qt</application> by running the
+    following commands:</para>
 
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DUSE_QT4=TRUE              \
-      -DWITH_DOC=OFF              \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results
-    (<xref linkend="qjson"/> must be installed),
-    issue: <command>make -k check</command>. One test is known to fail.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
--->
-    <para>Install <!--the qt5 based version of-->
-    <application>libdbusmenu-qt</application> by running the following
-    commands:</para>
-<!--
-    <note><para>If building both versions of this application, be sure
-    to remove the previous version of the source and reextract them from
-    the original tar file.</para></note>
--->
 <screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
@@ -117,8 +89,12 @@
 make</userinput></screen>
 
+    <!--
     <para>
       To test the results (<xref linkend="qjson"/> must be installed),
       issue: <command>make -k check</command>. One test is known to fail.
     </para>
+    -->
+
+    <para>This packages doe not come wiht a working test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
