Author: fernando
Date: Mon Mar 31 13:05:07 2014
New Revision: 12922
Log:
Fix Poppler-0.24.5 to build both, qt4 and 5 libraries.
Modified:
trunk/BOOK/general/graphlib/poppler.xml
trunk/BOOK/introduction/welcome/changelog.xml
Modified: trunk/BOOK/general/graphlib/poppler.xml
==============================================================================
--- trunk/BOOK/general/graphlib/poppler.xml Mon Mar 31 11:48:21 2014
(r12921)
+++ trunk/BOOK/general/graphlib/poppler.xml Mon Mar 31 13:05:07 2014
(r12922)
@@ -10,7 +10,7 @@
<!ENTITY poppler-md5sum "334f2ac95cc8039f2a57fe63e4a81c69">
<!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">
@@ -149,9 +149,19 @@
following command:
</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>
Install <application>Poppler</application> by running the following
@@ -173,13 +183,28 @@
Now, as the <systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>make install &&
-install -v -m755 -d /usr/share/doc/poppler-&poppler-version; &&
+<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; &&
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>
<screen><userinput>tar -xf ../poppler-data-&poppler-data-version;.tar.gz
&&
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Mon Mar 31 11:48:21
2014 (r12921)
+++ trunk/BOOK/introduction/welcome/changelog.xml Mon Mar 31 13:05:07
2014 (r12922)
@@ -48,6 +48,11 @@
<para>March 31st, 2014</para>
<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>
</listitem>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
