Changeset f6ebe7e

Timestamp:

08/29/2017 12:43:57 PM (7 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

bd43647e

Parents:

9f9770b

Message:

Graphviz-2.40.1:

• patch for Qt5
• sed for ruby
• remove --disable-php

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

File:

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

general/genutils/graphviz.xml

@@ -74 +74 @@
       </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"/>
+          Optional patch to use <xref linkend="qt5"/>:
+          <ulink url="&patch-root;/graphviz-&graphviz-version;-qt5-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
--->
+
     <bridgehead renderas="sect3">Graphviz Dependencies</bridgehead>
 
@@ -105 +105 @@
       <xref linkend="gs"/>,
       <xref linkend="gtk2"/>,
-<!-- Needs Qt4:      <xref linkend="qt5"/>,-->
+      <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>,
@@ -140 +140 @@
 
     <para>
+      If <xref linkend="ruby"/> is installed, and you want to build Ruby
+      bindings, fix ruby's detection:
+    </para>
+
+<screen><userinput>sed -e '/ruby/s/1\.9/2.4/' -i configure.ac</userinput></screen>
+
+    <para>
+      If <xref linkend="qt5"/> is installed, and you want to build the
+      <command>gvedit</command> graph editor, issue:
+    </para>
+
+<screen><userinput>patch -p1 -i ../graphviz-&graphviz-version;-qt5-1.patch</userinput></screen>
+
+    <para>
       Install <application>Graphviz</application> by running the following
       commands:
@@ -146 +160 @@
 <screen><userinput>sed -i '/LIBPOSTFIX="64"/s/64//' configure.ac &amp;&amp;
 
-autoreconf                               &amp;&amp;
-./configure --prefix=/usr --disable-php  &amp;&amp;
+autoreconf                &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -181 +195 @@
       avoid installing files in /usr/lib64.
     </para>
-
+<!-- Seems php bindings can be built now (not tested)
     <para>
-      <parameter>--disable-php</parameter>: This version of graphviz
+      <parameter>- -disable-php</parameter>: This version of graphviz
       does not support php version 7.
-    </para>
+    </para>-->
 
     <para>