From bf8eb65b3c257e6010e1beed8c2d12cdc7961286 Mon Sep 17 00:00:00 2001
From: Fernando de Oliveira <fernando@linuxfromscratch.org>
Date: Sun, 22 Mar 2015 19:13:59 +0000
Subject: [PATCH] Update to ImageMagick-6.9.1-0. D-Bus-1.8.16: fix if using
 DESTDIR. libmusicbrainz-2.1.5: --disable-static.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@15684 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/genutils/imagemagick.xml      | 22 +++++++++-------------
 general/sysutils/dbus.xml             | 17 +++++++++++++----
 introduction/welcome/changelog.xml    |  4 ++++
 multimedia/libdriv/libmusicbrainz.xml | 14 +++++++++++---
 packages.ent                          |  2 +-
 5 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/general/genutils/imagemagick.xml b/general/genutils/imagemagick.xml
index f1b43626e4..27ba682dd8 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 "6">
+  <!ENTITY imagemagick-patch-version "0">
 
   <!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        "fd481f9fdee33ab218184a1412bae93d">
+  <!ENTITY imagemagick-md5sum        "abd11cac6d0c064e68e331232c21f1d6">
   <!ENTITY imagemagick-size          "7.6 MB">
-  <!ENTITY imagemagick-buildsize "150 MB (with typical dependencies, additional 29 MB to run the test suite, reputedly 450 MB with all dependencies)">
-  <!ENTITY imagemagick-time "2.5 SBU (typical build - additional 9.1 SBU to run the test suite and 17.9 SBU to run the validation suite)">
+  <!ENTITY imagemagick-buildsize "171 MB (with typical dependencies, additional 33 MB to run the test suite, reputedly 450 MB with all dependencies)">
+  <!ENTITY imagemagick-time "2.2 SBU (typical build - additional 3.6 SBU to run the test suite and 4 SBU to run the validation suite)">
 ]>
 
 <!-- Editors: It is highly unlikely that the buildsize (disk space used) will
@@ -215,7 +215,6 @@ make</userinput></screen>
 <screen role="root"><userinput>make DOCUMENTATION_PATH=/usr/share/doc/imagemagick-&imagemagick-version; install</userinput></screen>
 
     <para>
-
       To test the installation, issue: <command>make check</command>. A more
       comprehensive test is the <application>ImageMagick</application>
       validation suite. If <command>make check</command> has not been executed,
@@ -224,9 +223,8 @@ 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 "Helvetica" from "Standard Fonts" which are optionally installed in
-      <xref linkend="gs"/>.
-
+      needs <quote>Helvetica</quote> from <quote>Ghostscript Standard
+      Fonts</quote>, which are optionally installed in <xref linkend="gs"/>.
     </para>
 
   </sect2>
@@ -249,10 +247,8 @@ make</userinput></screen>
       installing of PerlMagick.
     </para>
 
-    <para>
-      <parameter>--disable-static</parameter>: Prevents the static
-      libraries being built and installed.
-    </para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
     <para>
       <option>--with-gslib</option>: Enables support to use the
@@ -327,7 +323,7 @@ make</userinput></screen>
           /usr/include/ImageMagick-6,
           /usr/lib/ImageMagick-&imagemagick-version;,
           /usr/lib/perl5/site_perl/&lfs-perl-version;/{,auto}/Image/Magick,
-          /usr/share/doc/ImageMagick-6, and
+          /usr/share/doc/ImageMagick-&imagemagick-version;, and
           /usr/share/ImageMagick-6
         </seg>
       </seglistitem>
diff --git a/general/sysutils/dbus.xml b/general/sysutils/dbus.xml
index c2dd1c5093..39cd482089 100644
--- a/general/sysutils/dbus.xml
+++ b/general/sysutils/dbus.xml
@@ -151,6 +151,16 @@ make</userinput></screen>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
+    <para>
+      If you are using a DESTDIR install,
+      <command>dbus-daemon-launch-helper</command> needs to be fixed
+      afterwards. Issue, as <systemitem class="username">root</systemitem>
+      user:
+    </para>
+
+<screen role="root"><userinput>chown -v root:messagebus /usr/libexec/dbus-daemon-launch-helper &amp;&amp;
+chmod -v      4750       /usr/libexec/dbus-daemon-launch-helper</userinput></screen>
+
     <para>
       If you are still building your system in chroot or you did not start the
       daemon yet, but you want to compile some packages that require
@@ -193,10 +203,9 @@ make check</userinput></screen>
 <screen><userinput>sed -i -e 's:run-test.sh:$(NULL):g' test/name-test/Makefile.in</userinput></screen>
 
     <para>
-      Note there has been a report that the tests may fail if running
-      inside a Midnight Commander shell.
-      You may get out-of-memory error messages when running the tests.
-      These are normal and can be safely ignored.
+      There has been a report that the tests may fail if running inside a
+      Midnight Commander shell.  You may get out-of-memory error messages when
+      running the tests.  These are normal and can be safely ignored.
     </para>
 
   </sect2>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index a2781c4370..17f4016e48 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -47,6 +47,10 @@
     <listitem>
       <para>March 22nd, 2015</para>
       <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to ImageMagick-6.9.1-0. Fixes
+          <ulink url="&blfs-ticket-root;6000">#6000</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[igor] - Update to qemu-2.2.1.</para>
         </listitem>
diff --git a/multimedia/libdriv/libmusicbrainz.xml b/multimedia/libdriv/libmusicbrainz.xml
index d5cdd74c9e..cdb26f52f3 100644
--- a/multimedia/libdriv/libmusicbrainz.xml
+++ b/multimedia/libdriv/libmusicbrainz.xml
@@ -92,7 +92,7 @@
     following commands:</para>
 
 <screen><userinput>patch -Np1 -i ../libmusicbrainz-&libmusicbrainz-version;-missing-includes-1.patch &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
     <para>If <application>Python</application> is installed, build the bindings
@@ -121,6 +121,14 @@ install -v -m644 -D docs/mb_howto.txt \
 
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
 
@@ -131,7 +139,7 @@ install -v -m644 -D docs/mb_howto.txt \
 
       <seglistitem>
         <seg>None</seg>
-        <seg>libmusicbrainz.{so,a}</seg>
+        <seg>libmusicbrainz.so</seg>
         <seg>/usr/include/musicbrainz and
         /usr/share/doc/libmusicbrainz-&libmusicbrainz-version;</seg>
       </seglistitem>
@@ -143,7 +151,7 @@ install -v -m644 -D docs/mb_howto.txt \
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libmusicbrainz-lib">
-        <term><filename class='libraryfile'>libmusicbrainz.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libmusicbrainz.so</filename></term>
         <listitem>
           <para>contains API functions to access the MusicBrainz database, both
           for looking up data and also for submitting new data.</para>
diff --git a/packages.ent b/packages.ent
index fcf109df5e..0e7d38903c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -191,7 +191,7 @@
 <!ENTITY hd2u-version                 "1.0.3">
 <!ENTITY hicolor-icon-theme-version   "0.14">
 <!ENTITY icon-naming-utils-version    "0.8.90">
-<!ENTITY imagemagick-version          "6.9.0">
+<!ENTITY imagemagick-version          "6.9.1">
 <!ENTITY intltool-version             "0.50.2">
 <!ENTITY lsof-version                 "4.88">
 <!ENTITY pinentry-version             "0.9.1">