From 5b117af92dc791680128fbbad02c48383aa44fe6 Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Sat, 20 Feb 2016 21:26:22 +0000
Subject: [PATCH] ImageMagick-6.9.3-5

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@16987 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  4 ++--
 general/genutils/imagemagick.xml   | 26 +++++++++++++++++---------
 introduction/welcome/changelog.xml | 10 ++++++++++
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/general.ent b/general.ent
index c9ad471f25..21e56fd7cb 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "19">                   <!-- Always 2 digits -->
+<!ENTITY day          "20">                   <!-- Always 2 digits -->
 <!ENTITY month        "02">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "February 19th &year;">
+<!ENTITY releasedate  "February 20th &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development] -->
diff --git a/general/genutils/imagemagick.xml b/general/genutils/imagemagick.xml
index 3e4fb6e76b..e08a002a00 100644
--- a/general/genutils/imagemagick.xml
+++ b/general/genutils/imagemagick.xml
@@ -4,14 +4,14 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY imagemagick-patch-version "0">
+  <!ENTITY imagemagick-patch-version "5">
 
   <!ENTITY imagemagick-download-http " ">
   <!ENTITY imagemagick-download-ftp "ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
-  <!ENTITY imagemagick-md5sum        "87939f4f82d6f24a28d3106a58d523d8">
+  <!ENTITY imagemagick-md5sum        "af1c85b8b8f817e919f9ca4408d86782">
   <!ENTITY imagemagick-size          "8.4 MB">
-  <!ENTITY imagemagick-buildsize     "192 MB, with typical dependencies (226 MB with the test suite, reputedly 450 MB with all dependencies)">
-  <!ENTITY imagemagick-time          "2.2 SBU - typical build (additional 3.5 SBU to run the test suite and 3.4 SBU to run the validation suite)">
+  <!ENTITY imagemagick-buildsize     "193 MB, with typical dependencies (222 MB with the test suite, reputedly 450 MB with all dependencies)">
+  <!ENTITY imagemagick-time          "2.0 SBU - typical build (additional 1.6 SBU to run the test suite and 1.4 SBU to run the validation suite)">
 ]>
 
 <!-- Editors: It is highly unlikely that the buildsize (disk space used) will
@@ -26,7 +26,12 @@
 
      Also, please look over the output from the configure command for any
      additional dependencies that need to be listed, as ImageMagick is
-     constantly adding additional features and dependencies. -->
+     constantly adding additional features and dependencies.
+
+     For those of us who touch this infrequently:
+     DPS/dpsXclient is from apple so not relevant to linux builds
+     GVC is part of Graphviz and documented in the explanations
+     LQR is Liquid Rescale  -->
 
 <sect1 id="imagemagick" xreflabel="ImageMagick-&imagemagick-version;-&imagemagick-patch-version;">
   <?dbhtml filename="imagemagick.html"?>
@@ -52,7 +57,7 @@
       Bindings for Perl and C++ are also available.
     </para>
 
-    &lfs78_checked;
+<!--&lfs78_checked;-->
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -154,6 +159,7 @@
       FlashPIX (libfpx)</ulink>,
       <ulink url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/">JBIG-KIT</ulink>,
       <ulink url="&gnome-download-http;/libgxps/">libgxps</ulink>,
+      <ulink url="https://github.com/HOST-Oman/libraqm/">libraqm</ulink>,
       <ulink url="http://liblqr.wikidot.com/en:download-page">Liquid Rescale</ulink>,
       <ulink url="http://www.openexr.com/">OpenEXR</ulink>, and
       <ulink url="http://www.agocg.ac.uk/train/cgm/ralcgm.htm">RALCGM</ulink>
@@ -227,8 +233,10 @@ make</userinput></screen>
       validation suite. The result summary may be obtained with <command>grep
       "validation suite" validate.log</command>. Note that the EPS, PS, and PDF
       tests require a working <application>Ghostscript</application>. One test
-      needs <quote>Helvetica</quote> from <quote>Ghostscript Standard
-      Fonts</quote>, which are optionally installed in <xref linkend="gs"/>.
+      in 'make check' needs <quote>Helvetica</quote> from <quote>Ghostscript
+      Standard Fonts</quote>, which are optionally installed in
+      <xref linkend="gs"/> - that test, and one other, might fail, but all the
+      validation can still pass.
     </para>
 
   </sect2>
@@ -488,4 +496,4 @@ make</userinput></screen>
 
   </sect2>
 
-</sect1>
\ No newline at end of file
+</sect1>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index de98d6d933..2d26cdf1e7 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,16 @@
 
 -->
 
+    <listitem>
+      <para>February 20th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to ImageMagick-6.9.3-5. Fixes
+          <ulink url="&blfs-ticket-root;7314">#7314</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>February 19th, 2016</para>
       <itemizedlist>