Changeset 1daaab6d for general/genutils/graphviz.xml

Timestamp:

12/04/2021 08:32:42 AM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

qt5new

Children:

104ff4e

Parents:

ce5723af (diff), edd2feb7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' into qt5new

File:

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

general/genutils/graphviz.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY graphviz-download-http "https://gitlab.com/graphviz/graphviz/-/archive/&graphviz-version;/graphviz-&graphviz-version;.tar.gz">
+  <!ENTITY graphviz-download-http "https://gitlab.com/graphviz/graphviz/-/archive/&graphviz-version;/graphviz-&graphviz-version;.tar.bz2">
   <!ENTITY graphviz-download-ftp  " ">
-  <!ENTITY graphviz-md5sum        "f9dd7caf4785f47f5fd40f5407d9d7ce">
-  <!ENTITY graphviz-size          "29 MB">
-  <!ENTITY graphviz-buildsize     "204 MB">
+  <!ENTITY graphviz-md5sum        "d28da63d258a901cc0ea35b879c07db9">
+  <!ENTITY graphviz-size          "26 MB">
+  <!ENTITY graphviz-buildsize     "248 MB">
   <!ENTITY graphviz-time          "0.7 SBU (using parallelism=4)">
 ]>
@@ -73 +73 @@
       </listitem>
     </itemizedlist>
-<!--
-    <note>
-      <para>
-        The <application>graphviz</application> source tarball shown above
-        downloads to a non-versioned file name: graphviz.tar.gz.  It does
-        expand to a versioned directory, graphviz-&graphviz-version;/.
-        If you prefer to use a versioned tarball name, you can simply 
-        rename it or download the package with:
-
-        <screen><userinput>wget -c &graphviz-download-http; \
-     -O graphviz-&graphviz-version;.tar.gz</userinput></screen>.
-        </para>
-      </note>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          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 +82 @@
         rendering engine allows to generate several graphic formats, such as
         Postscript, SVG, VML, .fig, and Tk. Those formats can be converted
-        to almost any other, using for example tools from <xref role="nodep"
-        linkend="imagemagick"/>. The dependencies below add the ability to
-        generate graph images in bitmap format, to display the graph image on
-        screen, to edit a graph by seeing directly the result image, or to view
-        large graphs. Since <application>Graphviz</application> is a dependency
+        to almost any other format using for example tools from
+        <xref role="nodep" linkend="imagemagick"/>. The dependencies below add
+        the ability to generate graph images in bitmap format, to display the
+        graph image on screen, to edit a graph by viewing the resulting image
+        directly, or to view large graphs. Since
+        <application>Graphviz</application> is a dependency
         of several other packages in this book, it is suggested to first build
         it without any dependencies, then to rebuild it when you have built
@@ -140 +118 @@
       formats, and is needed for displaying images
     </para>
-      
+
     <para role="optional">
       Other formats may be added with
@@ -164 +142 @@
 
     <para role="optional">
-      <xref linkend="freeglut"/> (with <xref linkend="libglade"/>, 
+      <xref linkend="freeglut"/> (with <xref linkend="libglade"/>,
       <ulink url="https://sourceforge.net/projects/gtkglext/">GtkGLExt</ulink>, and
       <ulink url="http://gts.sourceforge.net/">libGTS</ulink>, for building
@@ -214 +192 @@
     <title>Installation of Graphviz</title>
 
-<!-- For every major version of Ruby, this has to be tweaked. See #11606 
-
-    <para>
-      If <xref linkend="ruby"/> is installed, and you want to build Ruby
-      bindings, fix ruby's detection:
-    </para>
-
-     Not sure about the above for version 2.42.1.  Seems to detect it OK.  I
-     didn't see any reference to the specific ruby version.
--->
-<!--<screen><userinput>sed -e '/ruby/s/1\.9/2.6/' -i configure.ac</userinput></screen>-->
-
-<!-- No patch required
-    <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
@@ -242 +200 @@
 
 ./autogen.sh              &amp;&amp;
-./configure --prefix=/usr \
-            --disable-php \
-            PS2PDF=true   &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -274 +230 @@
 
     <para>
-      <command>sed ... configure.ac</command>: This command is needed to 
+      <command>sed ... configure.ac</command>: This command is needed to
       avoid installing files in /usr/lib64.
     </para>
@@ -281 +237 @@
       <parameter>--disable-php</parameter>: This version of graphviz
       does not support php version 8.
-    </para>
-
-    <para>
-      <parameter>PS2PDF=true</parameter>: This is needed if <xref
-      linkend="gs"/> is not installed. Otherwise, the build
-      system tries to run <command>false</command>, which generates
-      an error.
     </para>
 
@@ -306 +255 @@
 
     <para>
-      <option>--with-smyrna</option>: Even if the needed dependencies are 
+      <option>--with-smyrna</option>: Even if the needed dependencies are
       installed, the interactive graph viewer <command>smyrna</command> is not
       built without this option.
@@ -361 +310 @@
           dot, dot2gxl, dot_builtins, dotty, edgepaint, fdp, gc, gml2gv,
           graphml2gv, gv2gml, gv2gxl, gvcolor, gvedit, gvgen, gvmap, gvmap.sh,
-          gvpack, gvpr, gxl2dot, gxl2gv, lefty, lneato, mm2gv, neato, nop,
+          gvpack, gvpr, gxl2dot, gxl2gv, lneato, mm2gv, neato, nop,
           osage, patchwork, prune, sccmap, sfdp, tred, twopi,
           unflatten, and vimdot
         </seg>
         <seg>
-          libcdt.so, libcgraph.so, libgvc.so, libgvpr.so, liblab_gamut.so, 
+          libcdt.so, libcgraph.so, libgvc.so, libgvpr.so, liblab_gamut.so,
           libpathplan.so, libxdot.so, and several plugins in /usr/lib/graphviz.
           There are also several in subdirectories of
-          /usr/lib/{lua,perl5,php,<!--python&python2-majorver;-->,python&python3-majorver;,tcl8.6}.
+          /usr/lib/{lua,perl5, <!--php, -->python&python3-majorver;,tcl8.6}.
           Unfortunately, some libraries are duplicated.
         </seg>
@@ -443 +392 @@
         <listitem>
           <para>
-            takes as input a graph in DOT format, finds node clusters
-            and augments the graph with this information
+            takes a graph in DOT format as input, finds node clusters
+            and then augments the graph with this information
           </para>
           <indexterm zone="graphviz cluster">
@@ -818 +767 @@
         <listitem>
           <para>
-            draws clustered graphs. As input, it takes any
-            graph in the DOT format
+            draws clustered graphs. It takes any graph in DOT format as input
           </para>
           <indexterm zone="graphviz osage">
@@ -832 +780 @@
           <para>
             draws clustered graphs using a squarified treemap layout.
-            As input, it takes any graph in the DOT format
+            It takes any graph in DOT format as input
           </para>
           <indexterm zone="graphviz patchwork">
@@ -974 +922 @@
           <para>
             provides a context for applications wishing to manipulate
-            and render graphs. It provides a command line parsing,
+            and render graphs. It provides command line parsing interfaces,
             common rendering code, and a plugin mechanism for renderers
           </para>