Author: fernando
Date: Sun Sep 28 11:27:43 2014
New Revision: 14412
Log:
Update to poppler-0.26.5.
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/graphlib/poppler.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/packages.ent
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Sun Sep 28 10:51:37 2014 (r14411)
+++ trunk/BOOK/general.ent Sun Sep 28 11:27:43 2014 (r14412)
@@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
-<!ENTITY day "27"> <!-- Always 2 digits -->
+<!ENTITY day "28"> <!-- Always 2 digits -->
<!ENTITY month "09"> <!-- Always 2 digits -->
<!ENTITY year "2014">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "September 27th, &year;">
+<!ENTITY releasedate "September 28th, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development] -->
Modified: trunk/BOOK/general/graphlib/poppler.xml
==============================================================================
--- trunk/BOOK/general/graphlib/poppler.xml Sun Sep 28 10:51:37 2014
(r14411)
+++ trunk/BOOK/general/graphlib/poppler.xml Sun Sep 28 11:27:43 2014
(r14412)
@@ -10,7 +10,7 @@
<!ENTITY poppler-md5sum "e58cdddfc7dc01f00bf7394e0e4f21ce">
<!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">
@@ -152,24 +152,31 @@
<screen><userinput>git clone git://git.freedesktop.org/git/poppler/test
../test</userinput></screen>
<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"/>).
+ 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>
Install <application>Poppler</application> by running the following
commands:
</para>
<!-- Warning: Using zlib is not totally safe -->
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>[ -e /usr/bin/setqt4 ] && source setqt4 || [ ! -e
/usr/bin/setqt5 ] &&
+./configure --prefix=/usr \
--sysconfdir=/etc \
--disable-static \
--enable-xpdf-headers &&
@@ -185,22 +192,45 @@
<screen role="root"><userinput>make install</userinput></screen>
+<!-- ==== 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 ] && source setqt5 &&
+./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-static \
+ --enable-xpdf-headers &&
+make</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.
+ 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>
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>
+<!-- ==== Poppler Data ====== -->
+ <bridgehead renderas="sect3">Poppler Data</bridgehead>
+
<para>
If you downloaded the additional encoding data package, install it by
issuing the following commands as the
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Sun Sep 28 10:51:37
2014 (r14411)
+++ trunk/BOOK/introduction/welcome/changelog.xml Sun Sep 28 11:27:43
2014 (r14412)
@@ -45,6 +45,16 @@
-->
<listitem>
+ <para>September 28th, 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[fernando] - Update to poppler-0.26.5. Fixes
+ <ulink url="&blfs-ticket-root;5600">#5600</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>September 27th, 2014</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Sun Sep 28 10:51:37 2014 (r14411)
+++ trunk/BOOK/packages.ent Sun Sep 28 11:27:43 2014 (r14412)
@@ -178,7 +178,7 @@
<!ENTITY newt-version "0.52.17">
<!ENTITY openjpeg-version "1.5.2">
<!ENTITY pixman-version "0.32.6"> <!-- Even minors only -->
-<!ENTITY poppler-version "0.26.4"> <!-- Even minors only -->
+<!ENTITY poppler-version "0.26.5"> <!-- Even minors only -->
<!ENTITY qpdf-version "5.1.2">
<!-- Chapter 11 -->
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page