Changeset a6ff6760 for general/graphlib

Timestamp:

06/24/2015 02:02:33 PM (9 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.8, 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:

233a4949

Parents:

0b765b0

Message:

Wicd-1.7.3: change "here" by the actual link. If not aproved, please, revert or tell me to do it.
Hd2u-1.0.3: change Download URL.
Graphviz-2.38.0: change Download URL.
PulseAudio-6.0: remove uneeded "Command Explanation".
CVS-1.11.23: comment out test suite.
Poppler-0.33.0: can be compiled with support for QT4 and QT5 at once.

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

File:

• general/graphlib/poppler.xml (modified) (4 diffs)

general/graphlib/poppler.xml

@@ -149 +149 @@
     <para>
       In order to optionally run the test suite, an additional download of about
-      9 MB using <xref linkend="git"/> is necessary. Make sure that you do
-      not have the directory ../test.
+      9 MB using <xref linkend="git"/> is necessary.
     </para>
 
@@ -157 +156 @@
 
     <note><para>
-      This package can be optionally built with support for either the Qt4 or
-      Qt5 libraries, but it only builds with one of those at a time. If you
-      have both Qt versions installed, you will need to specify which one to
-      use before executing the <command>configure</command> command given
-      below. Use this command to link to Qt4: 
+
+      This package can be optionally built with support for only one version of
+      Qt4 or Qt5. If you have only one, no modification is necessary. If both
+      are installed, and you wish support for only one, before executing the
+      <command>configure</command> command given below, use this command to
+      select Qt4: 
       
       <screen><userinput>source /usr/bin/setqt4</userinput></screen> 
 
-      or use this to use Qt5:
+      or this to select Qt5:
 
       <screen><userinput>source /usr/bin/setqt5</userinput></screen> 
-
-      If you would like <application>Poppler</application> to link to both Qt
-      versions, you will need to build it twice.
     </para></note>
 
@@ -178 +175 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr         \
+<screen><userinput>MOCQT4=$QT4DIR/bin/moc            \
+MOCQT5=$QT5DIR/bin/moc            \
+./configure --prefix=/usr         \
             --sysconfdir=/etc     \
             --disable-static      \
@@ -226 +225 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <envar>MOCQT4=$QT4DIR/bin/moc</envar> and
+      <envar>MOCQT5=$QT5DIR/bin/moc</envar>:
+      These environment variables are necessary, for linking with the two Qt
+      versions, if both are installed.  If only one Qt version is installed or
+      you wish to link to only one version, you can remove them, although this
+      is not necessary.
+    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"