Changeset a544789

Timestamp:

09/29/2014 10:41:34 AM (10 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.7, 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, krejzi/svn, 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:

0835608

Parents:

4197597

Message:

Final fix of Poppler-0.26.5 page, hopefully.

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

Files:

• general.ent (modified) (2 diffs)
• general/graphlib/poppler.xml (modified) (2 diffs)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "28">                   <!-- Always 2 digits -->
+<!ENTITY day          "29">                   <!-- Always 2 digits -->
 <!ENTITY month        "09">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "September 28th, &year;">
+<!ENTITY releasedate  "September 29th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

general/graphlib/poppler.xml

@@ -159 +159 @@
       libraries, you need to run the install commands twice, because, although
       both are detected, only the wrapper for the the first
-      <application>Qt</application> version in the PATH is built. The
-      instructions are divided into four parts: first, build without
-      <application>Qt</application> or with <application>Qt4</application>;
-      second, build with <application>Qt4</application>; third, install the
-      common documents, and fourth, install the additional encoding data
-      package.
-    </para>
-
-<!-- ==== Without Qt or with Qt4 ====== -->
-    <bridgehead renderas="sect3">Without Qt or with Qt4</bridgehead>
+      <application>Qt</application> version in the PATH is built.
+    </para>
+
+    <para>
+      The instructions are divided into four parts: first, build with
+      <application>Qt4 or 5</application> at <filename
+      class="directory">/user</filename>, without <application>Qt</application>
+      or with <application>Qt4</application> under <filename
+      class="directory">/opt</filename>; second, build with
+      <application>Qt5</application> under <filename
+      class="directory">/opt</filename>; third, install the common documents
+      (optional); and fourth, install the additional encoding data package.
+    </para>
+
+<!-- ==== With Qt4 or 5 at /user, without Qt or with Qt4 under /opt ====== -->
+    <bridgehead renderas="sect3">With Qt4 or 5 at /user, without Qt or with Qt4
+    under /opt</bridgehead>
 
     <para>
@@ -193 +200 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-<!-- ==== With Qt5 ====== -->
-    <bridgehead renderas="sect3">With Qt5</bridgehead>
+<!-- ==== With Qt5 under /opt ====== -->
+    <bridgehead renderas="sect3">With Qt5 under /opt </bridgehead>
 
     <para>