From 35e21bf0a813fd99c93c3bc69b757e522120242f Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Thu, 27 Nov 2008 19:34:15 +0000
Subject: [PATCH] Update poppler.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@7627 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 general/graphlib/poppler.xml       | 20 +++++++++-----------
 introduction/welcome/changelog.xml |  3 +++
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/general.ent b/general.ent
index 402253d2cd..3f0a176651 100644
--- a/general.ent
+++ b/general.ent
@@ -157,7 +157,7 @@ $Date$
 <!ENTITY imlib2-version               "1.4.0">
 <!ENTITY libexif-version              "0.6.16">
 <!ENTITY fribidi-version              "0.10.8">
-<!ENTITY poppler-version              "0.5.4">
+<!ENTITY poppler-version              "0.10.1">
 
 <!-- Obsolete
 <!ENTITY libungif-version             "4.1.3">
diff --git a/general/graphlib/poppler.xml b/general/graphlib/poppler.xml
index bae4fe6b36..53c013d922 100644
--- a/general/graphlib/poppler.xml
+++ b/general/graphlib/poppler.xml
@@ -6,12 +6,12 @@
 
   <!ENTITY poppler-download-http "http://poppler.freedesktop.org/poppler-&poppler-version;.tar.gz">
   <!ENTITY poppler-download-ftp  " ">
-  <!ENTITY poppler-md5sum        "053fdfd70533ecce1a06353fa945f061">
-  <!ENTITY poppler-size          "1.0 MB">
-  <!ENTITY poppler-buildsize     "49 MB (additional 15 MB to install the encoding data package)">
-  <!ENTITY poppler-time          "1.0 SBU (includes building with all dependencies)">
+  <!ENTITY poppler-md5sum        "f30dd49c74ee304c17ef6ef10a1d1a7c">
+  <!ENTITY poppler-size          "1.5 MB">
+  <!ENTITY poppler-buildsize     "25 MB (without static libraries or Qt3, additional 12 MB to install the encoding data package)">
+  <!ENTITY poppler-time          "1.3 SBU (includes building with all dependencies except Qt3)">
 
-  <!ENTITY poppler-data-version  "0.1">
+  <!ENTITY poppler-data-version  "0.2.1">
 ]>
 
 <sect1 id="poppler" xreflabel="Poppler-&poppler-version;">
@@ -60,10 +60,6 @@
 
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/poppler-&poppler-version;-security_fixes-2.patch"/></para>
-      </listitem>
       <listitem>
         <para>Poppler Encoding Data: <ulink
         url="http://poppler.freedesktop.org/poppler-data-&poppler-data-version;.tar.gz"/></para>
@@ -116,8 +112,7 @@
     installed. Install <application>Poppler</application> by running the
     following commands:</para>
 
-<screen><userinput>patch -Np1 -i ../poppler-&poppler-version;-security_fixes-1.patch &amp;&amp;
-./configure --prefix=/usr \
+<screen><userinput>./configure --prefix=/usr \
             --sysconfdir=/etc \
             --enable-zlib \
             --disable-cairo-output \
@@ -163,6 +158,9 @@ install -v -m644 README* /usr/share/doc/poppler-&poppler-version;</userinput></s
     plan on building <xref linkend="evince"/>, you must build the
     <application>GLib</application> wrapper.</para>
 
+    <para><parameter>--disable-static</parameter>: Prevent static libraries
+    being built and installed.</para>
+
   </sect2>
 
   <sect2 role="configuration">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 29efe4e3cf..e1c4262019 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -55,6 +55,9 @@
         <listitem>
           <para>[ken] - Updated to pcre-7.8.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - Updated to poppler-0.10.1 and poppler-data-0.2.1.</para>
+        </listitem>
       </itemizedlist>
     </listitem>