Changeset 5dab7b65 for general/graphlib

Timestamp:

09/28/2014 06:27:43 PM (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:

f2d16168

Parents:

dd0c128

Message:

Update to poppler-0.26.5.

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

File:

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

general/graphlib/poppler.xml

@@ -11 +11 @@
   <!ENTITY poppler-size               "1.6 MB">
   <!ENTITY poppler-buildsize          "145 MB (building Qt4 and Qt5 libraries, additional 46 MB for the test suite and 24 MB for poppler-data)">
-  <!ENTITY poppler-time               "1.7 SBU (building Qt4 and Qt5 libraries, additional 0.2 SBU for the test suite for each Qt)">
+  <!ENTITY poppler-time               "1.8 SBU (building Qt4 and Qt5 libraries, additional 0.2 SBU for the test suite for each Qt)">
 
   <!ENTITY poppler-data-version       "0.4.7">
@@ -153 +153 @@
 
     <para>
-      If you are not building both  <application>Qt</application> libraries,
-      jump to the following paragraph. In order to build both
+      This package may be built either without <application>Qt</application>
+      library, or with one or both versions of <application>Qt4 and
+      5</application> libraries. In order to build the
       <application>Qt4</application> and <application>Qt5</application>
-      libraries, you need to run the install commands twice, because although
-      both are detected, only wrapper for the first
-      <application>Qt</application> version in PATH is built. Either can be
-      built first, but to facilitate the explanation, we choose first the
-      <application>Qt4</application> library. You can do this using
-      <command>source setqt4</command> (script from <xref linkend="qt4"/>).
-    </para>
+      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>
 
     <para>
@@ -170 +176 @@
 
 <!-- Warning: Using zlib is not totally safe -->
-<screen><userinput>./configure --prefix=/usr     \
+<screen><userinput>[ -e /usr/bin/setqt4 ] &amp;&amp; source setqt4 || [ ! -e /usr/bin/setqt5 ] &amp;&amp;
+./configure --prefix=/usr     \
             --sysconfdir=/etc \
             --disable-static  \
@@ -186 +193 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>
-      If you are not building both <application>Qt</application> libraries,
-      jump to the following paragraph. If you want to build both
-      <application>Qt</application> libraries, first switch back to
-      unpriviledged user, run <command>source setqt5</command>, from
-      <xref linkend="qt5"/>, and repeat the instructions from configuration
-      until install. After that, proceed to install the documents until the end.
-    </para>
+<!-- ==== With Qt5 ====== -->
+    <bridgehead renderas="sect3">With Qt5</bridgehead>
+
+    <para>
+      Install <application>Poppler</application> by running the following
+      commands:
+    </para>
+
+<!-- Warning: Using zlib is not totally safe -->
+<screen><userinput>[ -e /usr/bin/setqt5 ] &amp;&amp; source setqt5 &amp;&amp;
+./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-static  \
+            --enable-xpdf-headers &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+<!-- ==== Documents ====== -->
+    <bridgehead renderas="sect3">Documents</bridgehead>
 
     <para>
@@ -201 +228 @@
 <screen role="root"><userinput>install -v -m755 -d      /usr/share/doc/poppler-&poppler-version; &amp;&amp;
 install -v -m644 README* /usr/share/doc/poppler-&poppler-version;</userinput></screen>
+
+<!-- ==== Poppler Data ====== -->
+    <bridgehead renderas="sect3">Poppler Data</bridgehead>
 
     <para>