Changeset 3d6e95d for general/genutils/graphviz.xml

Timestamp:

06/09/2016 11:28:10 PM (8 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

systemd-13485

Children:

26bc008

Parents:

8ee0429

Message:

(systemd) Merge to trunk r17470

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@17472 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• general/genutils/graphviz.xml (modified) (5 diffs)

general/genutils/graphviz.xml

@@ -76 +76 @@
     </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 +103 @@
     <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"/>
     </para>
 
@@ -110 +120 @@
       <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 +145 @@
     </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 +178 @@
 
     <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>: This version of graphviz
+      does not support php version 7.
     </para>