Changeset 13d0d6f0 for general/prog

Timestamp:

12/30/2015 10:48:49 PM (8 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.9, 8.0, 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, nosym, 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:

10f9bb45

Parents:

b1d3c72a

Message:

• Update to firefox-43.0.3.
• Update to audacious-3.7.1, audacious-plugins-3.7.1.
• Update to xapian-core-1.2.22.
• Update to wireshark-2.0.1.
• Update to doxygen-1.8.11.

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

File:

• general/prog/doxygen.xml (modified) (8 diffs)

general/prog/doxygen.xml

@@ -7 +7 @@
   <!ENTITY doxygen-download-http "http://ftp.stack.nl/pub/doxygen/doxygen-&doxygen-version;.src.tar.gz">
   <!ENTITY doxygen-download-ftp  "ftp://ftp.stack.nl/pub/doxygen/doxygen-&doxygen-version;.src.tar.gz">
-  <!ENTITY doxygen-md5sum        "79767ccd986f12a0f949015efb5f058f">
-  <!ENTITY doxygen-size          "4.6 MB">
-  <!ENTITY doxygen-buildsize     "174 MB (with all programs, docs and tests)">
+  <!ENTITY doxygen-md5sum        "f4697a444feaed739cfa2f0644abc19b">
+  <!ENTITY doxygen-size          "4.7 MB">
+  <!ENTITY doxygen-buildsize     "176 MB (with all programs, docs and tests)">
   <!ENTITY doxygen-time          "2.4 SBU (with all programs, docs and tests)">
 ]>
@@ -86 +86 @@
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
@@ -93 +93 @@
           url="&patch-root;/doxygen-&doxygen-version;-flex_2_6_0_fix-1.patch"/></para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist>-->
+
     <bridgehead renderas="sect3">Doxygen Dependencies</bridgehead>
 
@@ -108 +109 @@
       <xref linkend="llvm"/> (with clang),
       <xref linkend="python2"/> or <xref linkend="python3"/>,
-      <xref linkend="qt4"/> (for doxywizard),
+      <xref linkend="qt4"/> or
+      <xref linkend="qt5"/> (for doxywizard),
       <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>) and
       <xref linkend="xapian"/> (for doxyindexer)
@@ -120 +122 @@
   <sect2 role="installation">
     <title>Installation of Doxygen</title>
-
-    <para>
-      First, fix building <application>Doxygen</application> with a newer
-      version of <application>Flex</application>.
-    </para>
-
-<screen><userinput>patch -p1 -i ../doxygen-&doxygen-version;-flex_2_6_0_fix-1.patch</userinput></screen>
 
     <para>
@@ -154 +149 @@
     </para>
 
-<screen><userinput>sed -i 's:man/man1:share/&amp;:' ../doc/CMakeLists.txt &amp;&amp;
-
-cmake -DDOC_INSTALL_DIR=share/doc/doxygen-&doxygen-version; -Dbuild_doc=ON .. &amp;&amp;
+<screen><userinput>cmake -DDOC_INSTALL_DIR=share/doc/doxygen-&doxygen-version; -Dbuild_doc=ON .. &amp;&amp;
 
 make docs</userinput></screen>
@@ -167 +160 @@
 install -vm644 ../doc/*.1 /usr/share/man/man1</userinput></screen>
 
+    <para>
+      If you have generated the package documentation, then the man pages are
+      automatically installed, and you do not need to run the last
+      <command>install ...</command> command.
+    </para>
+
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ... CMakeLists.txt</command>: Fixes the directory where
-      the man pages are installed.
-    </para>
 
     <para>
@@ -188 +182 @@
       external search tools (<command>doxysearch.cgi</command> and
       <command>doxyindexer)</command>.
+    </para>
+
+    <para>
+      <option>-Dforce_qt4=ON</option>: Use this switch to build
+      <command>doxywizard</command> with Qt4 even if Qt5 is installed.
     </para>