Changeset 8aee9eb

Timestamp:

03/31/2014 08:05:07 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.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, 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, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

fb990982

Parents:

e9c856f

Message:

Fix Poppler-0.24.5 to build both, qt4 and 5 libraries.

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

Files:

• general/graphlib/poppler.xml (modified) (3 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general/graphlib/poppler.xml

@@ -11 +11 @@
   <!ENTITY poppler-size               "1.5 MB">
   <!ENTITY poppler-buildsize          "103 MB">
-  <!ENTITY poppler-time               "1.0 SBU">
+  <!ENTITY poppler-time               "1.5 SBU (building qt4 and qt5 libraries)">
 
   <!ENTITY poppler-data-version       "0.4.6">
@@ -150 +150 @@
     </para>
 
-<screen><userinput>sed -i -e "s:grep \"Qt 5\":grep \"Qt\\\|moc 5\":g" \
-                          -e "s:QT_SELECT=qt5:QT_SELECT=5:" \
-                          configure</userinput></screen>
+<screen><userinput>sed -i -e "s:grep \"Qt 5\":grep \" 5\\\\.\":g" configure</userinput></screen>
+
+    <para>
+      If you are not building both  <application>Qt</application> libraries,
+      jump to the following paragraph. In order to build both
+      <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>setqt4</command> command from <xref linkend="qt4"/>.
+    </para>
 
     <para>
@@ -174 +184 @@
     </para>
 
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d      /usr/share/doc/poppler-&poppler-version; &amp;&amp;
+<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>setqt5</command> command from
+      <xref linkend="qt5"/>, and repeat the instructions from configuration
+      until install. After that, proceed to install the documents until the end.
+    </para>
+
+    <para>
+      The documents are installed using the following commands:
+    </para>
+
+<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>
 
     <para>
       If you downloaded the additional encoding data package, install it by
-      issuing the following commands:
+      issuing the following commands as the
+      <systemitem class="username">root</systemitem> user:
     </para>
 

introduction/welcome/changelog.xml

@@ -49 +49 @@
       <itemizedlist>
         <listitem>
+          <para>[fernando] - Fix Poppler-0.24.5 to build both, qt4 and 5
+          libraries. Fixes
+          <ulink url="&blfs-ticket-root;4880">#4880</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[fernando] - Add new package Mozilla JS-24.2.0. Fixes
           <ulink url="&blfs-ticket-root;4500">#4500</ulink>.</para>