Update graphviz to build with Qt5

Archive qjson



git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17458 af4574ff-66df-0310-9fd7-8a98e5e911e0

general/genlib/genlib.xml

@@ -123,7 +123,7 @@ $Date$
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pth.xml"/>
   <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"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wv.xml"/>

general/genutils/graphviz.xml

@@ -39,7 +39,7 @@
       tools, libraries, and language bindings.
     </para>
 
-    &lfs79_checked;
+    &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -75,6 +75,16 @@
       </listitem>
     </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>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
@@ -92,15 +102,15 @@
 
     <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>
 
     <bridgehead renderas="sect4">Optional (To Build Language Bindings)</bridgehead>
@@ -109,16 +119,16 @@
       installed or no bindings will be built),
       <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>
 
     <para condition="html" role="usernotes">User Notes:
@@ -134,10 +144,9 @@
       commands:
     </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>
 
     <para>
@@ -168,17 +177,8 @@ make</userinput></screen>
     <title>Command Explanations</title>
 
     <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>
 
   </sect2>

introduction/welcome/changelog.xml

@@ -46,6 +46,9 @@
     <listitem>
       <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
           and networkmanager.</para>

kde/libdbusmenuqt.xml

@@ -60,13 +60,12 @@
 
     <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>
 
     <para condition="html" role="usernotes">User Notes:
@@ -76,37 +75,10 @@
 
   <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;
 
@@ -116,10 +88,14 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr \
       -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>This packages doe not come wiht a working test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>